695593266@qq.com 4 месяцев назад
Родитель
Сommit
18852b57c7
2 измененных файлов с 13 добавлено и 3 удалено
  1. 1 1
      src/views/workOrder/components/details.vue
  2. 12 2
      src/views/workOrder/mixins/release.js

+ 1 - 1
src/views/workOrder/components/details.vue

@@ -307,7 +307,7 @@
                   <el-option
                     v-for="item in shiftList"
                     :key="item.id"
-                    :label="item.name"
+                    :label="item.dutyName"
                     :value="item.id"
                   >
                   </el-option>

+ 12 - 2
src/views/workOrder/mixins/release.js

@@ -316,7 +316,7 @@ export default {
       console.log(this.current, 'this.current 查询工位数据');
       // let id = this.current.taskId || this.current.firstTaskId;
       let id = '';
-      if (this.isTpye == 'detail' && this.current.taskAss == 1) {
+      if (this.isTpye == 'detail') {
         id = this.current.firstTaskId;
       } else {
         if (!this.current.taskId || this.current.taskId < 0) {
@@ -326,7 +326,6 @@ export default {
         }
       }
 
-      console.log(id, 'id 查询工位数据');
       await listByFirstTaskId(taskId ? taskId : id)
         .then((res) => {
           this.stationList = res;
@@ -955,6 +954,17 @@ export default {
       this.$set(dataRow, 'selection', []);
       let tab = `tableRef${[dataRow.index]}`;
       this.$refs[tab][0].setSelectedRowKeys([]);
+      // this.$nextTick(() => {
+      //   const tab = `tableRef${dataRow.index}`;
+      //   const tableRefs = this.$refs[tab];
+
+      //   if (!tableRefs || !tableRefs[0]) {
+      //     console.warn(`table ref ${tab} not ready`);
+      //     return;
+      //   }
+
+      //   tableRefs[0].setSelectedRowKeys([]);
+      // });
     },
 
     mergeNewRows(oldList, newList) {