Merge remote-tracking branch 'origin/dev' into dev

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -2424,6 +2424,9 @@ export default {
           warehouseId: this.form.storageId
         }).then(res => {
           if (res.data.data.length > 0) {
+              res.data.data.forEach(e=>{
+                  e.storageId = e.storageId + '-' + e.corpId
+              })
             this.$set(this.goodsListSave[item], 'storageQuantityList', res.data.data)
             this.$set(this.goodsListSave[item], 'storageId', res.data.data[0].storageId)
             this.$set(this.goodsListSave[item], 'storageName', res.data.data[0].storageName)
@@ -2513,6 +2516,9 @@ export default {
           warehouseId: selectedValue
         }).then(res => {
           if (res.data.data.length > 0) {
+              res.data.data.forEach(e=>{
+                  e.storageId = e.storageId + '-' + e.corpId
+              })
             this.tableData[item].storageQuantityList = res.data.data;
             this.tableData[item].storageId = res.data.data[0].storageId;
             this.tableData[item].storageName = res.data.data[0].storageName;
@@ -2739,6 +2745,9 @@ export default {
           warehouseId: this.form.storageId
         }).then(res => {
           if (res.data.data.length > 0) {
+              res.data.data.forEach(e=>{
+                  e.storageId = e.storageId + '-' + e.corpId
+              })
             this.$set(list[item], 'storageQuantityList', res.data.data)
             this.$set(list[item], 'storageId', res.data.data[0].storageId)
             this.$set(list[item], 'storageName', res.data.data[0].storageName)
@@ -3865,11 +3874,11 @@ export default {
           goodsId: item.itemId,
           itemType: item.itemType ? item.itemType : item.typeno,
           tradeType: 'GN',
-          storageId: item.storageId
+          storageId: item.storageId.slice(0,item.storageId.indexOf('-'))
         }).then(res => {
           if (res.data.data.length > 0) {
             item.storageQuantityList = res.data.data
-            item.storageId = res.data.data[0].storageId
+            item.storageId = res.data.data[0].storageId + '-' + res.data.data[0].corpId
             item.storageName = res.data.data[0].storageName
             item.storageQuantity = res.data.data[0].surplusRouteQuantity
               // 获取供应商名称
@@ -3882,6 +3891,7 @@ export default {
 
         })
       })
+        console.log(this.goodsShowData,3885)
       this.$message.success('刷新成功')
     },
     // 导入政策下载模板