jingshuyong 9 месяцев назад
Родитель
Сommit
55e9ccd066
1 измененных файлов с 10 добавлено и 3 удалено
  1. 10 3
      src/views/inspectionPlan/components/new-edit.vue

+ 10 - 3
src/views/inspectionPlan/components/new-edit.vue

@@ -70,7 +70,7 @@
       </el-row>
       </el-row>
       <el-row>
       <el-row>
         <el-col :span="6">
         <el-col :span="6">
-          <el-form-item label="样品类型:"> 
+          <el-form-item label="样品类型:">
             <el-input disabled :value="sampletypeVal(baseForm.conditionType)" />
             <el-input disabled :value="sampletypeVal(baseForm.conditionType)" />
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
@@ -522,7 +522,7 @@
           { label: '批次号', prop: 'batchNo', align: 'center', width: 120 },
           { label: '批次号', prop: 'batchNo', align: 'center', width: 120 },
           { label: '发货条码', prop: 'barcodes', align: 'center' },
           { label: '发货条码', prop: 'barcodes', align: 'center' },
           { label: '包装编码', prop: 'packageNo', align: 'center' },
           { label: '包装编码', prop: 'packageNo', align: 'center' },
-          { label: '包装数量', prop: ' ', align: 'center' },
+          { label: '包装数量', prop: 'packingQuantity', align: 'center' },
           { label: '包装单位', prop: 'packingUnit', align: 'center' },
           { label: '包装单位', prop: 'packingUnit', align: 'center' },
           { label: '计量数量', prop: 'measureQuantity', align: 'center' },
           { label: '计量数量', prop: 'measureQuantity', align: 'center' },
           { label: '计量单位', prop: 'measureUnit', align: 'center' },
           { label: '计量单位', prop: 'measureUnit', align: 'center' },
@@ -705,7 +705,14 @@
             width: 120,
             width: 120,
             showOverflowTooltip: true
             showOverflowTooltip: true
           },
           },
-          { label: '包装数量', prop: 'packingQuantity', align: 'center' },
+          {
+            label: '包装数量',
+            prop: 'packingQuantity',
+            align: 'center',
+            formatter: (row) => {
+              return row.packingQuantity || 0;
+            }
+          },
           { label: '包装单位', prop: 'packingUnit', align: 'center' },
           { label: '包装单位', prop: 'packingUnit', align: 'center' },
           { label: '计量数量', prop: 'measureQuantity', align: 'center' },
           { label: '计量数量', prop: 'measureQuantity', align: 'center' },
           { label: '计量单位', prop: 'measureUnit', align: 'center' },
           { label: '计量单位', prop: 'measureUnit', align: 'center' },