物料配套分发中的实际重量的修改

applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/header.vue

@@ -155,58 +155,59 @@
           :width="80"
         />
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].inventory.extMaterial.modelNo"
           align="center"
           label="型号/件号"
           :width="120"
           sortable
           show-overflow-tooltip
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.jobResponseOutStorageVOS"> {{ scope.row.jobResponseOutStorageVOS[0].inventory.extMaterial.modelNo }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.arrivalVer"
           align="center"
           label="实发版次"
           :width="120"
           sortable
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.jobResponseOutStorageVOS"> {{ scope.row.jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.arrivalVer }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.inventoryJobResponses[0].testNo"
           align="center"
           label="验收单号"
           :width="120"
           sortable
           show-overflow-tooltip
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.jobResponseOutStorageVOS"> {{ scope.row.jobResponseOutStorageVOS[0].inventory.jobResponse.jobOrder.inventoryJobResponses[0].testNo }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].jobOrder.checkoutAmount"
           align="center"
           label="已接收数量"
           :width="130"
           sortable
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.jobResponseOutStorageVOS"> {{ scope.row.jobResponseOutStorageVOS[0].jobOrder.checkoutAmount }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].outsideAmount"
           align="center"
           label="实发数量"
           :width="120"
           sortable
-        />
-        <!-- <el-table-column
-          prop="type"
-          align="center"
-          label="类型"
-          :width="80"
-          sortable
-        /> -->
-        <!-- <el-table-column
-          prop="receiptNo"
-          align="center"
-          label="单据编号"
-          :width="120"
-          sortable
-        /> -->
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.jobResponseOutStorageVOS"> {{ scope.row.jobResponseOutStorageVOS[0].outsideAmount }}</span>
+          </template>
+        </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].actualWeight"
+          prop="actualWeight"
           align="center"
           label="实称重量"
           :width="135"
@@ -227,16 +228,15 @@
             />
             <span
               v-else-if="
-                scope.row[scope.column.property] ||
-                  scope.row.resTypeName !== '外购成品'
+                scope.row.jobResponseOutStorageVOS &&
+                  scope.row.extMaterial.resType2.typeName === '外购成品'
               "
-            >{{ scope.row[scope.column.property] }}</span>
-            <!-- <span v-else class="tips">必填项</span> -->
+            >{{ scope.row.jobResponseOutStorageVOS[0].actualWeight }}</span>
             <i v-if="scope.row.actualWeightLoading" class="el-icon-loading" />
           </template>
         </el-table-column>
         <el-table-column
-          prop="jobResponseOutStorageVOS[0].removeWeight"
+          prop="removeWeight"
           align="center"
           label="去除重量"
           :width="135"
@@ -255,7 +255,7 @@
               @focus="tableInputFocus"
               @blur="deeTableBlur(scope.row, false)"
             />
-            <span v-else>{{ scope.row[scope.column.property] }}</span>
+            <span v-else-if="scope.row.jobResponseOutStorageVOS && scope.row.extMaterial.resType2.typeName === '外购成品'">{{ scope.row.jobResponseOutStorageVOS[0].removeWeight }}</span>
             <i v-if="scope.row.removeWeightLoading" class="el-icon-loading" />
           </template>
         </el-table-column>
@@ -378,21 +378,11 @@ export default {
         return 'scan-code'
       }
       if (
-        (column.property === 'jobResponseOutStorageVOS[0].actualWeight' && row.actualWeightSelect) ||
-        (column.property === 'jobResponseOutStorageVOS[0].removeWeight' && row.removeWeightSelect)
+        (column.property === 'actualWeight' && row.actualWeightSelect) ||
+        (column.property === 'removeWeight' && row.removeWeightSelect)
       ) {
         return 'highlight'
       }
-
-      // if (column.property === 'receiptNo' && !row.actualWeight) {
-      //   return 'tdbans'
-      // }
-      // if (
-      //   row.resTypeName === '外购成品' &&
-      //   ((column.property === 'actualWeight' && !row.actualWeight))
-      // ) {
-      //   return 'tdtips'
-      // }
     },
     tableInputFocus() {
       clearTimeout(this.timer)
@@ -401,10 +391,10 @@ export default {
     deeTableEdit(row, column, cell, event) {
       var that = this
       if (row.extMaterial.resType2.typeName !== '外购成品' || !row.jobResponseOutStorageVOS) return
-      if (column.property === 'jobResponseOutStorageVOS[0].actualWeight') {
+      if (column.property === 'actualWeight') {
         this.setRowValue = row.actualWeight
         row.actualWeightSelect = true
-      } else if (column.property === 'jobResponseOutStorageVOS[0].removeWeight') {
+      } else if (column.property === 'removeWeight') {
         this.setRowValue = row.removeWeight
         row.removeWeightSelect = true
       } else {
@@ -471,6 +461,7 @@ export default {
           } else {
             row.removeWeightLoading = false
           }
+          this.init()
         })
     },
     cellClassName({ row, column, rowIndex, columnIndex }) {

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -230,11 +230,11 @@ export default {
       this.$store.dispatch('menu/activeModel', {
         appId: 'myTaskReceive',
         pageInfo: {
-          title: this.$route.query.title + '执行',
+          title: this.$route.query.title,
           path: '/dee-mes/taskExecution'
         }
       })
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch('app/closeSideBar', false)
     },
     getTaskAcceptance() {
       const that = this

applications/dee-task-center/src/views/myTaskReceive/index.vue

@@ -91,7 +91,7 @@ export default {
           path: '/dee-mes/taskReception'
         }
       })
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch('app/closeSideBar', false)
     }
   }
 }