mxx 4 роки тому
батько
коміт
b20ce288cd

+ 20 - 3
src/views/warehouse/warehouseManagementNoComplete.vue

@@ -220,9 +220,16 @@ export default {
             binNumber:row.binNumber,
             baseId: row.warehouseId,
             positionId: row.binNumberId,
-
-            
-
+            goodsName:row.goodsName,
+            grossWeight:row.grossWeight,
+            tare:row.tare,
+            netWeight:row.netWeight,
+            grade:row.grade,
+            agent:row.agent,
+            carNo:row.carNo,
+            inOutDate:row.inOutDate,
+            contractNo:row.contractNo,
+            inOutType:row.inOutType,
            }
            })
       }else if(row.inOutFlag==1){
@@ -233,6 +240,16 @@ export default {
             binNumber:row.binNumber,
             baseId: row.warehouseId,
             positionId: row.binNumberId,
+            goodsName:row.goodsName,
+            grossWeight:row.grossWeight,
+            tare:row.tare,
+            netWeight:row.netWeight,
+            grade:row.grade,
+            agent:row.agent,
+            carNo:row.carNo,
+            inOutDate:row.inOutDate,
+            contractNo:row.contractNo,
+            inOutType:row.inOutType,
           }
           })
       }

+ 10 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -355,6 +355,16 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
+    this.deptBudgetList.goodsName= this.$route.query.goodsName
+    this.deptBudgetList.grossWeight = this.$route.query.grossWeight
+    this.deptBudgetList.tare = this.$route.query.tare
+    this.deptBudgetList.netWeight = this.$route.query.netWeight
+    this.deptBudgetList.grade = this.$route.query.grade
+    this.deptBudgetList.agent = this.$route.query.agent
+    this.deptBudgetList.carNo = this.$route.query.carNo
+    this.deptBudgetList.inOutDate = this.$route.query.inOutDate
+    this.deptBudgetList.contractNo = this.$route.query.contractNo
+    this.deptBudgetList.inOutType = this.$route.query.inOutType
   },
   methods: {
     //返回按钮

+ 11 - 2
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -354,8 +354,16 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
-   
-    
+    this.deptBudgetList.goodsName= this.$route.query.goodsName
+    this.deptBudgetList.grossWeight = this.$route.query.grossWeight
+    this.deptBudgetList.tare = this.$route.query.tare
+    this.deptBudgetList.netWeight = this.$route.query.netWeight
+    this.deptBudgetList.grade = this.$route.query.grade
+    this.deptBudgetList.agent = this.$route.query.agent
+    this.deptBudgetList.carNo = this.$route.query.carNo
+    this.deptBudgetList.inOutDate = this.$route.query.inOutDate
+    this.deptBudgetList.contractNo = this.$route.query.contractNo
+    this.deptBudgetList.inOutType = this.$route.query.inOutType
   },
   methods: {
     //返回按钮
@@ -381,6 +389,7 @@ export default {
                 .toPromise()
                 .then((response) => {
                   this.$message.success('暂存成功')
+                  this.deptBudgetList=response
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
             } else {

+ 1 - 1
vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.124:8090/',
+        target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址