fix：预计完成时间；查看备注等

src/views/taskManage/index.vue

@@ -92,27 +92,14 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label='负责人'>
+        <el-form-item label='负责人/参与人' v-if="!(statusCode=== 'PRE_HANDLING'||statusCode==='TO_BE_ASSIGN')">
           <el-select
-            style='width: 120px'
+            style='width: 150px'
             placeholder='请选择'
             clearable
-            v-model='searchForm.leaders'
-          >
-            <el-option
-              v-for='user in userList'
-              :key='user.id'
-              :label='user.realName'
-              :value='user.id'
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label='参与人'>
-          <el-select
-            style='width: 120px'
-            placeholder='请选择'
-            clearable
-            v-model='searchForm.participator'
+            multiple
+            collapse-tags
+            v-model='searchForm.leaderAndParticipator'
           >
             <el-option
               v-for='user in userList'
@@ -218,7 +205,8 @@
       title='详情'
       :close-on-click-modal='false'
       :visible.sync='detailVisible'
-      width='1200px'
+      class='dialogDetail'
+      width='1300px'
       @close='getlist()'
     >
       <!-- <div class="step-bar">
@@ -329,17 +317,6 @@
                 style='z-index: 3000'
               ></el-image-viewer>
             </p>
-            <p
-              class='item'
-              style='width: 100%; display: flex'
-            >
-              <span class='label'>备注</span>
-              <span
-                style='flex: 1; display: inline-block;padding:0 3%;'
-                class='value'
-                v-html='detail.remark'
-              ></span>
-            </p>
           </div>
           <div
             style='padding: 5px; overflow: auto'
@@ -348,6 +325,19 @@
           ></div>
         </div>
         <div class='record'>
+          <div class='title'>备注</div>
+          <ul class='chat_content'>
+            <el-input
+              style='width: 95%'
+              type='textarea'
+              :rows='4'
+              v-model='detail.remark'
+              placeholder='备注'
+            ></el-input>
+            <el-button type='success' size='mini' @click='saveRemark' v-if='detail.remark' style='margin-left: 8px'>保存</el-button>
+          </ul>
+        </div>
+        <div class='record'>
           <div class='title'>沟通记录</div>
           <ul
             class='chat_content'
@@ -917,11 +907,6 @@ export default {
           width: 80,
         },
         {
-          label: '工单状态',
-          key: 'orderStatusTxt',
-          width: 80,
-        },
-        {
           label: '优先级',
           key: 'priorityStatus',
           width: 120,
@@ -968,8 +953,8 @@ export default {
           },
         },
         {
-          label: '来源',
-          key: 'fromBusiness',
+          label: '备注',
+          key: 'remark',
           width: 80,
         },
         {
@@ -980,11 +965,13 @@ export default {
         {
           label: '负责人',
           key: 'leaderNames',
+          show: !(this.statusCode === 'PRE_HANDLING' || this.statusCode === 'TO_BE_ASSIGN'),
           width: 80,
         },
         {
           label: '参与人',
           key: 'participatorName',
+          show: !(this.statusCode === 'PRE_HANDLING' || this.statusCode === 'TO_BE_ASSIGN'),
           width: 80,
         },
         {
@@ -1039,24 +1026,22 @@ export default {
           width: 130,
         },
         {
+          label: '工单状态',
+          key: 'orderStatusTxt',
+          width: 80,
+        },
+        {
+          label: '来源',
+          key: 'fromBusiness',
+          width: 80,
+        },
+        {
           label: '操作',
           fixed: 'right',
           width: 120,
           align: 'center',
           render: item => (
             <span>
-              {(item.orderStatus === 'PRE_HANDLING' ||
-                item.orderStatus === 'TO_BE_ASSIGN' ||
-                item.orderStatus === 'TO_BE_CONFIRMED') && (
-                <span title='修改' class='icon-view'>
-                    <img
-                      width='24'
-                      height='24'
-                      src={updateWork}
-                      onClick={() => this.update(item)}
-                    />
-                  </span>
-              )}
               {
                 <span
                   title='详情'
@@ -1068,6 +1053,16 @@ export default {
                   ></i>
                 </span>
               }
+              {(item.orderStatus === 'PRE_HANDLING') && (
+                <span title='修改' class='icon-view'>
+                    <img
+                      width='24'
+                      height='24'
+                      src={updateWork}
+                      onClick={() => this.update(item)}
+                    />
+                  </span>
+              )}
               {item.orderStatus === 'TO_BE_ASSIGN' && (
                 <span title='指派给' class='icon-view'>
                   <img
@@ -1463,24 +1458,14 @@ export default {
       if (data.statusCode === 'IN_PROGRESS') {
         this.$set(
           this.searchForm,
-          'leaders',
-          this.userInfo.id,
-        )
-        this.$set(
-          this.searchForm,
-          'participator',
-          this.userInfo.id,
+          'leaderAndParticipator',
+          [this.userInfo.id],
         )
       } else {
         this.$set(
           this.searchForm,
-          'leaders',
-          '',
-        )
-        this.$set(
-          this.searchForm,
-          'participator',
-          '',
+          'leaderAndParticipator',
+          [],
         )
       }
       this.statusCode = data.statusCode
@@ -1500,6 +1485,7 @@ export default {
           startTime: this.periodTime && this.periodTime[0],
           endTime: this.periodTime && this.periodTime[1],
           ...this.searchForm,
+          leaderAndParticipator: this.searchForm.leaderAndParticipator ? this.searchForm.leaderAndParticipator.join(',') : '',
         })
         .then(res => {
           if (res.code !== 200) return
@@ -1677,6 +1663,16 @@ export default {
         document.documentElement.style.overflowY = 'hidden'
       }
     },
+    saveRemark() {
+      axios.post('platform/platformWorkOrder/updateRemark', {
+        id: this.currentRowId,
+        remark: this.detail.remark,
+      }).then(res => {
+        if (res.code === 200) {
+          this.$message.success('保存成功')
+        }
+      })
+    },
     async showDetail(item) {
       this.currentRowId = item.id
       await axios.get(`platform/platformWorkOrder/get?id=${item.id}`,
@@ -1837,6 +1833,10 @@ export default {
 
 .detail_list .item .value {
   color: #222;
+
+  &::v-deep img {
+    width: 100%;
+  }
 }
 
 .item_wrap {
@@ -2012,6 +2012,12 @@ export default {
   padding: 20px 0;
 }
 
+.dialogDetail {
+  &::v-deep .el-dialog {
+    margin-top: 9vh !important;
+  }
+}
+
 .detail_list {
   &::v-deep {
     table {