Procházet zdrojové kódy

Merge branch 'develop_szhj04_lb1' of jianguan-web/qpls-md-html into pre-release

李磊 před 2 roky
rodič
revize
507fa6e1ed

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1664359153118
+  "version": 1666694960908
 }

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/confirmModal.vue

@@ -122,7 +122,8 @@ export default {
               arr.push({
                 productSn: item.productSn,
                 confirmQty: item.confirmQty,
-                replenishBillDetailSn: item.replenishBillDetailSn
+                replenishBillDetailSn: item.replenishBillDetailSn,
+                id: item.id
               })
             } else {
               arrInd.push(index + 1)

+ 19 - 16
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -263,22 +263,25 @@ export default {
       this.queryByTypeSum(true)
     },
     handleValidate (type, params) {
-      this.spinning = true
-      // 校验产品库存是否足够
-      shelfReplenishDetailStock(params).then(res => {
-        if (res.status == 200) {
-          if (res.data && res.data.length > 0) {
-            this.stockList = res.data
-            this.validateType = 'confirm'
-            this.paramsData = params
-            this.openStockModal = true
-          } else {
-            if (type == 'confirm') { // 确认
-              this.confirmFun(params)
-            }
-          }
-        }
-      })
+      // this.spinning = true
+      // // 校验产品库存是否足够
+      // shelfReplenishDetailStock(params).then(res => {
+      //   if (res.status == 200) {
+      //     if (res.data && res.data.length > 0) {
+      //       this.stockList = res.data
+      //       this.validateType = 'confirm'
+      //       this.paramsData = params
+      //       this.openStockModal = true
+      //     } else {
+      //       if (type == 'confirm') { // 确认
+      //         this.confirmFun(params)
+      //       }
+      //     }
+      //   }
+      // })
+      if (type == 'confirm') { // 确认
+        this.confirmFun(params)
+      }
     },
     // 提交确认
     confirmFun (params) {

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue

@@ -146,7 +146,8 @@ export default {
                 arr.push({
                   productSn: item.productSn,
                   confirmQty: item.confirmQty,
-                  replenishBillDetailSn: item.replenishBillDetailSn
+                  replenishBillDetailSn: item.replenishBillDetailSn,
+                  id: item.id
                 })
               })
               const params = {

+ 2 - 1
src/views/numsGoodsShelves/replenishmentManagement/putWarehousingModal.vue

@@ -140,7 +140,8 @@ export default {
                 putQty: item.putQty,
                 replenishBillDetailSn: item.replenishBillDetailSn,
                 shelfPlaceSn: item.shelfPlaceSn,
-                shelfPlaceCode: item.shelfPlaceCode
+                shelfPlaceCode: item.shelfPlaceCode,
+                id: item.id
               })
             } else if ((item.confirmQty || item.confirmQty == 0) && !(item.putQty || item.putQty == 0)) {
               arrInd.push(index + 1)