质检计划新增 检验方式全检的时候 样品清单数据赋值bug修复 质检工单编辑的时候减少样品清单表格字段

src/views/inspectionPlan/components/edit.vue

@@ -122,6 +122,7 @@
             <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
             <template v-for="column in tableColumns2">
               <el-table-column
+                :key="column.prop"
                 :label="column.label"
                 :prop="column.prop"
                 :show-overflow-tooltip="true"
@@ -522,6 +523,12 @@ export default {
         list.push(obj);
       }
       this.$refs.table12.setData(list);
+
+      // *** 如果检验方式是全量的话 还需要同步样品清单数据
+      if(this.baseForm.qualityMode == 1 && this.baseForm.inspectionStandards){
+        this.handleSampleList();
+      }
+      console.log(this.baseForm,'form --')
     },
 
     //成品类型检验类型，计划来源库存台账, 生成来源清单
@@ -546,6 +553,7 @@ export default {
 
     //获取基本信息中计量方式
     getInspectionStandards(data) {
+      console.log(data,'data')
       this.baseForm.inspectionStandards = data;
       this.handleSampleList();
     },

src/views/inspectionWork/components/QualityContentTabs.vue

@@ -110,7 +110,7 @@
               </template>
             </el-table-column>
           </template>
-          <el-table-column label="处置状态" prop="disposalStatus" align="center" width="80" fixed="right"
+          <el-table-column label="处置状态" prop="disposalStatus" align="center" fixed="right"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="scope.row.disposalStatus == 1 && form.qualityType == 2">返工</span>
@@ -123,10 +123,10 @@
               <span v-if="scope.row.disposalStatus == 8">回用</span>
             </template>
           </el-table-column>
-          <el-table-column label="处置时间" prop="disposeTime" align="center" width="100" fixed="right"
+          <el-table-column label="处置时间" prop="disposeTime" align="center"  fixed="right"
             :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column label="质检状态" prop="qualityStatus" align="center" width="120" fixed="right"
+          <el-table-column label="质检状态" prop="qualityStatus" align="center" fixed="right"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span v-if="scope.row.qualityStatus == 0">未检</span>
@@ -134,7 +134,7 @@
               <span v-if="scope.row.qualityStatus == 2">待检</span>
             </template>
           </el-table-column>
-          <el-table-column label="质检结果" prop="qualityResults" align="center" width="120" fixed="right"
+          <el-table-column label="质检结果" prop="qualityResults" align="center" fixed="right"
             :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <el-select @change="selectQualityResultsChange" v-model="scope.row.qualityResults" placeholder="请选择" style="width: 100%;"
@@ -221,43 +221,41 @@ export default {
         {
           label: '样品编码',
           prop: 'sampleCode',
-          width: '160',
+          width: '200',
           align: 'center',
           fixed: 'left'
         },
         {
           label: '编码',
           prop: 'categoryCode',
-          width: '160',
           align: 'center',
           fixed: 'left'
         },
         {
           label: '名称',
           prop: 'categoryName',
-          width: '150',
           align: 'center'
         },
-        { label: '批次号', prop: 'batchNo', align: 'center' },
-        { label: '发货条码', prop: 'barcodes', align: 'center' },
-        { label: '包装编码', prop: 'packageNo', align: 'center' },
+        { label: '批次号', prop: 'batchNo', align: 'center'},
+        // { label: '发货条码', prop: 'barcodes', align: 'center' },
+        // { label: '包装编码', prop: 'packageNo', align: 'center' },
         // { label: '包装数量', prop: 'packingQuantity', align: 'center' },
-        { label: '包装单位', prop: 'packingUnit', align: 'center' },
-        { label: '计量数量', prop: 'measureQuantity', align: 'center' },
-        { label: '计量单位', prop: 'measureUnit', align: 'center' },
-        { label: '供应商名称', prop: 'supplierName', align: 'center', width: '120' },
-        { label: '供应商代号', prop: 'supplierCode', align: 'center', width: '120' },
-        { label: '物料代号', prop: 'materielDesignation', align: 'center', slot: 'materielDesignation', width: '120' },
-        { label: '客户代号', prop: 'clientCode', align: 'center', slot: 'clientCode', width: '120' },
-        { label: '刻码', prop: 'engrave', align: 'center', slot: 'engrave', width: '120' },
-        { label: '重量', prop: 'weight', align: 'center', slot: 'weight', width: '120' },
-        { label: '重量单位', prop: 'weightUnit', align: 'center', width: 100 },
-        { label: '仓库', prop: 'warehouseName', align: 'center', width: 100 },
-        { label: '货区', prop: 'areaName', align: 'center' },
-        { label: '货架', prop: 'goodsShelfName', align: 'center' },
-        { label: '货位', prop: 'goodsAllocationName', align: 'center' },
-        { label: '生产日期', prop: 'productionDate', align: 'center' },
-        { label: '采购日期', prop: 'purchaseDate', align: 'center' },
+        // { label: '包装单位', prop: 'packingUnit', align: 'center' },
+        // { label: '计量数量', prop: 'measureQuantity', align: 'center' },
+        // { label: '计量单位', prop: 'measureUnit', align: 'center' },
+        // { label: '供应商名称', prop: 'supplierName', align: 'center', width: '120' },
+        // { label: '供应商代号', prop: 'supplierCode', align: 'center', width: '120' },
+        // { label: '物料代号', prop: 'materielDesignation', align: 'center', slot: 'materielDesignation', width: '120' },
+        // { label: '客户代号', prop: 'clientCode', align: 'center', slot: 'clientCode', width: '120' },
+        // { label: '刻码', prop: 'engrave', align: 'center', slot: 'engrave', width: '120' },
+        // { label: '重量', prop: 'weight', align: 'center', slot: 'weight', width: '120' },
+        // { label: '重量单位', prop: 'weightUnit', align: 'center', width: 100 },
+        // { label: '仓库', prop: 'warehouseName', align: 'center', width: 100 },
+        // { label: '货区', prop: 'areaName', align: 'center' },
+        // { label: '货架', prop: 'goodsShelfName', align: 'center' },
+        // { label: '货位', prop: 'goodsAllocationName', align: 'center' },
+        // { label: '生产日期', prop: 'productionDate', align: 'center' },
+        // { label: '采购日期', prop: 'purchaseDate', align: 'center' },
       ],
 
       conditionType: null,