huang_an 2 лет назад
Родитель
Сommit
441d1ba230
2 измененных файлов с 30 добавлено и 11 удалено
  1. 3 1
      src/enum/dict.js
  2. 27 10
      src/views/warehouseManagement/stockManagement/add.vue

+ 3 - 1
src/enum/dict.js

@@ -12,5 +12,7 @@ export default {
   仓库状态: 'warehouse_status',
   仓库类型: 'WD_inventoryList',
   经销商列表: 'supplierList',
-  重量单位: 'weight_unit'
+  重量单位: 'weight_unit',
+  质检状态: 'quality_control_code',
+  质检结果: 'Qc_results_code'
 };

+ 27 - 10
src/views/warehouseManagement/stockManagement/add.vue

@@ -910,6 +910,25 @@
               </template>
             </el-table-column>
 
+            <el-table-column label="质检结果" prop="qualityResult">
+              <template slot-scope="{ row }">
+                <DictSelection
+                  dictName="质检状态"
+                  clearable
+                  v-model="row.qualityResult"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" prop="qualityStatus">
+              <template slot-scope="{ row }">
+                <DictSelection
+                  dictName="质检结果"
+                  clearable
+                  v-model="row.qualityStatus"
+                />
+              </template>
+            </el-table-column>
+
             <el-table-column
               v-if="formData.bizType != 5"
               label="生产日期"
@@ -1056,18 +1075,12 @@
             </el-table-column>
             <el-table-column label="质检结果" prop="qualityResult">
               <template slot-scope="{ row }">
-                <el-select v-model="row.qualityResult" placeholder="请选择">
-                  <el-option value="0" label="合格"></el-option>
-                  <el-option value="1" label="不合格"></el-option>
-                </el-select>
+                {{ row.qualityResult }}
               </template>
             </el-table-column>
             <el-table-column label="质检状态" prop="qualityStatus">
               <template slot-scope="{ row }">
-                <el-select v-model="row.qualityStatus" placeholder="请选择">
-                  <el-option value="0" label="未质检"></el-option>
-                  <el-option value="1" label="已质检"></el-option>
-                </el-select>
+                {{ row.qualityStatus }}
               </template>
             </el-table-column>
           </el-table>
@@ -1284,7 +1297,9 @@
                 clientCode: item.clientCode,
                 weight: item.weight / Number(item.minPackingCount),
                 weightUnit: item.weightUnit,
-                engrave: item.engrave
+                engrave: item.engrave,
+                qualityResult: item.qualityResult,
+                qualityStatus: item.qualityStatus
               });
             }
           });
@@ -1967,7 +1982,9 @@
                     weightUtil: it.weightUtil,
                     engrave: it.engrave,
                     materialDetails: this.materialDetails(it.onlyCode),
-                    packingCount: it.packingCount
+                    packingCount: it.packingCount,
+                    qualityStatus: it.qualityStatus,
+                    qualityResult: it.qualityResult
                   };
                 });
                 item.outInDetailRecordAddPOList = list;