add

src/views/bpm/handleTask/components/inoutBound/detailDialog.vue

@@ -480,12 +480,13 @@
                   clearable
                   v-model="row.result"
                   v-show="!row.isPack"
+                  @itemChange="packItem($event, row)"
                 />
                 <span v-if="row.isPack">
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -498,9 +499,9 @@
                   v-show="!row.isPack"
                 />
                 <span v-if="row.isPack">
-                  <span v-if="!row.status"></span>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span>
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -612,20 +613,20 @@
             <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
                 <span>
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
               <template slot-scope="{ row }">
-                <span
-                  ><span v-if="!row.status"></span>
+                <span>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column
@@ -696,6 +697,7 @@
     },
     data() {
       return {
+        qualityFile: '',
         saveLoading: false,
         metailList: [],
         dateTypes: 1,
@@ -783,6 +785,14 @@
       this._getInfo();
     },
     methods: {
+      //包装结果
+      packItem(val, row) {
+        if (val.dictCode == 0) {
+          row.status = '1';
+        } else {
+          row.status = '';
+        }
+      },
       //质检物料提交
       async packMeta(data) {
         if (!data.result) {
@@ -819,9 +829,13 @@
         this.warehousingMaterialList.forEach((item) => {
           if (
             item.categoryCode == row.categoryCode &&
-            item.categoryCode == row.categoryCode
+            item.batchNo == row.batchNo
           ) {
-            packNo = item.packingCount;
+            if (this.warehousingMaterialList.length != 1) {
+              packNo = this.warehousingMaterialList.length;
+            } else {
+              packNo = item.packingCount;
+            }
           }
         });
 

src/views/bpm/stockManagement/add.vue

@@ -925,12 +925,13 @@
                   clearable
                   v-model="row.result"
                   v-if="!row.isPack"
+                  @itemChange="packItem($event, row)"
                 />
                 <span v-else>
-                  <span v-if="!row.result"></span>
                   <span v-if="row.result == 0">合格</span>
                   <span v-else-if="row.result == 1">不合格</span>
-                  <span v-else>让步接收</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
                 </span>
               </template>
             </el-table-column>
@@ -942,11 +943,11 @@
                   v-model="row.status"
                   v-if="!row.isPack"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
+                <span v-else>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
 
@@ -1111,12 +1112,14 @@
                   clearable
                   v-model="row.result"
                   v-if="!row.isMeta"
+                  @itemChange="packItem($event, row)"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
-                  <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                <span v-else>
+                  <span v-if="row.result == 0">合格</span>
+                  <span v-else-if="row.result == 1">不合格</span>
+                  <span v-else-if="row.result == 3">让步接收</span>
+                  <span v-else-if="row.result == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="status" width="120">
@@ -1127,11 +1130,11 @@
                   v-model="row.status"
                   v-if="!row.isMeta"
                 />
-                <span v-else
-                  ><span v-if="!row.status"></span>
+                <span v-else>
                   <span v-if="row.status == 0">未检</span>
-                  <span v-else>已检</span></span
-                >
+                  <span v-if="row.status == 1">已检</span>
+                  <span v-if="row.status == null"></span>
+                </span>
               </template>
             </el-table-column>
             <el-table-column label="操作" width="80">
@@ -1331,6 +1334,14 @@
       this.initData();
     },
     methods: {
+      //包装结果
+      packItem(val, row) {
+        if (val.dictCode == 0) {
+          row.status = '1';
+        } else {
+          row.status = '';
+        }
+      },
       cancel() {
         this.$emit('cancel');
       },