修改指令表示工序页面

applications/dee-mes/src/privateComponents/components/AoProcessDetailEdit/index.vue

@@ -72,6 +72,12 @@ export default {
               ],
               'operator': 'AND'
             },
+            'sortItem': [
+              {
+                'fieldName': 'operationLabel',
+                'sortOrder': 'asc'
+              }
+            ],
             'openProps': [
               {
                 'name': 'target'
@@ -88,6 +94,7 @@ export default {
       }
       post(`/ExtProcessPlan/aoSearch`, params).then(res => {
         if (res.items) {
+          res.items.content[0].isProcess = true
           this.aoData = res.items.content[0]
           this.loading = true
         }

applications/dee-mes/src/privateComponents/components/ProcessInformation/index.vue

@@ -65,7 +65,7 @@
             <span v-else>{{ scope.row.target.airFlag }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           show-overflow-tooltip
           align="center"
           label="定额工时"
@@ -75,7 +75,7 @@
             <el-input v-if="!item.readOnly" v-model="scope.row.target.workHour" size="mini" @change="changWorkData(scope.row)" />
             <span v-else>{{ scope.row.target.workHour }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </div>
   </div>
@@ -92,7 +92,7 @@ export default {
       type: Object,
       default: () => null
     },
-    from: {
+    form: {
       type: Object,
       default: () => null
     },
@@ -117,28 +117,29 @@ export default {
     }
   },
   watch: {
-    // tableData: {
-    //   handler(val) {
-    //     this.$emit('input', val)
-    //     console.log(val)
-    //     console.log(1, this.basicData.sourceExtProcessUsageLink, this.tableData)
-    //     this.basicData.sourceExtProcessUsageLink = val
-    //     console.log(2, this.basicData.sourceExtProcessUsageLink)
-    //   },
-    //   deep: true
-    // },
-    id: {
+    value: {
       immediate: true,
       handler(newVal, oldVal) {
-        this.tableData = this.basicData.sourceExtProcessUsageLink
+        if (this.value && this.value.length > 0) {
+          this.tableData = this.value
+        }
       }
     }
+    // id: {
+    //   immediate: true,
+    //   handler(val) {
+    //     if (val && this.basicData.isProcess) {
+    //       console.log(444)
+    //       this.tableData = this.basicData.sourceExtProcessUsageLink
+    //     }
+    //   }
+    // }
   },
   mounted() {
   },
   methods: {
     changeData(row) {
-      row.operator = 'MODIFY'
+      row.operator = 'NO_CHANGE'
       row.target.operator = 'MODIFY'
       this.$emit('input', this.tableData)
     },
@@ -150,7 +151,7 @@ export default {
       //   }
       // })
       // this.basicData.opWorkHour = (workHour / 60).toFixed(2)
-      row.operator = 'MODIFY'
+      row.operator = 'NO_CHANGE'
       row.target.operator = 'MODIFY'
       this.$emit('input', this.tableData)
     }