Explorar o código

Merge branch 'develop_bug0217' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_bug0217

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

+ 6 - 2
src/views/salesManagement/salesReturn/queryPart.vue

@@ -169,6 +169,7 @@ export default {
       columns: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        console.log(this.warehouseCascadeData, this.grabFlag)
         this.disabled = true
         // 抓单时
         if (this.grabFlag == 1) {
@@ -188,8 +189,11 @@ export default {
               // 不抓单
               if (this.grabFlag == 0) {
                 data.list[i].putCost = data.list[i].lastStockCost
-                const warehouse = this.warehouseCascadeData[0].warehouseLocationList[0]
-                data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouse.warehouseLocationSn]
+                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]
                 data.list[i].returnQty = 1
                 data.list[i].celQty = 0
               } else {