From 0b7b53fe067ff41f71758458cc16fd38002d7749 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 18 Jul 2024 15:36:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../picking/apply/component/AddPicking.vue | 10 ++++++++-- .../return/apply/component/addReturn.vue | 7 +++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue index 656b0c65..41bebc4a 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue @@ -152,6 +152,7 @@ size="mini" v-if="isAdd || isEdit" @click="handleAdd" + :loading="submitLoading" > 保存 @@ -497,6 +498,7 @@ export default { selDeviceTypeChangeValue: '', deviceTypeTreeNew: [], completeSetList: [], + submitLoading: false, } }, @@ -769,7 +771,7 @@ export default { if (this.rejectTaskStatus == 100) { this.queryParams.souceByRefuse = 1 } - + this.submitLoading = true const params = { ...this.queryParams, taskId: this.taskId, @@ -786,6 +788,8 @@ export default { this.$message.error('机具类型库存量为零无法领料') return } + + this.submitLoading = true res = await submitLeaseApply(this.queryParams) } if (res.code == 200) { @@ -793,11 +797,13 @@ export default { type: 'success', message: res.msg, }) + this.submitLoading = false // this.$tab.closeOpenPage({ // path: '/claimAndRefund/receive/receiveApply', // }) - this.$emit('goBackPage') + } else { + this.submitLoading = false } } }) diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue index def11236..819a3aa1 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/addReturn.vue @@ -134,6 +134,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" + :loading="submitLoading" >保存 @@ -488,6 +489,7 @@ export default { rowId: '', selDeviceTypeChangeValue: '', deviceTypeTreeNew: [], + submitLoading: false, } }, mounted() { @@ -762,6 +764,7 @@ export default { backApplyDetails: this.queryParams.leaseApplyDetails, } + this.submitLoading = true const res = await submitRefuseBackApply(params) if (res.code == 200) { this.$message({ type: 'success', message: res.msg }) @@ -773,6 +776,8 @@ export default { // }) // }, 1000) } + + this.submitLoading = false } else { let params = { companyId: this.companyId, @@ -783,6 +788,7 @@ export default { backApplyDetails: this.queryParams.leaseApplyDetails, } + this.submitLoading = true const res = await submitBackApplyApi(params) if (res.code == 200) { this.$message({ type: 'success', message: res.msg }) @@ -793,6 +799,7 @@ export default { // }) // }, 1000) } + this.submitLoading = false } } }) From 91ed36b3839fedd14394cf91c9e85a0402abbaf7 Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 18 Jul 2024 16:09:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/components/Notice/index.vue | 21 ++++++++++----------- sgzb-ui/vue.config.js | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sgzb-ui/src/components/Notice/index.vue b/sgzb-ui/src/components/Notice/index.vue index 97941d7a..47105fec 100644 --- a/sgzb-ui/src/components/Notice/index.vue +++ b/sgzb-ui/src/components/Notice/index.vue @@ -2,7 +2,7 @@
重要通知({{ unreadNUm }}/{{ noticeNum }})重要通知({{ unreadNum }}/{{ noticeNum }}) this.noticeNum) { + if (this.unreadNum > this.noticeNum) { this.$emit('closeDialog', false) } } diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index a2451437..81ea7787 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -43,10 +43,10 @@ module.exports = { // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://z.csgmall.com.cn`, - target: `http://192.168.2.167:28080`, //超 + // target: `http://192.168.2.167:28080`, //超 // target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - // target: `http://192.168.2.248:28080`, //帅 + target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.209:28080`, //福 //******** 注意事项 ********* */ From 8501f9cc915a9dc7f1e0cbed989799d2ee7195ac Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 18 Jul 2024 16:30:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newPurchase/toolsAcceptance/component/queryTools.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue index 87e5e8bc..147b20a0 100644 --- a/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue +++ b/sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue @@ -159,7 +159,7 @@ --> 查看附件