lilei %!s(int64=3) %!d(string=hai) anos
pai
achega
453626c8f0
Modificáronse 2 ficheiros con 9 adicións e 6 borrados
  1. 1 1
      public/version.json
  2. 8 5
      src/views/salesManagement/salesReturn/queryPart.vue

+ 1 - 1
public/version.json

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

+ 8 - 5
src/views/salesManagement/salesReturn/queryPart.vue

@@ -169,7 +169,6 @@ export default {
       columns: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        console.log(this.warehouseCascadeData, this.grabFlag)
         this.disabled = true
         // 抓单时
         if (this.grabFlag == 1) {
@@ -180,6 +179,7 @@ export default {
           this.queryParam.salePriceType = this.priceType
         }
         return fun[this.grabFlag](Object.assign(parameter, this.queryParam)).then(res => {
+          console.log(res)
           let data
           if (res.status == 200) {
             data = res.data
@@ -188,12 +188,15 @@ export default {
               data.list[i].no = no + i + 1
               // 不抓单
               if (this.grabFlag == 0) {
+                console.log(this.warehouseCascadeData, data)
                 data.list[i].putCost = data.list[i].lastStockCost
                 const warehouse = this.warehouseCascadeData.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
-                const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
-                // const warehouse = this.warehouseCascadeData[0].warehouseLocationList[0]
-                console.log(warehouse, '仓库sn', warehouseLocation, '仓位sn')
-                data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
+                if (warehouse) {
+                  const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
+                  if (warehouseLocation) {
+                    data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
+                  }
+                }
                 data.list[i].returnQty = 1
                 data.list[i].celQty = 0
               } else {