From cd4ac94501ca9367293dd31a159efee3898a42f4 Mon Sep 17 00:00:00 2001
From: liaohechuan <liaohechuan@semi-tech.com>
Date: Sat, 23 Nov 2024 09:28:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=88=E5=B7=A5=E5=BA=8F=E5=87=BA?=
 =?UTF-8?q?=E7=AB=99=EF=BC=89=EF=BC=9A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refs：#43702
---
 src/views/mes/wip/operation-out/jmIndex.vue | 1 +
 src/views/mes/wip/operation-out/tbIndex.vue | 1 +
 web.conf                                    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/mes/wip/operation-out/jmIndex.vue b/src/views/mes/wip/operation-out/jmIndex.vue
index 2a04066..ca9c894 100644
--- a/src/views/mes/wip/operation-out/jmIndex.vue
+++ b/src/views/mes/wip/operation-out/jmIndex.vue
@@ -498,6 +498,7 @@ export default {
                 site: this.searchForm.site,
                 operation: this.searchForm.operation,
                 resrce: this.searchForm.resrce,
+                rollType: this.searchForm.rollType,
                 operationList: this.operationList,
                 autoOperationList: this.autoOperationList,
                 autoResource: this.getResource,
diff --git a/src/views/mes/wip/operation-out/tbIndex.vue b/src/views/mes/wip/operation-out/tbIndex.vue
index 5c09dd1..95da02b 100644
--- a/src/views/mes/wip/operation-out/tbIndex.vue
+++ b/src/views/mes/wip/operation-out/tbIndex.vue
@@ -576,6 +576,7 @@ export default {
                 site: this.site,
                 operation: this.searchForm.operation,
                 resrce: this.searchForm.resrce,
+                rollType: this.searchForm.rollType,
                 operationList: this.operationList,
                 autoOperationList: this.autoOperationList,
                 autoResource: this.getResource,
diff --git a/web.conf b/web.conf
index 9d3ccb5..e3b20af 100644
--- a/web.conf
+++ b/web.conf
@@ -14,7 +14,7 @@ server {
     root /app/www;
 
     # 若新增后端路由前缀注意在此处添加（|新增）
-    location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|mom-xxl-job-admin|iep-int|mom-wms) {
+    location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|mom-xxl-job-admin|mom-wms) {
        proxy_pass http://mom-gateway:9999;
        proxy_connect_timeout 15s;
        proxy_send_timeout 15s;