add

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -376,19 +376,19 @@
                 ></el-table-column>
                 <el-table-column label="最小包装单元" width="120">
                   <template slot-scope="{ row }">
-                    {{ row.packingCountBase }}{{ row.measuringUnit }}/{{
+                    {{ row.minPackingCount }}{{ row.measuringUnit }}/{{
                       row.minUnit
                     }}
                   </template>
                 </el-table-column>
                 <el-table-column label="包装数量" prop="availableCountBase">
                   <template slot-scope="{ row }">
-                    {{ row.availableCountBase }}{{ row.minUnit }}
+                    {{ row.packingCountBase }}{{ row.minUnit }}
                   </template>
                 </el-table-column>
                 <el-table-column
                   label="计量数量"
-                  prop="packingCountBase"
+                  prop="availableCountBase"
                 ></el-table-column>
                 <el-table-column
                   label="计量单位"
@@ -785,7 +785,8 @@
           this.batchDetailsVOList = packArr.map((item) => {
             return {
               ...item,
-              packingCountBase: dimension == 4 ? 1 : item.packingCountBase
+              packingCountBase:
+                dimension == 4 || dimension == 3 ? 1 : item.packingCountBase
             };
           });
           //物料维度数据
@@ -826,7 +827,12 @@
               }
             }
           }
-          this.batchDetailsVOList = packArr;
+          this.batchDetailsVOList = packArr.map((item) => {
+            return {
+              ...item,
+              packingCountBase: dimension == 3 ? 1 : item.packingCountBase
+            };
+          });
           //物料维度数据
           let meteArr = [];
           for (const item of packArr) {

src/views/warehouseManagement/outgoingManagement/components/batchDetail.vue

@@ -13,12 +13,12 @@
       <el-table-column label="名称" prop="name"></el-table-column>
       <el-table-column label="批次号" prop="batchNo"></el-table-column>
       <el-table-column label="包装编码" prop="code"></el-table-column>
-      <el-table-column label="包装数量" prop="packageNo" width="120">
+      <el-table-column label="包装数量" prop="packingCountBase" width="120">
       </el-table-column>
       <el-table-column label="包装单位" prop="packingUnit"></el-table-column>
       <el-table-column
         label="计量数量"
-        prop="packingCountBase"
+        prop="availableCountBase"
       ></el-table-column>
       <el-table-column label="计量单位" prop="measuringUnit"></el-table-column>
       <el-table-column label="物料代号" prop="materielCode"></el-table-column>

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

@@ -86,7 +86,9 @@
       </template>
       <!-- 质检结果 -->
       <template v-slot:qualityResult="{ row }">
-        <span v-if="row.qualityResult == 0">合格</span>
+        <span v-if="row.qualityResult == 0 || row.qualityResult == ''"
+          >合格</span
+        >
         <span v-else-if="row.qualityResult == 1">不合格</span>
         <span v-else-if="row.qualityResult == 3">让步接收</span>
         <span v-else>-</span>