修改入库和质检

src/views/bpm/stockManagement/details.vue

@@ -366,6 +366,73 @@
             </el-table-column>
           </el-table>
         </div>
+        <div class="mt20">
+          <header-title :title="`物料明细`" size="16px"> </header-title>
+          <el-table
+            ref="multipleTable"
+            :data="showMaterialList"
+            tooltip-effect="dark"
+            :max-height="300"
+            :row-class-name="tableRowClassName"
+            :header-cell-style="rowClass"
+            border
+            style="width: 100%"
+            stripe
+            height="300px"
+            v-el-table-infinite-scroll="materielHandleScroll"
+          >
+            <el-table-column label="序号" type="index" width="50">
+            </el-table-column>
+            <el-table-column
+              label="编码"
+              prop="categoryCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="名称"
+              prop="categoryName"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column label="批次号" prop="batchNo"></el-table-column>
+            <el-table-column
+              label="物料编码"
+              prop="materialCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="发货条码"
+              prop="barcodes"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="计量数量"
+              prop="measureQuantity"
+            ></el-table-column>
+            <el-table-column
+              label="计量单位"
+              prop="measureUnit"
+            ></el-table-column>
+            <el-table-column label="物料代号" prop="materielDesignation">
+            </el-table-column>
+            <el-table-column label="客户代号" prop="clientCode">
+            </el-table-column>
+            <el-table-column label="刻码" prop="engrave"> </el-table-column>
+            <el-table-column width="100" label="重量" prop="weight">
+            </el-table-column>
+            <el-table-column label="重量单位" prop="weightUnit">
+            </el-table-column>
+            <el-table-column label="质检结果" prop="result" width="120">
+              <template slot-scope="{ row }">
+                <span>{{ qualityResults[row.result] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="status" width="120">
+              <template slot-scope="{ row }">
+                <span>{{ qualityStatus[row.status] }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
     </el-card>
   </div>

src/views/bpm/stockManagement/quality.vue

@@ -800,12 +800,12 @@
         let materialAllChecked = true;
         if (this.packingList?.length > 0) {
           packingAllChecked = this.packingList.every(
-            (item) => item.status == 1
+            (item) => item.status == 2
           );
         }
         if (this.materialList?.length > 0) {
           materialAllChecked = this.materialList.every(
-            (item) => item.status == 1
+            (item) => item.status == 2
           );
         }
         if (packingAllChecked && materialAllChecked) {
@@ -883,6 +883,7 @@
         this.materialList.map((item, index) => {
           if (item.parentIndex === row.index) {
             this.$set(this.materialList[index], 'result', value);
+            this.$set(this.materialList[index], 'status', 2);
           }
         });
       },
@@ -899,6 +900,7 @@
           return item.result == 1;
         });
         this.$set(this.packingList[packingIndex], 'result', boolen ? 1 : 2);
+        this.$set(this.packingList[packingIndex], 'status', 2);
       },
       // 重量限制
       weightInput(value, row, type) {

src/views/bpm/stockManagement/storage_2.vue

@@ -1714,6 +1714,7 @@
         this.materialList.map((item, index) => {
           if (item.parentIndex === row.index) {
             this.$set(this.materialList[index], 'result', value);
+            this.$set(this.materialList[index], 'status', 2);
           }
         });
       },
@@ -1730,6 +1731,7 @@
           return item.result == 1;
         });
         this.$set(this.packingList[packingIndex], 'result', boolen ? 1 : 2);
+        this.$set(this.packingList[packingIndex], 'status', 2);
       },
       // 重量限制
       weightInput(value, row, type) {
@@ -2191,8 +2193,18 @@
             isUnpack: row.isUnpack, // 是否允许拆包
             productionDate: productionDate, // 生产日期
             purchaseDate: purchaseDate, // 采购时间
-            result: this.formData.bizType == 2 && this.form.isQmsCheck ? 0 : 1, // 结果(0无 1合格 2不合格) 是否质检isQmsCheck(0否 1是) bizType(2采购入库)
-            status: this.formData.bizType == 2 && this.form.isQmsCheck ? 0 : 2 // 状态(0未质检 1待检 2已质检)
+            result:
+              this.clientEnvironmentId == 3
+                ? 1
+                : this.formData.bizType == 2 && this.form.isQmsCheck
+                ? 0
+                : 1, // 结果(0无 1合格 2不合格) 是否质检isQmsCheck(0否 1是) bizType(2采购入库)
+            status:
+              this.clientEnvironmentId == 3
+                ? 2
+                : this.formData.bizType == 2 && this.form.isQmsCheck
+                ? 0
+                : 2 // 状态(0未质检 1待检 2已质检)
           };
           packingList.push(item);
         }
@@ -2280,8 +2292,18 @@
             clientCode: '', // 客户代号
             materielDesignation: '', // 物料代号
             engrave: '', // 刻码
-            result: this.formData.bizType == 2 && this.form.isQmsCheck ? 0 : 1, // 结果(0无 1合格 2不合格) 是否质检isQmsCheck(0否 1是) bizType(2采购入库)
-            status: this.formData.bizType == 2 && this.form.isQmsCheck ? 0 : 2 // 状态(0未质检 1待检 2已质检)
+            result:
+              this.clientEnvironmentId == 3
+                ? 1
+                : this.formData.bizType == 2 && this.form.isQmsCheck
+                ? 0
+                : 1, // 结果(0无 1合格 2不合格) 是否质检isQmsCheck(0否 1是) bizType(2采购入库)
+            status:
+              this.clientEnvironmentId == 3
+                ? 2
+                : this.formData.bizType == 2 && this.form.isQmsCheck
+                ? 0
+                : 2 // 状态(0未质检 1待检 2已质检)
           });
         }
         return materialList;

src/views/bpm/stockManagement/storage_3.vue

@@ -1798,6 +1798,7 @@
         this.materialList.map((item, index) => {
           if (item.parentIndex === row.index) {
             this.$set(this.materialList[index], 'result', value);
+            this.$set(this.materialList[index], 'status', 2);
           }
         });
       },
@@ -1814,6 +1815,7 @@
           return item.result == 1;
         });
         this.$set(this.packingList[packingIndex], 'result', boolen ? 1 : 2);
+        this.$set(this.packingList[packingIndex], 'status', 2);
       },
       // 重量限制
       weightInput(value, row, type) {