From 9e09a4ba84f02b9bca28c383e56af001bbc44d54 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 28 Sep 2025 22:13:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index 7763642a..b2a570cf 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -78,7 +78,7 @@ export default { ] }, socket: null, - wsUrl: JSON.parse(localStorage.getItem('systemConfig')).webSocketurl,//'ws://localhost:18082/ws', // WebSocket 端点 + wsUrl: '',//'ws://localhost:18082/ws', // WebSocket 端点 isConnected: false, // 连接状态 reconnectInterval: 5000 // 自动重连时间间隔（毫秒 @@ -117,6 +117,8 @@ export default { }, created() { // this.checkPasswordStatus() + const systemConfig = localStorage.getItem('systemConfig') + this.wsUrl = systemConfig ? JSON.parse(systemConfig).webSocketurl : '' if (this.roles.includes("audit") || this.roles.includes("systemAdmin")) { this.connectWebSocket(); } From 024e8a676db223dd4b3ee52126e0d5b394f59cc5 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 28 Sep 2025 23:24:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BE=9B=E9=9C=80=E5=B9=B3=E8=A1=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/equipmentRecord/supplyDemandBalance.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue b/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue index dcb71f52..92eef4ae 100644 --- a/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue +++ b/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue @@ -328,7 +328,8 @@ export default { dialogQuery: { pageNum: 1, pageSize: 10, - keyWord: undefined + keyWord: undefined, + agreementIds: undefined, }, dialogTotal: 0, //在用弹窗 @@ -598,6 +599,7 @@ export default { this.dialogQuery.keyWord = '' this.dialogQuery.typeId = row.typeId this.dialogQuery.proId = row.proId + this.dialogQuery.agreementIds = row.agreementIds this.getStoreCodeList() }, /** 查询在库编码列表 */ From c6dcba9b2e2f1f757840be94332558532522da11 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 28 Sep 2025 23:51:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BE=9B=E9=9C=80=E5=B9=B3=E8=A1=A1?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentRecord/supplyDemandBalance.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue b/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue index 92eef4ae..d2c38375 100644 --- a/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue +++ b/src/views/materialsStation/equipment/equipmentRecord/supplyDemandBalance.vue @@ -122,7 +122,7 @@ Date: Mon, 29 Sep 2025 11:32:15 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=88=87=E6=8D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toolsLease/apply/component/addToolsApply.vue | 1 + .../toolsLease/outBound/component/addToolsApply.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue index a178913b..e9bb562f 100644 --- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue @@ -470,6 +470,7 @@ export default { console.log('🚀 ~ changePro ~ e:', e) this.maForm.proId = e this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId + this.maForm.teamId = '' await this.getBmTeam() if(this.maForm.proId){ this.equipmentList = [] diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue index 864d4ecf..6b85af30 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue @@ -696,6 +696,7 @@ export default { console.log('🚀 ~ changePro ~ e:', e) this.maForm.proId = e this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId + this.maForm.teamId = '' this.equipmentList = [] if (this.maForm.pickType == 0) { await this.getBmTeam() From 94bb983bb4d96920760ce233cb4c3718c5785781 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Mon, 29 Sep 2025 13:44:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=88=87=E6=8D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../toolsLease/apply/component/addToolsApply.vue | 1 + .../toolsLease/outBound/component/addToolsApply.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue index e9bb562f..57b7a1e2 100644 --- a/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/addToolsApply.vue @@ -471,6 +471,7 @@ export default { this.maForm.proId = e this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId this.maForm.teamId = '' + this.maForm.leasePerson = '' await this.getBmTeam() if(this.maForm.proId){ this.equipmentList = [] diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue index 6b85af30..6041de9f 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue @@ -697,6 +697,7 @@ export default { this.maForm.proId = e this.maForm.projectId = this.projectList.find(item => item.proId === e)?.projectId this.maForm.teamId = '' + this.maForm.leasePerson = '' this.equipmentList = [] if (this.maForm.pickType == 0) { await this.getBmTeam() From 14c3c6d61c85ba24d06525ae90400a659b29953e Mon Sep 17 00:00:00 2001 From: bb_pan Date: Mon, 29 Sep 2025 15:56:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=9B=B4=E8=BD=AC=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/businessHandling/directApply.vue | 30 +++++++++++-------- .../businessHandling/groundDirect.vue | 30 +++++++++++-------- .../straight/straightTransfer/index.vue | 30 +++++++++---------- 3 files changed, 49 insertions(+), 41 deletions(-) diff --git a/src/views/business/businessHandling/directApply.vue b/src/views/business/businessHandling/directApply.vue index a5940e24..e2e09604 100644 --- a/src/views/business/businessHandling/directApply.vue +++ b/src/views/business/businessHandling/directApply.vue @@ -1,8 +1,8 @@