huang_an пре 2 година
родитељ
комит
a8ab9f5741

+ 15 - 11
src/views/warehouseManagement/outgoingManagement/add.vue

@@ -786,7 +786,8 @@
             return {
               ...item,
               packingCountBase:
-                dimension == 4 || dimension == 3 ? 1 : item.packingCountBase
+                dimension == 4 || dimension == 3 ? 1 : item.packingCountBase,
+              weight: 0
             };
           });
           //物料维度数据
@@ -808,6 +809,7 @@
           this.wlParams.realTimeInventoryNewPOList.forEach((item) => {
             item.inventoryDetailsNewPOList = item.inventoryDetailsVOList;
             item.inventoryDetailsNewPOList.forEach((ite) => {
+              ite.weight = 0;
               ite.outInMaterialDetailsAddPOList = ite.materialDetailsVOList;
             });
           });
@@ -830,7 +832,8 @@
           this.batchDetailsVOList = packArr.map((item) => {
             return {
               ...item,
-              packingCountBase: dimension == 3 ? 1 : item.packingCountBase
+              packingCountBase: dimension == 3 ? 1 : item.packingCountBase,
+              weight: 0
             };
           });
           //物料维度数据
@@ -852,6 +855,7 @@
           this.wlParams.realTimeInventoryNewPOList.forEach((item) => {
             item.inventoryDetailsNewPOList = item.inventoryDetailsVOList;
             item.inventoryDetailsNewPOList.forEach((ite) => {
+              ite.weight = 0;
               ite.outInMaterialDetailsAddPOList = ite.materialDetailsVOList;
             });
           });
@@ -877,15 +881,15 @@
             console.log('2222', obj);
 
             try {
-              // const res = await outin.saveNew(obj);
-              // if (res.code == 0) {
-              //   this.$message.success('保存成功!');
-              // }
-              // this.$router.push('/warehouseManagement/outgoingManagement');
-              // if (res?.success) {
-              //   this.$message.success('保存成功!');
-              //   this.$router.go(-1);
-              // }
+              const res = await outin.saveNew(obj);
+              if (res.code == 0) {
+                this.$message.success('保存成功!');
+              }
+              this.$router.push('/warehouseManagement/outgoingManagement');
+              if (res?.success) {
+                this.$message.success('保存成功!');
+                this.$router.go(-1);
+              }
               this.saveLoading = false;
             } catch (error) {
               this.saveLoading = false;

+ 11 - 8
src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -80,8 +80,10 @@
       </template>
       <!-- 质检状态 -->
       <template v-slot:qualityStatus="{ row }">
-        <span v-if="row.qualityStatus == 0">未检</span>
-        <span v-else-if="row.qualityStatus == 1">已检</span>
+        <span v-if="row.qualityStatus == 1 || row.qualityStatus == 0"
+          >已检</span
+        >
+        <span v-else-if="row.qualityStatus == 0">未检</span>
         <span v-else>-</span>
       </template>
       <!-- 质检结果 -->
@@ -221,19 +223,20 @@
             width: 100
           },
           {
-            prop: 'qualityStatus',
-            slot: 'qualityStatus',
-            label: '质检状态',
+            prop: 'qualityResult',
+            slot: 'qualityResult',
+            label: '质检结果',
             showOverflowTooltip: true,
             width: 100
           },
           {
-            prop: 'qualityResult',
-            slot: 'qualityResult',
-            label: '质检结果',
+            prop: 'qualityStatus',
+            slot: 'qualityStatus',
+            label: '质检状态',
             showOverflowTooltip: true,
             width: 100
           },
+
           {
             prop: 'paths',
             width: 230,