add

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -88,7 +88,7 @@
       <template v-slot:qualityResult="{ row }">
         <span v-if="row.qualityResult == 0">合格</span>
         <span v-else-if="row.qualityResult == 1">不合格</span>
-        <span v-else>-</span>
+        <span v-else>让步接收</span>
       </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">

src/views/warehouseManagement/stockManagement/add.vue

@@ -33,6 +33,7 @@
               </el-select>
             </el-form-item>
           </el-col> -->
+
           <el-col :span="8">
             <el-form-item label="物品类型" prop="extInfo.assetType">
               <!-- <DictSelection
@@ -910,21 +911,21 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="质检结果" prop="qualityResult">
+            <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
                 <DictSelection
-                  dictName="质检状态"
+                  dictName="质检结果"
                   clearable
-                  v-model="row.qualityResult"
+                  v-model="row.result"
                 />
               </template>
             </el-table-column>
-            <el-table-column label="质检状态" prop="qualityStatus">
+            <el-table-column label="质检状态" prop="status" width="120">
               <template slot-scope="{ row }">
                 <DictSelection
-                  dictName="质检结果"
+                  dictName="质检状态"
                   clearable
-                  v-model="row.qualityStatus"
+                  v-model="row.status"
                 />
               </template>
             </el-table-column>
@@ -1073,14 +1074,22 @@
                 {{ row.weightUnit }}
               </template>
             </el-table-column>
-            <el-table-column label="质检结果" prop="qualityResult">
+            <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
-                {{ row.qualityResult }}
+                <DictSelection
+                  dictName="质检结果"
+                  clearable
+                  v-model="row.result"
+                />
               </template>
             </el-table-column>
-            <el-table-column label="质检状态" prop="qualityStatus">
+            <el-table-column label="质检状态" prop="status" width="120">
               <template slot-scope="{ row }">
-                {{ row.qualityStatus }}
+                <DictSelection
+                  dictName="质检状态"
+                  clearable
+                  v-model="row.status"
+                />
               </template>
             </el-table-column>
           </el-table>
@@ -1298,8 +1307,8 @@
                 weight: item.weight / Number(item.minPackingCount),
                 weightUnit: item.weightUnit,
                 engrave: item.engrave,
-                qualityResult: item.qualityResult,
-                qualityStatus: item.qualityStatus
+                result: item.result,
+                status: item.status
               });
             }
           });
@@ -1772,6 +1781,11 @@
                   this.$set(i, 'minPackingCount ', item.minPackingCount);
                   this.$set(i, 'measuringUnit', item.measuringUnit);
                   this.$set(i, 'isPack', false);
+                  if (this.formData.extInfo.assetType == 1) {
+                    this.$set(i, 'status', '0');
+                  } else {
+                    this.$set(i, 'status', '1');
+                  }
 
                   if (!item.isUnpack) {
                     if (index < item.warehouseLedgerDetails.length - 1) {
@@ -1983,8 +1997,8 @@
                     engrave: it.engrave,
                     materialDetails: this.materialDetails(it.onlyCode),
                     packingCount: it.packingCount,
-                    qualityStatus: it.qualityStatus,
-                    qualityResult: it.qualityResult
+                    status: it.status,
+                    result: it.result
                   };
                 });
                 item.outInDetailRecordAddPOList = list;

src/views/warehouseManagement/stockManagement/details.vue

@@ -363,7 +363,20 @@
                 {{ row.weightUtil }}
               </template>
             </el-table-column>
-
+            <el-table-column label="质检结果" prop="result" width="120">
+              <template slot-scope="{ row }">
+                <span v-if="row.result == 0">合格</span>
+                <span v-else-if="row.result == 1">不合格</span>
+                <span v-else>让步接收</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="status" width="120">
+              <template slot-scope="{ row }">
+                <span v-if="row.status == 0">未质检</span>
+                <span v-else-if="row.status == 1">已质检</span>
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
             <el-table-column label="日期" prop="createTime" width="200">
               <template slot="header" slot-scope="scope">
                 {{ dateTypes == 1 ? '采购日期' : '生产日期' }}
@@ -447,6 +460,16 @@
                 {{ row.weightUnit }}
               </template>
             </el-table-column>
+            <el-table-column label="质检结果" prop="result" width="120">
+              <template slot-scope="{ row }">
+                {{ row.result }}
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="status" width="120">
+              <template slot-scope="{ row }">
+                {{ row.status }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>