diff --git a/src/views/basic/consume/materialCategory.vue b/src/views/basic/consume/materialCategory.vue index 6cf64107..40bce69d 100644 --- a/src/views/basic/consume/materialCategory.vue +++ b/src/views/basic/consume/materialCategory.vue @@ -102,7 +102,7 @@ - 保存 + 保存 @@ -153,13 +153,16 @@ export default { children: "children", label: "label" }, + saveLoading: false, } }, methods: { save(){ this.addData.deptCategory = this.getDeptAllCheckedKeys() + this.saveLoading = true updateBindCategory(this.addData).then((response) => { if (response.code == 20000) { + this.saveLoading = false this.selectDialog = !this.selectDialog this.getData(this.query.deptCode) this.$message.success("保存成功"); @@ -167,6 +170,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.saveLoading = false this.$message.error("保存失败"); }); }, diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue index aef5f606..020131a9 100644 --- a/src/views/basic/corpMaintain/corpMaintain.vue +++ b/src/views/basic/corpMaintain/corpMaintain.vue @@ -30,7 +30,7 @@ 重置 查询 新增 + :disabled="!configParms.basicCorp" >新增 选入往来单位信息 diff --git a/src/views/basic/destiny/addDestinyProcess.vue b/src/views/basic/destiny/addDestinyProcess.vue index daad9624..3b93fd59 100644 --- a/src/views/basic/destiny/addDestinyProcess.vue +++ b/src/views/basic/destiny/addDestinyProcess.vue @@ -3,7 +3,7 @@ 提交 + :loading="submitLoading">提交 @@ -215,6 +215,7 @@ export default { }, ], }, + submitLoading: false, }; }, methods: { @@ -390,7 +391,9 @@ export default { var query = { billNo: this.filterQuery.billNo } + this.submitLoading = true addDestinyProcess(query).then((response) => { + this.submitLoading = false if (response.code == 20000) { this.closeDialogpr() } else { @@ -398,6 +401,7 @@ export default { } }) .catch(() => { + this.submitLoading = false this.$message.error(response.message); }); } diff --git a/src/views/basic/destiny/destinyModelEdit.vue b/src/views/basic/destiny/destinyModelEdit.vue index 12e6d155..c0da1cf3 100644 --- a/src/views/basic/destiny/destinyModelEdit.vue +++ b/src/views/basic/destiny/destinyModelEdit.vue @@ -43,7 +43,7 @@
- 提交 + 提交 取消
@@ -81,6 +81,7 @@ export default { code: null, remark: null, }, + submitLoading: false }; }, methods: { @@ -91,25 +92,30 @@ export default { if (isBlank(this.editLogin.code)) { return this.$message.error("模板编号不能为空"); } + this.submitLoading = true if (this.editLogin.id != null) { editModeldestiny(this.editLogin).then(res => { + this.submitLoading = false if (res.code == 20000) { this.closeDialog(); } else { this.$message.error(res.message); } }).catch(() => { + this.submitLoading = false this.$message.error("编辑失败！"); }); } else { this.editLogin.type = this.type addModeldestiny(this.editLogin).then(res => { + this.submitLoading = false if (res.code == 20000) { this.closeDialog(); } else { this.$message.error(res.message); } }).catch(() => { + this.submitLoading = false this.$message.error("提交失败！"); }); } diff --git a/src/views/basic/destiny/destinySelectProduct.vue b/src/views/basic/destiny/destinySelectProduct.vue index 053fcf88..a4d61827 100644 --- a/src/views/basic/destiny/destinySelectProduct.vue +++ b/src/views/basic/destiny/destinySelectProduct.vue @@ -78,7 +78,7 @@ 显示/隐藏搜索栏 重置 查询 - 确定 + 确定 @@ -305,16 +305,16 @@ export default { this.combine(); }, combine() { - this.loading = true; + this.confirmLoading = true; addModeldestinyProduct({pId: this.editQuery.id, list: this.lists}).then((response) => { - this.loading = false; + this.confirmLoading = false; if (response.code === 20000) { this.closeDialog(response.data); } else { this.$message.error(response.message); } }).catch(() => { - this.loading = false; + this.confirmLoading = false; }); }, }, diff --git a/src/views/basic/product/bindProduct.vue b/src/views/basic/product/bindProduct.vue index 10048d34..42096dde 100644 --- a/src/views/basic/product/bindProduct.vue +++ b/src/views/basic/product/bindProduct.vue @@ -70,8 +70,8 @@ 显示/隐藏搜索栏 重置 查询 - 选入 - 查询选入 + 选入 + 查询选入 @@ -135,6 +135,8 @@ export default { }, productList: [], loading: false, + instentLoading: false, + SelectInstentLoading: false, showSearch: true, productType: null, editQuery: null, @@ -188,6 +190,7 @@ export default { } this.filterQuery.page = 1; + this.SelectInstentLoading = true this.getselectList(); }, @@ -226,6 +229,7 @@ export default { getselectList(){ SelectproductList(this.filterQuery) .then((res) =>{ + this.SelectInstentLoading = false if(res.code == 20000){ this.$message.success("选入成功!"); this.closeDialog(); @@ -259,7 +263,9 @@ export default { } var ids = this.productList.map((item) => item.id) var data = {code: this.rId, ids: ids} + this.instentLoading = true saveRel(data).then((response) => { + this.instentLoading = false if (response.code == 20000) { this.$message.success("选入成功!"); this.closeDialog(); @@ -267,6 +273,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.instentLoading = false }); }, diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 477f408d..32bd8c69 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1684,6 +1684,7 @@ size="small" icon="search" @click="onAddSubmit(false)" + :loading="onAddLoading" >提交 { + this.onAddLoading = false if (response.code == 20000) { this.getList(); this.cancelDialog(); @@ -2524,6 +2528,7 @@ export default { } }) .catch(() => { + this.onAddLoading = false this.cancelDialog(); }); }, diff --git a/src/views/basic/product/productAdd.vue b/src/views/basic/product/productAdd.vue index f28f6c81..16483883 100644 --- a/src/views/basic/product/productAdd.vue +++ b/src/views/basic/product/productAdd.vue @@ -162,7 +162,7 @@
- 提交 + 提交 取消
@@ -205,6 +205,7 @@ export default { }, thirdSys: [], classifyList: [], + saveLoading: false, } }, @@ -279,8 +280,9 @@ export default { this.$message.warning('产品属性不能为空！') return } - + this.saveLoading = true addProduct(this.newProductData).then((res) => { + this.saveLoading = false if (res.code == 20000) { this.$message.success('添加成功') //清空弹窗数据 @@ -289,6 +291,7 @@ export default { this.$message.error(res.message) } }).catch((error) => { + this.saveLoading = false this.$message.error(error.message) }) }, diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue index cd5b1030..1a159f6f 100644 --- a/src/views/basic/product/productCategory.vue +++ b/src/views/basic/product/productCategory.vue @@ -519,6 +519,7 @@ 提交 @@ -1574,6 +1575,7 @@ export default { limit: 20, zczbhhzbapzbh: null, }, + subLoading: false, }; }, filters: {}, @@ -1797,8 +1799,10 @@ export default { this.$message.error("名称不能为空！"); return } + this.subLoading = true if (this.subData.id != null) { uodateBasicHospType(this.subData).then((response) => { + this.subLoading = false if (response.code == 20000) { this.subFormVisible = false; this.getTerrList(); @@ -1806,10 +1810,12 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.subLoading = false this.subFormVisible = false; }); } else { saveBasicHospType(this.subData).then((response) => { + this.subLoading = false if (response.code == 20000) { this.subFormVisible = false; this.getTerrList(); @@ -1817,6 +1823,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.subLoading = false this.subFormVisible = false; }); } diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 5f453366..5b2d8ea2 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -739,7 +739,7 @@ >
- 提交 { + this.addLoading = false if (response.code == 20000) { let ttquery = { id: this.relevanceEdit.id @@ -983,6 +986,7 @@ export default { } }) .catch(() => { + this.addLoading = false this.cancelDialog(); }); }, diff --git a/src/views/basic/product/productUdiType.vue b/src/views/basic/product/productUdiType.vue index 37f54eda..ac7e713f 100644 --- a/src/views/basic/product/productUdiType.vue +++ b/src/views/basic/product/productUdiType.vue @@ -92,6 +92,7 @@ 提交 @@ -193,6 +194,7 @@ export default { subTotal: 0, sysList: [], sysSubList: [], + submitLoading: false, }; }, methods: { @@ -266,7 +268,9 @@ export default { return } if(this.subData.id!=null){ + this.submitLoading = true uodateBasicHospType(this.subData).then((response) => { + this.submitLoading = false if (response.code == 20000) { this.subFormVisible = false; this.getList(); @@ -274,6 +278,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.submitLoading = false this.subFormVisible = false; }); }else{ diff --git a/src/views/inventory/inner/innerOrderEditDialog.vue b/src/views/inventory/inner/innerOrderEditDialog.vue index 0d7636b7..2fd6d654 100644 --- a/src/views/inventory/inner/innerOrderEditDialog.vue +++ b/src/views/inventory/inner/innerOrderEditDialog.vue @@ -6,7 +6,7 @@ 提交单据 @@ -184,6 +184,7 @@ export default { pId:null, billNo:null, loading: false, + saveLoading: false, index: null, formLoading: false, formVisible: false, @@ -236,6 +237,7 @@ export default { } } if (status == "1") { + this.saveLoading = true this.submitFunction(status); } else { if (this.codeArray.length < 1) { @@ -271,6 +273,9 @@ export default { } inserThrOrderWeb(tQuery) .then(response => { + if (status == '1'){ + this.saveLoading = false + } this.loading = false; if (response.code === 20000) { this.$message.success(tMessage + "成功"); @@ -280,6 +285,9 @@ export default { } }) .catch(() => { + if (status == '1'){ + this.saveLoading = false + } this.loading = false; }) }, diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue index ba209aea..8b8db378 100644 --- a/src/views/inventory/inner/innerOrderSelectProduct.vue +++ b/src/views/inventory/inner/innerOrderSelectProduct.vue @@ -54,7 +54,7 @@ 显示/隐藏搜索栏 重置 查询 - 确定 + 确定
@@ -114,7 +114,7 @@
- 确 定 + 确 定 取 消
@@ -225,6 +225,7 @@ export default { dialogFormVisible: false, multipleSelection: null, nameCode:null, + commitLoding:false }; }, @@ -347,7 +348,9 @@ export default { supId: this.multipleSelection.customerId, zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh }; + this.commitLoding = true addOrderDetail(tQuery).then((response) => { + this.commitLoding = false this.loading = false; if (response.code === 20000) { this.closeDialog(response.data); @@ -360,6 +363,7 @@ export default { this.$message.error(response.message); } }).catch(() => { + this.commitLoding = false this.loading = false; }); diff --git a/src/views/thirdSys/busType/index.vue b/src/views/thirdSys/busType/index.vue index d223b1cc..6b4191f4 100644 --- a/src/views/thirdSys/busType/index.vue +++ b/src/views/thirdSys/busType/index.vue @@ -80,7 +80,7 @@ >
- 提交 @@ -100,7 +100,7 @@ >
- 提交 @@ -167,6 +167,8 @@ export default { loading: false, thirdSysDetail: {}, configParms: {}, + addLoading: false, + upLoading: false, }; }, @@ -276,8 +278,10 @@ export default { return; } + this.addLoading = true insertBussinessType(this.inputQuery) .then((response) => { + this.addLoading = false if (response.code === 20000) { this.loading = false; this.cancelDialog(); @@ -287,6 +291,7 @@ export default { } }) .catch(() => { + this.addLoading = false this.loading = false; this.cancelDialog(); }); @@ -312,8 +317,10 @@ export default { return; } + this.upLoading = true updateBussinessType(this.inputQuery) .then((response) => { + this.upLoading = false if (response.code === 20000) { this.loading = false; this.cancelDialog(); @@ -323,6 +330,7 @@ export default { } }) .catch(() => { + this.upLoading = false this.loading = false; this.cancelDialog(); }); diff --git a/src/views/thirdSys/inv/index.vue b/src/views/thirdSys/inv/index.vue index 4e5d28cd..345f3d54 100644 --- a/src/views/thirdSys/inv/index.vue +++ b/src/views/thirdSys/inv/index.vue @@ -262,7 +262,7 @@ 提交 @@ -343,6 +343,7 @@ export default { false: "仓库", }, formLoading: false, + forLoading: false, subFormVisible: false, formVisible: false, formData: formJson, diff --git a/src/views/thirdSys/product/thrProductsAdd.vue b/src/views/thirdSys/product/thrProductsAdd.vue index a2780392..0cbc8ac8 100644 --- a/src/views/thirdSys/product/thrProductsAdd.vue +++ b/src/views/thirdSys/product/thrProductsAdd.vue @@ -1,248 +1,274 @@