huang_an 2 жил өмнө
parent
commit
1e2797cfbe

+ 10 - 0
src/api/warehouseManagement/outin.js

@@ -104,5 +104,15 @@ export default {
     if (res.data.code == 0) {
       return res.data.data;
     }
+  },
+  //库存台账-库存明细-物料维度
+
+  getMaterielDetails: async (params) => {
+    const res = await request.get(`/wms/outin/getMaterielDetails`, {
+      params
+    });
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
   }
 };

+ 49 - 0
src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -78,6 +78,18 @@
           }}
         </span>
       </template>
+      <!-- 质检状态 -->
+      <template v-slot:qualityStatus="{ row }">
+        <span v-if="row.qualityStatus == 0">未质检</span>
+        <span v-else-if="row.qualityStatus == 1">已质检</span>
+        <span v-else>-</span>
+      </template>
+      <!-- 质检结果 -->
+      <template v-slot:qualityResult="{ row }">
+        <span v-if="row.qualityResult == 0">合格</span>
+        <span v-else-if="row.qualityResult == 1">不合格</span>
+        <span v-else>-</span>
+      </template>
       <!-- 操作列 -->
       <template v-slot:action="{ row }">
         <el-link
@@ -212,12 +224,14 @@
           },
           {
             prop: 'qualityStatus',
+            slot: 'qualityStatus',
             label: '质检状态',
             showOverflowTooltip: true,
             width: 100
           },
           {
             prop: 'qualityResult',
+            slot: 'qualityResult',
             label: '质检结果',
             showOverflowTooltip: true,
             width: 100
@@ -383,6 +397,41 @@
             return { ...res, list: item };
           });
           return result;
+        } else if (this.selectedDime == 4) {
+          const params = {
+            categoryLevelId: treeId,
+            ...where,
+            ...order,
+            dimension: dimension
+          };
+          const data = ouint.getMaterielDetails({
+            ...params,
+            pageNum: page,
+            size: limit
+          });
+          const result = data.then((res) => {
+            const data = res.list.map((item) => {
+              return {
+                ...item,
+                minUnit: item.packingUnit,
+                paths: item.pathName,
+                availableCountBase: 1,
+                packingCountBase: 1,
+                materialCode: item.code,
+                batchNum: item.batchNo,
+                qualityResult:
+                  typeof item.qualityResult != 'number'
+                    ? 3
+                    : item.qualityResult,
+                qualityStatus:
+                  typeof item.qualityStatus != 'number' ? 3 : item.qualityStatus
+              };
+            });
+            console.log(data);
+            return { ...res, list: data };
+          });
+          console.log(result);
+          return result;
         } else {
           const params = {
             categoryLevelId: treeId,

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

@@ -337,6 +337,7 @@
               >批量保存</el-button
             >
             <el-table
+              v-if="isWeight"
               :header-cell-style="rowClass"
               ref="multipleTable"
               :key="formData.extInfo.assetType"
@@ -1133,6 +1134,7 @@
     },
     data() {
       return {
+        isWeight: true,
         resultArray: [],
         isDetail: false,
         contactList: [],
@@ -1262,15 +1264,21 @@
             (acc, curr) => acc + curr.weight,
             0
           );
+          this.isWeight = false;
           this.warehousingMaterialList.forEach((item) => {
             if (item.assetCode == code && item.batchNo == batchNo) {
-              item.weight = count;
+              this.$set(item, 'weight', count);
             }
           });
-          console.log(',,,,', this.warehousingMaterialList);
+          this.$nextTick(() => {
+            this.isWeight = true;
+          });
         } else {
           row.isPack = false;
         }
+        // setTimeout(() => {
+
+        // }, 100);
       },
       packNum(row, value) {
         const total = {