From 31e87e7c6a4036e5a30604fec099a9de8eee04d4 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 2 Jul 2024 10:02:46 +0800 Subject: [PATCH] =?UTF-8?q?7/2=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/busType/bussinessType.vue | 11 +- src/views/inventory/InvSpaceManage.vue | 7 +- src/views/purchase/cert/supCertSet.vue | 1509 +++++++++-------- src/views/remind/addInvRemindSetDialog.vue | 6 +- src/views/system/dept/authDept.vue | 9 +- src/views/system/dept/invWarehouse.vue | 5 + src/views/system/dict/index.vue | 8 +- src/views/system/menu/index.vue | 8 +- src/views/system/param/BasicEntrutsRece.vue | 6 +- src/views/system/param/addhelpSettings.vue | 177 +- src/views/system/param/busTypeChange.vue | 11 +- src/views/system/param/busTypePre.vue | 13 +- .../system/ration/editRaationSetDialog.vue | 5 +- src/views/system/role/index.vue | 8 +- src/views/system/user/authUser.vue | 8 +- 15 files changed, 934 insertions(+), 857 deletions(-) diff --git a/src/views/basic/busType/bussinessType.vue b/src/views/basic/busType/bussinessType.vue index 465b7799..5e7b1f2f 100644 --- a/src/views/basic/busType/bussinessType.vue +++ b/src/views/basic/busType/bussinessType.vue @@ -147,7 +147,7 @@
提交 @@ -291,7 +291,8 @@ export default { uploadFileUrl: null, headers: {}, configParams: {}, - loading: false + loading: false, + subLoading: false, } }, @@ -448,10 +449,12 @@ export default { if(!(this.inputQuery.mainAction =='WareHouseIn' && this.inputQuery.actionType == 1)){ this.inputQuery.devInType = 0; } + this.subLoading = true updateBusType(this.inputQuery) .then((response) => { + this.subLoading = false if (response.code == 20000) { - this.loading = false + // this.loading = false this.cancelDialog() this.getList() } else { @@ -459,7 +462,7 @@ export default { } }) .catch(() => { - this.loading = false + this.subLoading = false this.cancelDialog() }) }, diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue index 9c351979..bc6e5946 100644 --- a/src/views/inventory/InvSpaceManage.vue +++ b/src/views/inventory/InvSpaceManage.vue @@ -112,7 +112,7 @@
- 提交 @@ -186,7 +186,8 @@ export default { {required: true, message: "请输入货位名称", trigger: "blur"} ], }, - modifySubInvList: [] + modifySubInvList: [], + saveSpaceLoading: false, }; }, watch: { @@ -303,7 +304,9 @@ export default { saveSpace() { this.$refs['formData'].validate((valid) => { if (valid) { + this.saveSpaceLoading = true saveSpace(this.formData, this.formName).then((res) => { + this.saveSpaceLoading = false if (res.code === 20000) { if ("add" === this.formName) { this.$message.success("新增成功"); diff --git a/src/views/purchase/cert/supCertSet.vue b/src/views/purchase/cert/supCertSet.vue index bfc7cb2e..84f17b1a 100644 --- a/src/views/purchase/cert/supCertSet.vue +++ b/src/views/purchase/cert/supCertSet.vue @@ -1,768 +1,791 @@ diff --git a/src/views/remind/addInvRemindSetDialog.vue b/src/views/remind/addInvRemindSetDialog.vue index 1c61d4dc..6ab52ffb 100644 --- a/src/views/remind/addInvRemindSetDialog.vue +++ b/src/views/remind/addInvRemindSetDialog.vue @@ -120,7 +120,7 @@ 显示/隐藏搜索栏 重置 搜索 - 选入 + 选入
@@ -181,6 +181,7 @@ export default { formLoading: false, productVisible: false, loading: false, + subLoading: false, productQuery: { invCode: this.$store.getters.locInvCode, invSpaceCode: null, @@ -258,7 +259,9 @@ export default { relIdList: relIdList }; console.log(params) + this.subLoading = true batchAddInvRemindSet(params).then((res) => { + this.subLoading = false if (res.code === 20000) { this.$message.success("添加成功"); this.closeDialog(); @@ -266,6 +269,7 @@ export default { this.$message.error(res.message); } }).catch((error) => { + this.subLoading = false this.$message.error(error.message); this.closeDialog(); }) diff --git a/src/views/system/dept/authDept.vue b/src/views/system/dept/authDept.vue index f664cf80..88bd3498 100644 --- a/src/views/system/dept/authDept.vue +++ b/src/views/system/dept/authDept.vue @@ -206,7 +206,7 @@
- 提交 取消 @@ -449,6 +449,7 @@ export default { invlist: [], invTotal: 0, invLoading: false, + fromLoading: false, }; }, filters: { @@ -516,10 +517,11 @@ export default { return; } // this.formData.statusIds = this.getMenuAllCheckedKeys(); + this.fromLoading = true if (this.formName == "add") { saveWarehouse(this.formData, "save") .then((response) => { - this.loading = false; + this.fromLoading = false this.cancelDialog(); this.getList(); if (response.code === 20000) { @@ -534,10 +536,12 @@ export default { .catch(() => { this.cancelDialog(); this.loading = false; + this.fromLoading = false }); } else if (this.formName == "edit") { saveWarehouse(this.formData, "edit") .then((response) => { + this.fromLoading = false this.loading = false; this.cancelDialog(); this.getList(); @@ -551,6 +555,7 @@ export default { } }) .catch(() => { + this.fromLoading = false this.cancelDialog(); this.loading = false; }); diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index e5d7ee50..62d4cb17 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -280,6 +280,7 @@ 提交 @@ -492,6 +493,7 @@ export default { sysList: [], sysSubList: [], advanceTypese: [], + submitLoading: false, }; }, methods: { @@ -640,7 +642,9 @@ export default { forInvSubmit() { // 新增，编辑---提交 this.$refs["dataForm"].validate(valid => { if (valid) { + this.submitLoading = true saveSubWarehouse(this.subData, this.formName).then((response) => { + this.submitLoading = false this.subFormVisible = false; if (response.code == 20000) { this.getList(); @@ -648,6 +652,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.submitLoading = false this.subFormVisible = false; }); } diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index 4c28e11b..c72db8e5 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -170,7 +170,7 @@
- 确 定 + 确 定 取 消
@@ -223,7 +223,8 @@ export default { dictType: [ { required: true, message: "字典类型不能为空", trigger: "blur" } ] - } + }, + subLoading: false, }; }, created() { @@ -293,8 +294,10 @@ export default { submitForm: function() { this.$refs['form'].validate(valid => { if (valid) { + this.subLoading = true if (this.form.dictId != undefined) { updateType(this.form).then(response => { + this.subLoading = false if (response.code == 20000) { this.$modal.msgSuccess('修改成功') this.open = false @@ -305,6 +308,7 @@ export default { }) } else { addType(this.form).then(response => { + this.subLoading = false if (response.code == 20000) { this.$modal.msgSuccess('新增成功') this.open = false diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index a98d5f09..4369865a 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -266,7 +266,7 @@
- 确 定 + 确 定 取 消
@@ -326,7 +326,8 @@ export default { path: [ {required: true, message: "路由地址不能为空", trigger: "blur"} ] - } + }, + confirmLoading: false }; }, created() { @@ -429,8 +430,10 @@ export default { submitForm: function () { this.$refs["form"].validate(valid => { if (valid) { + this.confirmLoading = true if (this.form.menuId != undefined) { updateMenu(this.form).then(response => { + this.confirmLoading = false if (response.code == 20000) { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -442,6 +445,7 @@ export default { }); } else { addMenu(this.form).then(response => { + this.confirmLoading = false if (response.code == 20000) { this.$modal.msgSuccess("新增成功"); this.open = false; diff --git a/src/views/system/param/BasicEntrutsRece.vue b/src/views/system/param/BasicEntrutsRece.vue index 854ede24..f58ddf2e 100644 --- a/src/views/system/param/BasicEntrutsRece.vue +++ b/src/views/system/param/BasicEntrutsRece.vue @@ -84,7 +84,7 @@ >
- 提交 @@ -151,6 +151,7 @@ export default { uploadFileUrl: null, headers: {}, configParms: {}, + subLoading: false, }; @@ -210,13 +211,16 @@ export default { }, onModifySubmit() { + this.subLoading = true updateEntrustRece(this.inputQuery) .then((response) => { + this.subLoading = false this.loading = false; this.cancelDialog(); this.getList(); }) .catch(() => { + this.subLoading = false this.loading = false; this.cancelDialog(); }); diff --git a/src/views/system/param/addhelpSettings.vue b/src/views/system/param/addhelpSettings.vue index 8673c2c5..b3ee7aef 100644 --- a/src/views/system/param/addhelpSettings.vue +++ b/src/views/system/param/addhelpSettings.vue @@ -4,7 +4,8 @@ 提交 + :loading="subLoading" + >提交 @@ -26,7 +27,8 @@ - + @@ -70,21 +72,18 @@ 状态：
- - - - 启用 - 禁用 + + + + 启用 + 禁用 - - - + + + - - -
@@ -109,7 +108,8 @@ :on-error="uploadHandleError" :file-list="fileList" :data="{type:'image2'}" - :auto-upload="true"> + :auto-upload="true" + > {{ choiceFile }} @@ -130,34 +130,34 @@