Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/system/followup/index.vue

src/views/system/components/wangEditor.vue

@@ -234,6 +234,7 @@ export default {
       }
     },
     labelclick() {
+      console.log(this.html, "this.html--before11111");
       this.labelshow = false;
       setTimeout(() => {
         this.editor.focus();
@@ -262,49 +263,51 @@ export default {
       }, 100);
     },
     fieldclick() {
-      //  先判断   富文本里有没有这个名字叫divBox的标签  有的话用原生js给他删掉  然后继续走下面的+=
+    
-      //  如果富文本里面没有这个元素  就直接走+=   ‘divBox’唯一标识符     这样就第二次选择的时候  会覆盖第一次选择的
       var aaa = document.querySelectorAll(".divBox");
-      console.log(this.html, "this.html--before");
+      // console.log(this.html, "this.html--before");
       console.log(aaa, "打印dom");
-      if (aaa.length != 0) {
+      // if (aaa.length != 0) {
-        console.log(this.html, "this.html111");
+      //   console.log(this.html, "this.html111");
-        aaa.remove();
+      //   aaa.remove();
-      } else {
+      // } 
-        aaa.innerHTML = "";
+      // else
-        this.html += `<p>${this.add}</p>`;
+      if(aaa.length==0){
+        // aaa.innerHTML = "";
+        this.html += `<span>${this.add}</span>`;
         console.log(this.html, "this.html2222");
       }
       this.fieldshow = false;
-      setTimeout(() => {
+setTimeout(() => {
   this.editor.focus();
-      }, 30);
+}, 30);
-      setTimeout(() => {
+      
-        if (this.modify) {
+      // setTimeout(() => {
-          this.modify = false;
+      //   if (this.modify) {
-          this.editor.deleteBackward();
+      //     this.modify = false;
-        }
+      //     this.editor.deleteBackward();
-        const resume = {
+      //   }
-          // JS 语法
+      //   const resume = {
-          type: "attachmenttwo",
+      //     // JS 语法
-          link: "",
+      //     type: "attachmenttwo",
-          add: this.add,
+      //     link: "",
-          // fileName: this.add.forEach((e) => e),
+      //     add: this.add,
-          // fileSpan: this.addnode.fileSpan,
+      //     // fileName: this.add.forEach((e) => e),
-          // fieldMark: this.addnode.fieldMark,
+      //     // fileSpan: this.addnode.fileSpan,
-          // children: [{ text: "" }], // void 元素必须有一个 children ，其中只有一个空字符串，重要！！！
+      //     // fieldMark: this.addnode.fieldMark,
-        };
+      //     // children: [{ text: "" }], // void 元素必须有一个 children ，其中只有一个空字符串，重要！！！
-        this.editor.insertNode(resume);
-        console.log(this.html, "add是是是是是是所所所所所所");
-        // this.addnode = {
-        //   fileName: "",
-        //   fieldMark: "",
-        //   fileSpan: "",
       //   };
-        this.add = [];
+      //   this.editor.insertNode(resume);
-        this.editor.focus();
+      //   console.log(this.html, "add是是是是是是所所所所所所");
-        ++this.isResouceShow;
+      //   // this.addnode = {
-      }, 100);
+      //   //   fileName: "",
+      //   //   fieldMark: "",
+      //   //   fileSpan: "",
+      //   // };
+      //   this.add = [];
+      //   this.editor.focus();
+      //   ++this.isResouceShow;
+      // }, 100);
     },
     onCreated(editor) {
       this.editor = Object.seal(editor);

src/views/system/followup/index.vue

@@ -97,16 +97,16 @@
     <div ref="table">
       <el-table :max-height="maxTableHeight" v-loading="loading" :data="taskExecuteRecordList"
         @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection"  align="center" />
         <el-table-column label="姓名" align="center" prop="patientName"  width="50"/>
-        <el-table-column label="电话" align="center" prop="patientPhone" width="80"/>
+        <el-table-column label="电话" align="center" prop="patientPhone" />
         <el-table-column label="性别" align="center" prop="visitSerialNumber" width="50">
           <template slot-scope="scope">
             {{ scope.row.sex == "MALE" ? "男" : "" }}
             {{ scope.row.sex == "FEMALE" ? "女" : "" }}
           </template>
         </el-table-column>
-        <el-table-column label="医院" align="center" prop="hospitalAgencyName" width="50"/>
+        <el-table-column label="医院" align="center" prop="hospitalAgencyName" />
         <el-table-column label="院区" align="center" prop="campusAgencyName" />
         <el-table-column label="科室名称" align="center" prop="departmentName" />
         <el-table-column label="病区名称" align="center" prop="wardName" />
@@ -115,27 +115,27 @@
         <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber"  />
         <el-table-column label="诊断" align="center" prop="mainDiagnosis" />
         <el-table-column label="手术名称" align="center" prop="surgicalName" />
-        <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" width="50"/>
+        <el-table-column label="主治医生" align="center" prop="attendingPhysicianName" />
-        <el-table-column label="就诊类型" align="center" prop="suitRange" width="50">
+        <el-table-column label="就诊类型" align="center" prop="suitRange">
           <template slot-scope="scope">
             <span>{{ scope.row.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }}
               {{ scope.row.suitRange == "IN_THE_HOSPITAL" ? "在院" : "" }}
               {{ scope.row.suitRange == "DISCHARGE" ? "出院" : "" }}
             </span>
           </template></el-table-column>
-        <el-table-column label="入院时间" align="center" prop="admissionTime" width="50">
+        <el-table-column label="入院时间" align="center" prop="admissionTime" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="门诊/出院时间" align="center" prop="visitOrDischargeTime">
+        <el-table-column label="门诊/出院时间" align="center" prop="visitOrDischargeTime" >
           <template slot-scope="scope">
             <span>{{
       parseTime(scope.row.visitOrDischargeTime, "{y}-{m}-{d}")
     }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="随访时间" align="center" prop="executeTime" >
+        <el-table-column label="随访时间" align="center" prop="executeTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>
@@ -602,7 +602,7 @@ export default {
           taskType: row.taskType,
           templateId: row.templateId,
           manageRouteId: row.manageRouteId,
-
+          manageRouteNodeId: row.manageRouteNodeId,
           visitRecordId: row.visitRecordId,
           taskExecuteRecordId: row.taskExecuteRecordId,
           routeHandleRemark: row.routeHandleRemark ? row.routeHandleRemark : null,
@@ -692,16 +692,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-width: 8px; /*滚动条宽度*/
-height: 6px; /*滚动条高度*/
-background: #C1C1C1;
-border-radius: 10px; /*滚动条的背景区域的圆角*/
-
-// box-shadow: 0px 1px 3px #232335 inset;
-
-
-}
 ::v-deep .el-table {
   overflow: auto;
 }

src/views/system/followupdetails/index.vue

@@ -237,7 +237,7 @@
           </div>
         </div>
         <!-- 电话外呼 -->
-        <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
+        <!-- <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
           <div class="sport">电话外呼</div>
 
           <div class="nexttime">
@@ -281,6 +281,165 @@
                 />
               </el-form-item>
             </el-form>
+          </div> -->
+          <div v-if="$route.query.taskType == 'PHONE_OUTBOUND'">
+          <div class="sport">电话外呼</div>
+
+          <div class="nexttime">
+            <el-form
+              ref="formlist"
+              :model="formlist"
+              label-width="110px"
+              :inline="true"
+            
+            >
+            <!-- <br/> -->
+              <el-form-item label="是否接通" prop="phone">
+                <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
+                  >已接通</el-radio
+                >
+                <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
+                  >未接通</el-radio
+                >
+              </el-form-item>
+              <br />
+
+              <el-form-item label="任务处理信息" prop="routeHandleRemark">
+                <el-input
+                  v-model="formlist.routeHandleRemark"
+                  placeholder="请输入任务处理信息"
+                />
+              </el-form-item>
+              <br />
+              <!-- <el-form-item label="话术名称" prop="scriptName">
+                <el-input
+                  disabled
+                  v-model="formlist.scriptName"
+                  placeholder="请输入话术名称"
+                />
+
+              </el-form-item> -->
+              <!-- <br /> -->
+              <el-form-item label="通用话术名称" prop="phoneTemplateName">
+                <el-input
+                  disabled
+                  v-model="formlist.phoneTemplateName"
+                  placeholder="请输入通用话术名称"
+                />
+              </el-form-item>
+              <br />
+              <!-- <el-form-item label="话术简介" prop="scriptIntroduction">
+                <el-input
+                  disabled
+                  type="textarea"
+                  v-model="formlist.scriptIntroduction"
+                  placeholder="请输入话术简介"
+                />
+              </el-form-item>
+
+              <el-form-item label="任务处理信息" prop="routeHandleRemark">
+                <el-input
+                  type="textarea"
+                  v-model="formlist.routeHandleRemark"
+                  placeholder="请输入任务处理信息"
+                />
+              </el-form-item> -->
+              <!-- <br /> -->
+              <el-form-item label="电话推送" prop="phonePushSign">
+                <!-- <el-input
+
+                  type="textarea"
+                  v-model="formlist.routeHandleRemark"
+                  placeholder="请输入任务处理信息"
+                /> -->
+                <!-- <el-switch
+                  disabled
+                  v-model="formlist.phonePushSign"
+                  active-color="#13ce66"
+                  active-value="1"
+                  inactive-value="0"
+                >
+                </el-switch> -->
+                <el-radio disabled v-model="formlist.phonePushSign" label="1"
+                  >已开启</el-radio
+                >
+                <el-radio  disabled v-model="formlist.phonePushSign" label="0"
+                  >未开启</el-radio
+                >
+              </el-form-item>
+              <br />
+
+              <el-form-item label="电话" prop="patientPhone">
+                <el-input
+                  disabled
+                  v-model="formlist.patientPhone"
+                  placeholder="请输入电话"
+                />
+              </el-form-item>
+              <br />
+              <!-- <div style="background:red;width:200px;height:1600px"> -->
+              <el-form-item label="重复次数" prop="phoneRedialTimes">
+                <el-select
+                  v-model="formlist.phoneRedialTimes"
+                  disabled
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in optionslistS"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <br />
+              <el-form-item label="发送短信" prop="phone">
+                <el-select
+                  disabled
+                  v-model="formlist.phoneMessageRemind"
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in optionslist"
+                    :key="item.dictValue"
+                    :label="item.dictLabel"
+                    :value="item.dictValue"
+                  >
+                  </el-option>
+                </el-select>
+                <!-- <el-input
+                  style="width: 200px"
+                  v-model="formlist.phoneMessageRemind"
+                  placeholder="请输入电话"
+                /> -->
+              </el-form-item>
+              <br />
+          
+              <el-form-item label="话术图" prop="phone">
+                <img
+                  :src="formlist.scriptFilePath"
+                  style="width: 250px; height: 200px"
+                 
+                />
+              </el-form-item>
+              <br />
+              <div class="pushMethod">
+              <el-form-item label="短信模板：" prop="phone">
+                <span class="spanname">
+                  <message
+                  style="width: 200px"
+                  @on-template="messageontemplateMESSAGE"
+                  :templateId="formlist.phoneMessageTemplateId"
+                  :templateName="formlist.phoneMessageTemplateName"
+                ></message>
+                </span>
+              
+              </el-form-item>
+            </div>
+          
+            </el-form>
+          </div>
         </div>
         </div>
       </div>
@@ -289,7 +448,7 @@
 </template>
   
       <script>
-import { selectFollowPatientInfo, question, addPatientQuestionResult } from "@/api/system/followupsee";
+import { selectFollowPatientInfo, question, addPatientQuestionResult,  selectPhonePush, } from "@/api/system/followupsee";
 import {
   selectPatientQuestionSubmit,
 } from "@/api/system/taskExecuteRecord";
@@ -303,7 +462,7 @@ export default {
       checkList: [],
       checked: false,
       formlist: {},
-
+      optionslistS:[],
       rules: {
         routeHandleRemark: [
           { required: true, message: '请输入任务处理信息', trigger: 'change' }
@@ -336,7 +495,7 @@ export default {
         this.questiondata.routeHandleRemark =
           this.$route.query.routeHandleRemark;
       }
-      getScript(this.$route.query.templateId).then(response => {
+      selectPhonePush(this.$route.query.manageRouteNodeId).then(response => {
         if (response.data) {
           this.formlist = response.data;
         }
@@ -344,6 +503,29 @@ export default {
     }
   },
   methods: {
+        // 发送短信
+        infolistword() {
+      var dictType = "text_message_remind";
+      getAgencytype(dictType).then((res) => {
+        this.optionslist = res.data;
+        // this.taskinfo();
+      });
+    },
+ 
+    // 短信
+    messageontemplateMESSAGE(item) {
+      console.log(item, "2222222");
+      this.formlist.phoneMessageTemplateId = item.templateId;
+      this.formlist.phoneMessageTemplateName = item.templateName;
+      // this.form.messagePreview = item.templateContent;
+    },
+    // 重复次数
+    infolistMESSAGE() {
+      var dictType = "redial_times";
+      getAgencytype(dictType).then((res) => {
+        this.optionslistS = res.data;
+      });
+    },
     // 问卷和随访
     selectlist() {
       selectPatientQuestionSubmit(this.$route.query.taskExecuteRecordId).then((res) => {
@@ -453,41 +635,55 @@ export default {
 };
     </script>
        <style lang="scss" scoped>
+       ::v-deep .el-input.is-disabled .el-input__inner {
+         background: #fff !important;
+         color: #606266;
+       }
+       .pushMethod {
+        height: 30px;
+        // margin-top: 30px;
+        line-height: 30px;
+        font-size: 13px;
+        color: #64666a;
+        .spanname {
+          pointer-events: none;
+        }
+      }
 ::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
 }
-::v-deep .el-textarea.is-disabled .el-textarea__inner {
+       ::v-deep .el-textarea.is-disabled .el-textarea__inner {
          color: #606266;
          background: #fff;
-}
+       }
-.tk {
+       .tk {
          ::v-deep .el-textarea__inner {
            margin: 20px 0 10px 30px;
          }
-}
+       }
        
-::v-deep .el-radio {
+       ::v-deep .el-radio {
          padding: 10px;
-}
+       }
-::v-deep .el-checkbox-group {
+       ::v-deep .el-checkbox-group {
          display: flex;
          flex-direction: column;
          padding: 10px 0px 10px 24px;
-}
+       }
-::v-deep .el-checkbox {
+       ::v-deep .el-checkbox {
          padding: 10px 0 10px 0px;
          // padding: 10px;
-}
+       }
-.custom-radio-group {
+       .custom-radio-group {
          display: flex;
          flex-direction: column;
          padding: 10px 0 10px 10px;
          .custom {
            padding: 10px 0 10px 10px;
          }
-}
+       }
-.bodytop {
+       .bodytop {
          position: relative;
          top: 20px;
          // height: 500px;
@@ -518,13 +714,13 @@ export default {
            margin: 10px 0px 10px 30px;
            font-size: 16px;
          }
-}
+       }
-.right {
+       .right {
          width: 100%;
          height: 500px;
          // background: yellow;
-}
+       }
-.header {
+       .header {
          background-color: #f1f3f5;
          padding-top: 10px;
        
@@ -537,8 +733,9 @@ export default {
          }
        
          .bottomheader {
-    overflow: auto;
+           overflow: scroll;
            width: 99%;
+           height: 100vh;
            background-color: #fff;
            margin: 10px auto;
            padding: 10px 20px;
@@ -666,6 +863,7 @@ export default {
              }
            }
          }
-}
+       }
-</style>
+       </style>
+       
   

src/views/system/followupsee/index.vue

@@ -246,11 +246,11 @@
             >
             <!-- <br/> -->
               <el-form-item label="是否接通" prop="phone">
-                <el-radio v-model="formlist.phoneConnectStatus" label="1"
+                <el-radio v-model="formlist.phoneConnectStatus" label="CONNECTED"
-                  >是</el-radio
+                  >已接通</el-radio
                 >
-                <el-radio v-model="formlist.phoneConnectStatus" label="0"
+                <el-radio v-model="formlist.phoneConnectStatus" label="NOTCONNECTED"
-                  >否</el-radio
+                  >未接通</el-radio
                 >
               </el-form-item>
               <br />
@@ -311,10 +311,10 @@
                   inactive-value="0"
                 >
                 </el-switch> -->
-                <el-radio disabled v-model="formlist.routeHandleRemark" label="1"
+                <el-radio disabled v-model="formlist.phonePushSign" label="1"
                   >已开启</el-radio
                 >
-                <el-radio  disabled v-model="formlist.routeHandleRemark" label="0"
+                <el-radio  disabled v-model="formlist.phonePushSign" label="0"
                   >未开启</el-radio
                 >
               </el-form-item>
@@ -366,16 +366,7 @@
                 /> -->
               </el-form-item>
               <br />
-          
+        <div class="pushMethod">
-              <el-form-item label="话术图" prop="phone">
-                <img
-                  :src="formlist.scriptFilePath"
-                  style="width: 250px; height: 200px"
-                 
-                />
-              </el-form-item>
-              <br />
-
               <el-form-item label="短信模板：" prop="phone">
                 <span class="spanname">
                   <message
@@ -387,7 +378,16 @@
                 </span>
               
               </el-form-item>
+            </div>
+            <br/>
+              <el-form-item label="话术图" prop="phone">
+                <img
+                  :src="formlist.scriptFilePath"
+                  style="width: 250px; height: 200px"
                  
+                />
+              </el-form-item>
+              <br />
             </el-form>
           </div>
         </div>
@@ -692,6 +692,8 @@ export default {
               (this.form.diseaseTypeId = this.formlist.diseaseTypeId),
               (this.form.diseaseTypeName = this.formlist.diseaseTypeName),
               (this.form.routeHandleRemark = this.formlist.routeHandleRemark);
+              (this.form.phoneConnectStatus= this.formlist.phoneConnectStatus);
+
             (this.form.visitRecordId = this.$route.query.visitRecordId),
               // console.log(this.form, 'this.form')
               // return
@@ -731,13 +733,23 @@ export default {
 };
 </script>
     <style lang="scss" scoped>
+       .pushMethod {
+        height: 30px;
+        // margin-top: 30px;
+        line-height: 30px;
+        font-size: 13px;
+        color: #64666a;
+        .spanname {
+          pointer-events: none;
+        }
+      }
 ::v-deep .el-input.is-disabled .el-input__inner {
   background: #fff !important;
   color: #606266;
 }
-.spanname {
+// .spanname {
-          pointer-events: none;
+//           pointer-events: none;
-        }
+//         }
 ::v-deep .el-textarea.is-disabled .el-textarea__inner {
   color: #606266;
   background: #fff;

src/views/system/specialDiseaseNode/index.vue

@@ -183,7 +183,7 @@
         </div>
         <div class="bottomform">
           <wangeditor
-            style="width: 100%"
+            style="width: 100%;background-color: red;"
             :nodeContent="form.nodeContent"
             @on-nodeContent="onNodeContent"
             v-show="
@@ -193,69 +193,6 @@
             "
             ref="wangeditor"
           />
-          <!-- <div
-            class="card"
-            v-show="form.taskSubdivisiontemplateType == 'SCRIPT'"
-          > -->
-          <!-- <div class="flex">
-              <div class="pushMethod">
-                推送方式：
-                <span> 人工电话 </span>
-              </div>
-              <div>
-                短信提醒:
-                <span>
-                  <el-select
-                    v-model="form.phoneMessageRemind"
-                    style="width: 150px"
-                  >
-                    <el-option
-                      v-for="item in optionslist"
-                      :key="item.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    >
-                    </el-option>
-                  </el-select>
-                </span>
-              </div>
-              <div>
-                重拨次数:
-                <span>
-                  <el-select v-model="form.redialTimes" style="width: 150px">
-                    <el-option
-                      v-for="item in optionslistS"
-                      :key="item.dictValue"
-                      :label="item.dictLabel"
-                      :value="item.dictValue"
-                    >
-                    </el-option>
-                  </el-select>
-                </span>
-              </div>
-              <div class="pushMethod">
-                模板：
-                <scripts
-                  @on-template="messageontemplateword"
-                  :templateId="form.phoneTemplateId"
-                  :templateName="form.phoneTemplateName"
-                ></scripts>
-              </div>
-              <div class="pushMethod">
-                <el-switch
-                  v-model="form.phonePushsign"
-                  active-color="#13ce66"
-                  active-value="1"
-                  inactive-value="0"
-                >
-                </el-switch>
-              </div>
-            </div> -->
-          <!-- <div class="flextwo">
-              <div class="text">短信预览：</div>
-              <el-input class="textarea" v-model="form.messagePreview" disabled></el-input>
-            </div> -->
-          <!-- </div> -->
           <div
             class="card"
             v-show="form.taskSubdivisiontemplateType != 'SCRIPT'"
@@ -1155,6 +1092,7 @@ export default {
       display: flex;
       width: 100%;
       align-items: center;
+      // background: red;
       justify-content: space-between;
 
       .pushMethod {
@@ -1182,6 +1120,7 @@ export default {
 
 .topform {
   padding: 15px 0 0 15px;
+  height: 200px;
 
   .form {
     ::v-deep .el-input__inner {

src/views/system/taskExecuteRecord/index.vue

@@ -42,19 +42,19 @@
     <div ref="table">
       <el-table v-loading="loading" :data="taskExecuteRecordList" @selection-change="handleSelectionChange"
         :max-height="maxTableHeight" style="width: 100%">
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection"  align="center" />
         <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
         <!-- <el-table-column label="患者表id" align="center" prop="patientId" /> -->
         <el-table-column label="患者姓名" align="center" prop="patientName" />
         <el-table-column label="电话" align="center" prop="patientPhone" />
-        <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber" width="140" />
+        <el-table-column label="就诊流水号" align="center" prop="visitSerialNumber"  />
         <el-table-column label="医院" align="center" prop="hospitalAgencyName" />
         <el-table-column label="院区" align="center" prop="campusAgencyName" />
         <el-table-column label="科室名称" align="center" prop="departmentName" />
         <el-table-column label="病区名称" align="center" prop="wardName" />
         <!-- <el-table-column label="门诊/住院号" align="center" prop="patientName" />
         <el-table-column label="手术名称" align="center" prop="patientName" /> -->
-        <el-table-column label="执行人姓名" align="center" prop="executePerson" width="140" />
+        <el-table-column label="执行人姓名" align="center" prop="executePerson" />
         <el-table-column label="管理路径节点名称" align="center" prop="manageRouteNodeName">
           <template slot-scope="scope">
             <span>
@@ -69,12 +69,12 @@
         </el-table-column>
         <el-table-column label="管理任务名称" align="center" prop="manageRouteName">
         </el-table-column>
-        <el-table-column label="入院时间" align="center" prop="admissionTime" width="180">
+        <el-table-column label="入院时间" align="center" prop="admissionTime" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.admissionTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="出院时间" align="center" prop="dischargeTime" width="180">
+        <el-table-column label="出院时间" align="center" prop="dischargeTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.dischargeTime, "{y}-{m}-{d}") }}</span>
           </template>
@@ -86,7 +86,7 @@
             </span>
           </template></el-table-column>
         <el-table-column label="任务名称" align="center" prop="manageRouteName" />
-        <el-table-column label="执行时间" align="center" prop="executeTime" width="180">
+        <el-table-column label="执行时间" align="center" prop="executeTime" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.executeTime, "{y}-{m}-{d}") }}</span>
           </template>