diff --git a/.env.development b/.env.development index bc989d6e..9bf7280a 100644 --- a/.env.development +++ b/.env.development @@ -1,12 +1,11 @@ -VITE_BASE_URL=http://172.22.32.8:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api +VITE_BASE_URL=http://172.22.32.9:81/api/admin-api +VITE_BASE_URL_IMAGE=http://172.22.32.9:81/admin-api # 租户配置 VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 -VITE_isDevelopment=false - +VITE_isDevelopment=true # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' +VITE_JMREPORT_BASE_URL='http://172.22.32.9:90' diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index e75ef9de..c6df8890 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -269,7 +269,11 @@ if (detail == undefined) { let newDetail = createDetailInfo(balance, pack); // newDetail.inventoryStatus = balance.inventoryStatus; - newDetail.toInventoryStatus = this.toInventoryStatus; + if (this.businessTypeCode == "Move") { + newDetail.toInventoryStatus = balance.inventoryStatus; + } else { + newDetail.toInventoryStatus = this.toInventoryStatus; + } newDetail.toLocationCode = this.toLocationCode; newDetail.fromLocationCode = result.fromLocationCode item.subList.push(newDetail);