diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue index 2c56a6a75..80694298f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue @@ -3597,6 +3597,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -3616,11 +3617,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3687,6 +3688,7 @@ if (res.ok) { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3719,7 +3721,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3732,11 +3733,13 @@ this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) - this.isSubmit = true } + this.saveLoading = false + this.isSubmit = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } else { @@ -3747,6 +3750,7 @@ } else { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3779,7 +3783,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3790,12 +3793,13 @@ } // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) - } else { - this.isSubmit = false } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index d1a9fef06..5eaf04a66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3606,6 +3606,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -3628,8 +3629,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3696,6 +3698,7 @@ if (res.ok) { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3741,11 +3744,13 @@ this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) - this.isSubmit = true } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } else { @@ -3756,6 +3761,7 @@ } else { this.fileInfoHandle() this.isSubmit = true + this.saveLoading = true // this.form.country = this.countryArr; var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId @@ -3788,7 +3794,6 @@ }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false if (this.bpnId !== '') { let taskId = { id: this.bpnId @@ -3799,12 +3804,13 @@ } // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) - } else { - this.isSubmit = false } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 2bf4720db..c2c7171a1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1045,6 +1045,8 @@ export default { methods: { checkedRole(data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId: this.$store.getters.userInfo.userId, // 委托人 @@ -1059,6 +1061,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, downloadFileNew(attId) { @@ -1289,6 +1294,7 @@ export default { }, handleSubmit() { this.isSubmit = true; + this.saveLoading = true; this.form.commentText = this.commentText; this.form.approvalOpinion = this.formTongGuo.approvalOpinion; if (this.form.syrz.length === 0) { @@ -1346,6 +1352,9 @@ export default { } else { this.processCreateStand(json); } + } else { + this.isSubmit = false; + this.saveLoading = false; } }); }, @@ -1378,6 +1387,9 @@ export default { this.$message.warning(res.message) this.isSubmit = false } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, getDicTypeListCode(res,json) { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 9d25392d6..ed0b2a594 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1016,6 +1016,8 @@ export default { methods: { checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -1032,6 +1034,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, downloadFileNew(attId) { @@ -1237,6 +1242,7 @@ export default { }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -1252,15 +1258,16 @@ export default { submitType: this.submitType })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { this.isSubmit = true + this.saveLoading = true this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion @@ -1280,6 +1287,7 @@ export default { this.$message.success(res.message) } this.isSubmit = false + this.saveLoading = false }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 0386a537b..2eccf64d4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -2961,6 +2961,7 @@ export default { } else { this.fileInfoHandle(); this.isSubmit = true + this.saveLoading = true this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion @@ -2980,6 +2981,7 @@ export default { this.$message.success(res.message) } this.isSubmit = false + this.saveLoading = false }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index a936bc7ea..cc70ad1d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -835,6 +835,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { id: '', createUser: this.$store.getters.userInfo.userId, @@ -870,10 +871,13 @@ export default { } this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { @@ -887,6 +891,7 @@ export default { }, handleSave () { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.form.filesId = this.addFjList _formData.append('id', this.bpnId || '') @@ -902,8 +907,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 51facd8a0..fd999cc2e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -844,6 +844,7 @@ export default { }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -856,11 +857,11 @@ export default { commentText1: this.commentText1 })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -869,6 +870,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { id: '', createUser: this.$store.getters.userInfo.userId, @@ -904,14 +906,17 @@ export default { } this.$router.push('/processCenter') this.isSubmit = false + this.saveLoading = false } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index 01580e620..5f3ea701b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -261,6 +261,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -275,6 +277,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -329,6 +334,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); this.form.onlyKey = this.onlyKey _formData.append("id", this.bpnId || ""); @@ -339,17 +345,18 @@ export default { commentText2: this.commentText2 })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, handleSubmit() { this.$refs["bzzqyjForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; var json = this.json; json.onlyKey = this.onlyKey json.commentText = this.commentText2; @@ -368,6 +375,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { return this.$message.warning("请完善基础信息"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index d6bec40b7..be4d3c8a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -500,6 +500,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -514,6 +516,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -575,6 +580,7 @@ }, handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.form json.data = this.data @@ -588,13 +594,16 @@ })); saveTaskForPub(_formData).then(res => { this.saveLoading = false; + this.isSubmit = false this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, handleAccept(){ + this.saveLoading = true; this.isSubmit = true execTask({ todoId: this.todoId // 当前节点ID @@ -604,11 +613,16 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { if (this.data.length < 1) { this.isSubmit = true + this.saveLoading = true var json = this.json json.onlyKey = this.onlyKey json.commentText = this.commentText3 @@ -626,6 +640,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { var a = 0 @@ -652,6 +667,7 @@ // } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.info = this.data @@ -668,6 +684,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 02f417154..996546e90 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -230,6 +230,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -361,6 +362,8 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -375,6 +378,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -408,6 +414,7 @@ this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.json json.info = this.data json.onlyKey = this.onlyKey @@ -425,6 +432,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请选择标准法规工程师分线管理员') @@ -433,6 +441,8 @@ }, handleSubmitNo() { if (this.commentText41) { + this.isSubmit = true + this.saveLoading = true var json = this.json json.spFlag = '1' json.onlyKey = this.onlyKey @@ -446,6 +456,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue index 148ddcfbb..84b9f15bc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue @@ -222,6 +222,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -353,6 +354,8 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -367,6 +370,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -398,6 +404,7 @@ }, handleSubmit() { this.isSubmit = true + this.saveLoading = true let json = this.json json.info = this.data json.commentText = this.commentText42 @@ -413,10 +420,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText42) { + this.isSubmit = true + this.saveLoading = true var json = this.json json.bzFlag = '1' json.onlyKey = this.onlyKey @@ -430,6 +440,8 @@ this.$message.success('提交成功') this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index b1e04bbe6..370e589b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -575,6 +575,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -589,6 +591,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -621,6 +626,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.json json.info = this.data @@ -641,14 +647,16 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, handleSubmit() { this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.json json.actionFlag = 0 json.commentText = this.commentText4 @@ -667,6 +675,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请选择审批人') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index 1f91ed547..d25ed9314 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -546,6 +546,8 @@ } }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -560,6 +562,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -596,6 +601,7 @@ handleSave() { if(this.clickFlag){ this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); let json = this.form; json.data = this.data; @@ -611,8 +617,9 @@ this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }else{ this.$message.warning('公开征求意见未结束，无法操作') @@ -634,6 +641,7 @@ return; } this.isSubmit = true; + this.saveLoading = true var json = this.json; json.oldinfo = this.oldData; json.onlyKey = this.onlyKey @@ -649,6 +657,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); }else{ this.$message.warning('公开征求意见未结束，无法操作') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index 7dccb7256..5dfcad9af 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -261,6 +261,7 @@ :submitLoading="isSubmit" :saveLoading="saveLoading" @submit="handleSubmit" + :isSubmitBack="isSubmit" show-back @back="handleSubmitNo" show-transfer @@ -398,6 +399,8 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -412,6 +415,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -487,6 +493,7 @@ this.$refs['bzzqyjForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.hqFlag = '0'; json.onlyKey = this.onlyKey @@ -503,6 +510,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning('请选择审批领导') @@ -512,6 +520,7 @@ handleSubmitNo() { if (this.commentText6) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.hqFlag = '1'; json.onlyKey = this.onlyKey @@ -526,6 +535,7 @@ this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning("请输入反馈意见"); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index c2acc4d25..1f0ff2a5b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -252,6 +252,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -367,6 +368,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -381,6 +384,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -454,6 +460,7 @@ export default { }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.bdFlag = '0' json.onlyKey = this.onlyKey @@ -468,11 +475,13 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText7) { this.isSubmit = true + this.saveLoading = true var json = this.json json.bdFlag = '1' json.onlyKey = this.onlyKey @@ -487,6 +496,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index aca27b2ef..2fdb014ab 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -252,6 +252,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -367,6 +368,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -381,6 +384,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -454,6 +460,7 @@ export default { }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.directorFlag = '0' json.onlyKey = this.onlyKey @@ -470,11 +477,13 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText8) { this.isSubmit = true + this.saveLoading = true var json = this.json json.directorFlag = '1' json.onlyKey = this.onlyKey @@ -489,6 +498,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index c70111efa..1e88abca1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -251,6 +251,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -366,6 +367,8 @@ export default { this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -380,6 +383,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -453,6 +459,7 @@ export default { }, handleSubmit() { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.info = this.data2 json.presidentFlag = '0'; @@ -468,11 +475,13 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); }, handleSubmitNo() { if (this.commentText9) { this.isSubmit = true; + this.saveLoading = true var json = this.json; json.onlyKey = this.onlyKey json.presidentFlag = '1'; @@ -487,6 +496,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.$message.warning("请输入反馈意见"); diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue index 636c840c1..c0592c746 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue @@ -800,9 +800,12 @@ export default { } }, mounted() { + /* $('input[type="text"]').each(function(){ $(this).attr('disabled','disabled'); }); + 你个傻逼到处挖坑，气死我了 + */ this.bpnId = this.$route.query.bpnId if (this.bpnId !== undefined) { this.getDatas() @@ -1194,6 +1197,7 @@ export default { //流程保存 handleSave(){ this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -1206,11 +1210,11 @@ export default { commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, startProcessRollBack() { @@ -1268,6 +1272,7 @@ export default { if(boo){ this.isSubmit = true + this.saveLoading = true // this.qbfsForm.fileList = this.fileList this.qbfsForm.commentText = this.commentText // 批量发起列表流程 @@ -1289,12 +1294,18 @@ export default { }) } } + this.isSubmit = false + this.saveLoading = false + } else { + this.isSubmit = false + this.saveLoading = false } } const time = setInterval(() => { const list = this.qbfsForm.modelData.filter ( item => item.processStatus === '1') if(list && this.qbfsForm.modelData && list.length === this.qbfsForm.modelData.length){ this.isSubmit = false + this.saveLoading = false clearInterval(time) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue index 7133c68d2..67f2fc0f6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue @@ -531,6 +531,7 @@ export default { //流程保存 handleSave(){ this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -543,11 +544,11 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, processEditFile(id) { @@ -641,6 +642,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue index d567d500e..759e668e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue @@ -516,6 +516,7 @@ export default { //流程保存 handleSave(){ this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -528,11 +529,11 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, processEditFile(id) { @@ -611,6 +612,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue index 765e15eb7..f63fbaad7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue @@ -675,6 +675,8 @@ export default { } this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }, e => { }); }else { @@ -722,6 +724,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue index 8026bcb2a..afd2bb08e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step7.vue @@ -3068,6 +3068,7 @@ export default { // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() _formData.append('id', this.bpnId || '') @@ -3085,8 +3086,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3290,11 +3292,22 @@ export default { } else { this.$message.warning(res.data) } + this.submitLoading = false + this.isSubmit = false }) + } else { + this.submitLoading = false + this.isSubmit = false } }) + } else { + this.submitLoading = false + this.isSubmit = false } }) + } else { + this.submitLoading = false + this.isSubmit = false } }) // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue index da5f9d971..567c91c8e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue @@ -511,6 +511,7 @@ export default { //流程保存 handleSave(){ this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -526,8 +527,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, processEditFile(id) { @@ -606,6 +608,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index 5f663ca9d..9cba9dc43 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -646,13 +646,14 @@ export default { }, res => { if (res.success) { this.$message.success(res.message) - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = true + this.saveLoading = true this.standardSearch.commentText = this.commentText var json = Object.assign(this.roleForm, this.standardSearch) this.$http.post('lawss/activiti/startProcessRollBack', { @@ -685,9 +686,10 @@ export default { return res }) } - this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } + this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 2b1bee2fa..2a82c3a68 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -192,7 +192,6 @@ { if(valid){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.commentText = this.commentText this.qbfsForm.presentPeople = this.$store.getters.userInfo.userName this.qbfsForm.presentPeopleId = this.$store.getters.userInfo.userId @@ -339,6 +339,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }else{ @@ -354,8 +355,8 @@ export default { }, //确认转办 checkedRoles (data) { - this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -363,8 +364,6 @@ export default { userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; - this.isSubmit = false; if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -373,6 +372,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index e74131d5d..96caa72c6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -232,7 +232,6 @@ { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.dataList = this.dataList; let json = JSON.stringify(this.qbfsForm); @@ -381,6 +381,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -403,7 +404,7 @@ export default { }, //确认转办 checkedRole(data) { - this.isTransfer = true; + this.saveLoading = true; this.isSubmit = true; this.assigneeNewLoading = true; changeAssigneeNew({ @@ -412,8 +413,6 @@ export default { userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; - this.isSubmit = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -422,7 +421,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index c5ade6aa8..43fe8b9e9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bzFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }, e => { }); } @@ -393,7 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; - this.isTransfer = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bzFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -410,7 +411,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; - this.isTransfer = false; + this.saveLoading = false; }, e => { }); }else{ @@ -433,7 +434,7 @@ export default { }, //确认转办 checkedRole(data) { - this.isTransfer = true; + this.saveLoading = true; this.isSubmit = true; this.assigneeNewLoading = true; changeAssigneeNew({ @@ -442,8 +443,6 @@ export default { userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; - this.isSubmit = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -452,7 +451,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index 0e0f3001b..37377b065 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.sdFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } @@ -393,6 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.sdFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -409,6 +411,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -433,6 +436,7 @@ export default { checkedRole(data) { this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -450,6 +454,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 85c9753ee..e129e1f54 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -234,7 +234,6 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :isSubmitBack="isSubmit" @@ -368,6 +367,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bafzFlag = '1' this.qbfsForm.dataList = this.dataList; @@ -384,6 +384,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } @@ -393,6 +394,7 @@ export default { this.$refs['qbfsForm'].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.qbfsForm.commentText = this.commentText; this.qbfsForm.bafzFlag = '0' this.qbfsForm.dataList = this.dataList; @@ -404,9 +406,14 @@ export default { this.$http._getData('lawss/sarBussionessStand/repeal',params,{}).then(res => { if(res && res.ok){ this.completeTask(json) + } else { + this.isSubmit = false; + this.saveLoading = false; } }).catch(e=>{ console.log(e) + this.isSubmit = false; + this.saveLoading = false; }) }else{ this.$message.warning('请完善基础信息') @@ -426,6 +433,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, @@ -445,6 +453,7 @@ export default { checkedRole(data) { this.isTransfer = true; this.isSubmit = true; + this.saveLoading = true; this.assigneeNewLoading = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id @@ -462,7 +471,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(()=>{ + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 175be4580..00f243915 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -974,6 +974,11 @@ }, deep: true //对象的深度验证 }, + 'form.standNum': { + handler: function(val){ + this.$emit('standNumChange',val) + } + } } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 5618dc106..787d794c7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2984,6 +2984,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() _formData.append('id', this.bpnId || '') @@ -2998,11 +2999,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3150,8 +3151,6 @@ }, res => { if (res.ok) { if (res.data === '操作成功') { - this.submitLoading = false - this.isSubmit = false if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId @@ -3166,7 +3165,12 @@ } else { this.$message.warning(res.data) } + this.submitLoading = false + this.isSubmit = false }) + } else { + this.submitLoading = false + this.isSubmit = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue index 468466272..cdb0edb9f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue index 23d9a6db7..c486916c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue index 3484ca5a3..248454ea3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2112,8 +2114,9 @@ this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2238,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2253,12 +2257,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 24ecbd9dd..acdb793c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -42,6 +42,7 @@ @formChoiceZRR2 = "formChoiceZRR2" @formChoiceZRR3 = "formChoiceZRR3" @formChoiceZRR4 = "formChoiceZRR4" + @standNumChange = "standNumChange" />
@@ -1181,8 +1182,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1191,6 +1190,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2418,13 +2420,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.isSubmit = false - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.isSubmit = false - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2577,8 +2577,6 @@ if (res.success) { // this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.processCreateBuss(json) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2591,6 +2589,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }, handleSubmit() { @@ -2820,8 +2820,7 @@ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss2_1',standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { - const obj = res.data - let standSn = obj.newStandSn + const standSn = res.data this.form.standSn = standSn this.form.standNum = standSn this.form.standNumber = standSn @@ -2845,6 +2844,17 @@ } }, + standNumChange(val){ + //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 + let judgeFn = new RegExp(/\s+/g); + if(judgeFn.test(this.form.standSort)){ + this.form.standCode = this.form.standSort + '' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else if(this.form.standSort === 'Q/QCBFC'){ + this.form.standCode = this.form.standSort + '' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }else { + this.form.standCode = this.form.standSort + ' ' + val + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + } + }, processTable () { this.$http.get("lawss/activiti/get_list_by_instance", { prcNum: this.$route.query.prcNum, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index 9fe1ba314..f112ce9e3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -2349,8 +2349,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2363,6 +2361,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 5a893cf6c..caf74e04c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2342,8 +2343,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2356,6 +2355,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.warning('请先上传文件,再提交流程') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 8f96ea7e6..dbb6de6b0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1207,8 +1207,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1217,6 +1215,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2467,6 +2468,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2481,11 +2483,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2616,8 +2618,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2630,6 +2630,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue index 7a48da358..dc9af5b49 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue @@ -1219,8 +1219,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1229,6 +1227,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2234,6 +2235,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2252,12 +2254,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 1afdb7351..b82020187 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -1635,8 +1635,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1645,6 +1643,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2546,6 +2547,7 @@ // this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2563,11 +2565,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2737,12 +2739,12 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue index b933e1543..6ce506db7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue @@ -1265,8 +1265,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1275,6 +1273,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2511,11 +2512,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2645,8 +2646,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2659,6 +2658,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index fa65dac7e..134e087bf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1286,8 +1286,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1296,6 +1294,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2518,6 +2519,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2532,11 +2534,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2666,8 +2668,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2680,6 +2680,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue index 1b4c7080d..4a79345e8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue @@ -2181,11 +2181,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2289,8 +2289,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -2299,6 +2297,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, handleTransfer() { @@ -2344,8 +2345,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2358,6 +2357,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue index bc5d054a7..d428c9d82 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue index 508fc2674..e72b2489b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue @@ -1220,8 +1220,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1230,6 +1228,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2090,6 +2091,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2109,11 +2111,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') // this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2235,6 +2237,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2253,12 +2256,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index b34013c89..e16644f4a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1186,8 +1186,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1196,6 +1194,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2400,6 +2401,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2414,11 +2416,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2549,8 +2551,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2563,6 +2563,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 58ff1b090..423d24043 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1274,8 +1274,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1284,6 +1282,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2521,11 +2522,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2655,8 +2656,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2669,6 +2668,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index b37f2b1ad..3757bc3fb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -93,10 +93,11 @@ @@ -685,7 +686,11 @@ export default { ProcessTitle, }, props: { - formSub: { + // formSub: { + // type: Object, + // required: true + // }, + form: { type: Object, required: true }, @@ -1082,9 +1087,13 @@ export default { }, reveseStatusChange(val){ this.$emit('reveseStatusChange',val) + }, + standNumChange (val) { + this.$emit('standNumChange',val) } }, mounted () { + /* if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){ this.getDataAsync() this.form = this.formSub @@ -1097,6 +1106,17 @@ export default { this.summaryFileList= this.summaryFileListSub this.madelSubList= this.madelSubListSub } + */ + if(this.form && this.form.standSort && this.form.standSort !== ''){ + this.getDataAsync() + this.FBGBUSSFileList= this.FBGBUSSFileListSub + this.BZSMBUSSFileList= this.BZSMBUSSFileListSub + this.LSBBBUSSFileList= this.LSBBBUSSFileListSub + this.QTWJBUSSFileList= this.QTWJBUSSFileListSub + this.GLWJBUSSFileList= this.GLWJBUSSFileListSub + this.summaryFileList= this.summaryFileListSub + this.madelSubList= this.madelSubListSub + } }, watch: { form: { @@ -1126,11 +1146,11 @@ export default { // this.$emit('reveseStatusChange',val) // } // } - 'form.standNum': { - handler: function(val){ - this.$emit('standNumChange',val) - } - } + // 'form.standNum': { + // handler: function(val){ + // this.$emit('standNumChange',val) + // } + // } } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index b61175895..cd994c8cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3236,6 +3236,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() console.log(this.todoId) @@ -3254,8 +3255,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3345,6 +3347,7 @@ // 接受按钮 handleReceive() { this.isSubmit = true + this.saveLoading = true // execTask({ // todoId: this.todoId // 当前节点ID // }).then(res => { @@ -3372,13 +3375,12 @@ this.showreceive = false // this.$router.push('/processCenter') // } + this.saveLoading = false }) }, handleSubmit() { // this.form.country=this.countryArr; // test - this.isSubmit = false - this.saveLoading = false // this.changeTree(this.form.modelData) this.$refs['form'].validate((valid) => { if (valid) { @@ -3453,6 +3455,7 @@ if (res.data === '操作成功') { this.submitLoading = false this.isSubmit = false + this.saveLoading = false if (this.$route.query.bpnId !== '') { let taskId = { id: this.$route.query.bpnId @@ -3464,15 +3467,29 @@ // 流程提交之后，应该流转至待办任务页面 this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) } else { + this.isSubmit = false + this.saveLoading = false + this.$message.warning(res.data) } } else { + this.isSubmit = false + this.saveLoading = false this.$message.warning(res.data) } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) + } else { + this.isSubmit = false + this.saveLoading = false } }) // this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 5e2e715bf..5645d3763 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3251,6 +3251,7 @@ // } this.saveLoading = true + this.isSubmit = true if (this.form.reviseStatus == '3' && this.standardCheckedList.length > 0) { this.form.standCode = this.standardCheckedList[0].standCode this.form.id = this.standardCheckedList[0].id @@ -3269,11 +3270,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index fefe54d22..cb0d40ace 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -1219,8 +1219,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1229,6 +1227,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2089,6 +2090,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2108,11 +2110,11 @@ commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2234,6 +2236,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2251,12 +2254,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 8ded78e52..f72009b18 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -1218,8 +1218,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1228,6 +1226,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2233,6 +2234,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2250,12 +2252,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index 0ff50d3bb..176a113a7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -1155,6 +1155,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index e21f68675..10bad6f83 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -20,7 +20,7 @@
{ if (res.success) { - this.isSubmit = false - this.saveLoading = false this.$message.success(res.message) this.bpnId = res.result }else{ this.$message.warning(res.message) } - }).catch(e => { + }).finally(() => { this.isSubmit = false this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 9ec866901..c691ff7bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -1475,8 +1475,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1485,6 +1483,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2583,8 +2584,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2597,6 +2596,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.warning('请先上传文件,再提交流程') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 46e820e88..798920ea7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1189,6 +1189,9 @@ } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.isSubmit = false + this.saveLoading = false }) }, processNum (row) { @@ -2461,6 +2464,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2476,11 +2480,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2608,8 +2612,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2622,6 +2624,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 6c66c58f8..a8d280db4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -1240,6 +1240,9 @@ } else { this.$message.warning(res.message) } + }).finally(()=>{ + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2245,6 +2248,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2263,12 +2267,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }else{ this.$message.warning("请输入意见") diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 135ccb663..8b7c90bbd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1881,8 +1881,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1891,6 +1889,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2791,6 +2792,7 @@ this.summary=this.summaryList.map(item => item.id).join(",") this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2808,11 +2810,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -3001,12 +3003,12 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }, busVsFunc(){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index b298c4a1c..56e653c69 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1525,8 +1525,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1535,6 +1533,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2807,6 +2808,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2822,11 +2824,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2957,8 +2959,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2971,6 +2971,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index d82c4fd40..4c9103928 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -1455,8 +1455,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1465,6 +1463,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -2374,6 +2375,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2389,11 +2391,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -2518,8 +2520,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2532,6 +2532,8 @@ } else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请确认审批意见是否填写完整') diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index 0fa5e9c8c..d33160475 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -1247,8 +1247,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1257,6 +1255,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2288,13 +2289,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 37b859c10..7518fa104 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -1468,8 +1468,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1478,6 +1476,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, checkedRole (data) { @@ -2341,6 +2342,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2356,11 +2358,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2520,13 +2522,13 @@ this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 48a0281a5..faf3695dd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1405,6 +1405,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2616,6 +2619,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2632,11 +2636,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2793,6 +2797,8 @@ } else { this.$message.warning(res.data) } + this.isSubmit = false + this.saveLoading = false }) }else { this.$message.success(res.message) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 5d44938c5..77958b886 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1177,8 +1177,6 @@ assignee: data[0].id, // 被委托人 pId: this.$route.query.prcId, // 流程实例 }).then(res => { - this.isSubmit = false - this.saveLoading = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -1187,6 +1185,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2437,6 +2438,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2452,11 +2454,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2584,8 +2586,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2598,6 +2598,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index d72df092e..a40f24662 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1534,6 +1534,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, drawerCheckZRBM(data) { @@ -2798,6 +2801,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2813,11 +2817,11 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, formatList (list) { @@ -2967,8 +2971,6 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2981,6 +2983,8 @@ }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) // this.processModelHisOneCount(this.pId) // .then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 51ccc3ccd..d24223945 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -498,6 +498,7 @@ export default { if(this.approvalFlag){ //被驳回后的保存 this.saveLoading = true; + this.isSubmit = true let qbzxdFrom = this.$refs["childForm"].qbfsForm; qbzxdFrom.type = this.toggleType qbzxdFrom.commentText = this.commentText @@ -517,12 +518,16 @@ export default { this.bpnId = res.result; }).catch(e => { this.saveLoading = false; + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }else{ //第一次正常保存 let qbzxdFrom = this.$refs["childForm"].qbfsForm; qbzxdFrom.type = this.toggleType this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append("id", this.bpnId || ""); _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -539,6 +544,9 @@ export default { this.bpnId = res.result }).catch(e => { this.saveLoading = false + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) } }, @@ -565,6 +573,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); @@ -602,7 +611,12 @@ export default { this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); + } else { + this.isSubmit = false; + this.saveLoading = false; } }); } else { @@ -622,6 +636,7 @@ export default { let qbzxdFrom = this.$refs["childForm"].qbfsForm; if(this.$route.query.taskInfo == '重新起草'){ this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' let json = Object.assign(qbzxdFrom, this.roleForm); @@ -660,6 +675,8 @@ export default { this.isSubmit = false; this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); // } // }); @@ -667,6 +684,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; qbzxdFrom.commentText = this.commentText; qbzxdFrom.addFlag = '0' var json = Object.assign(qbzxdFrom, this.roleForm); @@ -683,6 +701,8 @@ export default { // this.addLog(qbzxdFrom) this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); } + this.saveLoading = false; + this.isSubmit = false; }); } else { this.$message.warning("请完善人员信息"); diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 4fcb0f09c..604235aec 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -326,9 +326,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -483,6 +483,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -498,6 +500,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -517,6 +522,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.passFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -532,6 +538,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -540,6 +547,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.passFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -555,6 +563,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index baab28996..3597277a5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -322,9 +322,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -477,6 +477,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -492,6 +494,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -511,6 +516,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.deptCenterFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -526,6 +532,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -534,6 +541,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.deptCenterFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -549,6 +557,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index 69baa4204..52e5725d8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -324,9 +324,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -479,6 +479,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -494,6 +496,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -513,6 +518,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzFlag = '0' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -528,6 +534,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -536,6 +543,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -551,6 +559,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index b048e7c26..b81f854ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -324,9 +324,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -479,6 +479,8 @@ export default { //确认转办 checkedRole (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -494,6 +496,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -513,6 +518,7 @@ export default { }, handleSubmit(){ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzfgbzFlag = '0' this.qbfsForm.planStatus = '计划已确认' if(this.qbfsForm.area){ @@ -535,6 +541,9 @@ export default { if(res && res.ok){ console.log(res) this.completeTask(json,res.data) + } else { + this.isSubmit = false + this.saveLoading = false } }) }else{ @@ -565,6 +574,7 @@ export default { } } this.isSubmit = false + this.saveLoading = false }, e => { }); }, @@ -598,6 +608,7 @@ export default { this.$message.warning('请填写审批意见') }else{ this.isSubmit = true + this.saveLoading = true this.qbfsForm.bzfgbzFlag = '1' this.qbfsForm.commentText = this.commentText let json = JSON.stringify(this.qbfsForm); @@ -613,6 +624,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index 46ae3288a..357c927fe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -1062,6 +1062,7 @@ export default { }, // 保存按钮 handleSave() { + this.saveLoading = true; this.saveLoading = true; let _formData = new FormData(); this.qblx_pageData.qblxFile = this.fileInfoList @@ -1076,8 +1077,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }) }, listSubmit (item) { @@ -1137,6 +1139,7 @@ export default { this.$refs["roleForm"].validate(async (valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true; let finishCount = 0; while (finishCount < jsonData.length) { await this.listSubmit(jsonData[finishCount]) @@ -1151,6 +1154,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false; } else { return this.$message.warning("请完善人员信息"); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 1300e90df..153cef2aa 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -539,7 +539,6 @@ { if (valid) { this.isSubmit = true + this.saveLoading = true this.qbfsForm.commentText = this.commentText this.qbfsForm.LXD = this.lxdList && this.lxdList.length > 0 ? this.lxdList[0].id : '' this.qbfsForm.LXDName = '立项单' @@ -903,11 +903,19 @@ export default { this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" }); // this.isSubmit = false; } + this.isSubmit = false; + this.saveLoading = false; }); + } else { + this.isSubmit = false; + this.saveLoading = false; } }); // } // }) + } else { + this.isSubmit = false; + this.saveLoading = false; } // this.isSubmit = false }, e => { @@ -931,6 +939,8 @@ export default { //确认转办 checkedRole3 (data) { this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -946,6 +956,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index d3e63afda..3b90f4534 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -9,6 +9,7 @@ node-key="id" class="tree-line" icon-class="icon-tree" + :expand-on-click-node="false" :indent="0" :props="props" :data="treeList" diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 70bc6201c..31eeadbe7 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -14,6 +14,7 @@ node-key="id" class="tree-line" icon-class="icon-tree" + :expand-on-click-node="false" :indent="0" :props="props" :data="treeList" diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index c2318ae58..9c98d5218 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -15,6 +15,7 @@ node-key="id" class="tree-line" icon-class="icon-tree" + :expand-on-click-node="false" :indent="0" :props="props" :data="treeList" @@ -2652,9 +2653,10 @@ export default { list1 = list1.concat(list2) } - if(list1.length > 0){ - this.treeList = this.sortByKey(list1,"displaySeq") - } + // if(list1.length > 0){ + // this.treeList = this.sortByKey(list1,"displaySeq") + // } + this.treeList = list1 }, sortByKey(ary, key) { return ary.sort(function (a, b) { @@ -3030,7 +3032,8 @@ export default { _this: this }, res => { if (res.ok) { - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() this.productModal = false this.productModelAdd = { // 模态框信息 @@ -3050,7 +3053,8 @@ export default { this.$http.putData('sarResource/ts-resource', this.productModelAdd, { _this: this }, res => { - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() this.productModal = false this.productModelAdd = { // 模态框信息 @@ -3208,7 +3212,8 @@ export default { message: "删除成功" }) this.getBussionStandTable() - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() } else { this.$message({ type: 'warning', diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 2aae99671..cc63dfee9 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -14,6 +14,7 @@ node-key="id" class="tree-line" icon-class="icon-tree" + :expand-on-click-node="false" :indent="0" :props="props" :data="treeList"