diff --git a/.env.production b/.env.production index 9a603299..f6803774 100644 --- a/.env.production +++ b/.env.production @@ -1,11 +1,12 @@ -VITE_BASE_URL=http://172.21.32.13:81/api/admin-api -VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api +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_TENANT='[{"text":"长春1379","value":1}]' +VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]' # 是否是测试环境 VITE_isDevelopment=false + # 积木报表请求路径 -VITE_JMREPORT_BASE_URL='http://172.21.32.13:90' +VITE_JMREPORT_BASE_URL='http://172.22.32.8:90' diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue index 2cea9f5b..8e60fbf5 100644 --- a/src/pages/issue/job/issueJob.vue +++ b/src/pages/issue/job/issueJob.vue @@ -302,12 +302,12 @@ value: params.fromLocationCode }) } - if (params.productionLine) { + if (params.productionLineCode) { // 生产线 filters.push({ column: "productionLineCode", action: "==", - value: params.productionLine + value: params.productionLineCode }) } if (params.itemCode) { diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue index abd4e37e..9b019bc9 100644 --- a/src/pages/repleinsh/job/repleinshJob.vue +++ b/src/pages/repleinsh/job/repleinshJob.vue @@ -6,7 +6,7 @@ :checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode"> --> - { @@ -276,14 +276,7 @@ value: params.fromLocationCode }) } - if (params.productionLine) { - // 生产线 - filters.push({ - column: "productionLineCode", - action: "==", - value: params.productionLine - }) - } + if (params.itemCode) { // 生产线 filters.push({