diff --git a/public/static/images/new.png b/public/static/images/new.png new file mode 100644 index 000000000..1a42268e4 Binary files /dev/null and b/public/static/images/new.png differ diff --git a/src/App.vue b/src/App.vue index aff365ccc..57ba4a530 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,7 @@ - + @@ -96,6 +96,7 @@ import {mapGetters, mapState} from 'vuex' import {webLoginType, ssoLogoutUrlDev} from '@/sysConfig' import customerService from "@/components/customerService"; + import isMobile from "./store/isMobile"; export default { name: 'App', @@ -239,6 +240,9 @@ userAvator() { return this.$store.getters.userInfo.avator || require('@/assets/images/avator_default.png') }, + customerServiceShow () { + return !isMobile() + }, ...mapGetters([ 'getWebSocketList', 'getTheme', 'getMenuList' ]), diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index d63a1d5f8..b0debdec9 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -4,7 +4,8 @@ {{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情 - {{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }} + + {{ score }} @@ -45,14 +46,17 @@ - - - + + + + + {{ scope.row.targetScore * 2 }} + - {{ scope.row.targetScore * 2 }} + @@ -110,7 +114,7 @@ 质量评价总平均分 {{ - qualityCommentScore * 2 + qualityCommentScore }} @@ -118,7 +122,7 @@ 动态评价总平均分 {{ - dynamicCommentScore * 2 + dynamicCommentScore }} @@ -141,8 +145,9 @@ + @click="historyPeopleChange(scope.row, scope.$index)"> {{ scope.row.userName + '-' + scope.row.processNode.substring(0,9) }} @@ -165,7 +170,8 @@ show-overflow-tooltip> + :class="currentPeople === scope.$index ? 'active' : ''" + style="width: 100px;" size="mini" @click="historyPeopleChange(scope.row, scope.$index)"> {{ scope.row.userName }} @@ -1335,6 +1341,7 @@ export default { }, data () { return { + score: 0, externalStatus:'', QFTP: false, textOptions: [], @@ -1573,6 +1580,7 @@ export default { importForm: { content: '' }, + currentPeople: 0, // 历史评价-当前评价人索引 STANDSOURCEREVISION: [] } }, @@ -1581,7 +1589,9 @@ export default { watch: { }, methods: { - historyPeopleChange(row){ + historyPeopleChange(row, index){ + this.currentPeople = index + this.historyInfoLoading = true const qualityAllData = { lawId: this.$route.params.id, @@ -1628,7 +1638,112 @@ export default { } }, + getScore () { + //查询动态评价总平均分和质量评价总平均分 + let standId = this.$route.params.id + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { + _this: this + }, res => { + if (res.ok) { + this.score = res.data.finalScore.toFixed(2) + this.qualityCommentScore = res.data.quality.toFixed(2) + this.dynamicCommentScore = res.data.dynamic.toFixed(2) + } + }, e => { + }) + }, + getPeopleTable () { + return new Promise((resolve,reject) => { + // 历史评价 + if (this.commentActiveName === 'historyComment') { + // 刷新质量评价评分人表格和动态评价评分人表格 + let standId = this.$route.params.id + // 质量评价人 + if (this.commentAverageScoreTag === '1') { + const qualityRequest = { + lawId: standId, + evaluationType: 'quality' + } + this.$http._getData('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest).then(res => { + this.qualityHistoryPeopleTable = res.data.records + this.qualityFirstHistoryPeopleId = res.data.records[0].userId + resolve(res) + }) + } else { + // 动态评价人 + const dynamicRequest = { + lawId: standId, + evaluationType: 'dynamic' + } + this.$http._getData('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest).then(res => { + this.dynamicHistoryPeopleTable = res.data.records + this.dynamicFirstHistoryPeopleId = res.data.records[0].userId + resolve(res) + }) + } + } + }) + }, + getHistoryData () { + this.historyInfoLoading = true + if (this.commentAverageScoreTag === '1'){ + this.indexType = 'quality' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.qualityFirstHistoryPeopleId, + evaluationType: this.indexType, + processNode: this.qualityHistoryPeopleTable.length>0?this.qualityHistoryPeopleTable[0].processNode:null + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.qualityHistoryCommentTable = res.data + this.historyInfoLoading = false + + }, e => { + this.historyInfoLoading = false + }) + } + else if (this.commentAverageScoreTag === '2'){ + this.indexType = 'dynamic' + this.dynamicHistoryCommentTable = [] + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.dynamicFirstHistoryPeopleId, + evaluationType: this.indexType + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + if(res.data && res.data.length > 0){ + this.dynamicHistoryCommentTable = res.data + this.historyCommentForm.revise = res.data[0].targetScore + this.historyCommentForm.reviseReason = res.data[0].commentReason + + let averageScore = 0 + res.data.forEach(item => { + if (item.valueType === 'number'){ + averageScore += parseInt(item.targetScore) + } + }) + averageScore = averageScore / 4 + this.historyCommentForm.averageScore = averageScore + }else { + this.historyCommentForm.averageScore = 0 + } + this.historyInfoLoading = false + }, e => { + this.historyInfoLoading = false + }) + } + }, tabsClickBtn(tab, event){ + this.commentAverageScoreTag = '1' + this.tabsClick() + + /* if (this.commentActiveName === 'dynamicComment'){ this.indexType = 'dynamic' //查询评分表 @@ -1684,8 +1799,11 @@ export default { this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { - this.qualityCommentScore = res.data.quality.toFixed(3)/2 - this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + if (res.ok) { + this.score = res.data.finalScore.toFixed(2) + this.qualityCommentScore = res.data.quality.toFixed(2) + this.dynamicCommentScore = res.data.dynamic.toFixed(2) + } }, e => { }) @@ -1716,8 +1834,37 @@ export default { }, e => { }) + + */ }, tabsClick(tab, event){ + this.getScore() + this.getPeopleTable().then(() => { + // 动态评价 + if (this.commentActiveName === 'dynamicComment'){ + this.indexType = 'dynamic' + //查询评分表 + const allData = { + lawId: this.$route.params.id, + userId: this.qualityFirstHistoryPeopleId, + evaluationType: this.indexType, + } + this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , { + _this: this + }, res => { + this.qualityHistoryCommentTable = res.data + this.historyInfoLoading = false + + }, e => { + this.historyInfoLoading = false + }) + }else if (this.commentActiveName === 'historyComment'){ + // 历史评价 + this.currentPeople = 0 + this.getHistoryData() + } + }) + /* this.historyInfoLoading = true if (this.commentAverageScoreTag === '1'){ this.indexType = 'quality' @@ -1777,8 +1924,11 @@ export default { this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { - this.qualityCommentScore = res.data.quality.toFixed(3)/2 - this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + if (res.ok) { + this.score = res.data.finalScore.toFixed(2) + this.qualityCommentScore = res.data.quality.toFixed(2) + this.dynamicCommentScore = res.data.dynamic.toFixed(2) + } }, e => { }) @@ -1808,7 +1958,7 @@ export default { }, e => { }) - + */ }, targetScoreChange(row){ if (this.targetScore1 === '') { @@ -1921,14 +2071,20 @@ export default { }, e => { }) //刷新动态评价总平均分和质量评价总平均分 + this.getScore() + /* this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { - this.qualityCommentScore = res.data.quality.toFixed(3)/2 - this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + if (res.ok) { + this.score = res.data.finalScore.toFixed(2) + this.qualityCommentScore = res.data.quality.toFixed(2) + this.dynamicCommentScore = res.data.dynamic.toFixed(2) + } }, e => { }) + */ } }, e => { }) @@ -1947,7 +2103,13 @@ export default { sums[index] = ''; return; } - const values = data.map(item => Number(item[column.property])); + const values = data.map(item => { + if (column.property === 'scoreMin') { + // 此时不存在scoreMin,需要重新计算 + this.setScoreMin(item) + } + return Number(item[column.property]) + }); if (!values.every(value => isNaN(value))) { sums[index] = values.reduce((prev, curr) => { const value = Number(curr); @@ -3110,6 +3272,10 @@ export default { }, qbBtn() { + // 默认动态评价 + this.commentActiveName = 'dynamicComment' + this.commentAverageScoreTag = '1' + if (this.commentActiveName === 'dynamicComment'){ this.indexType = 'dynamic' //查询评分表 @@ -3191,11 +3357,16 @@ export default { this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION }, e => { }) + this.getScore() + /* this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, { _this: this }, res => { - this.qualityCommentScore = res.data.quality.toFixed(3)/2 - this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2 + if (res.ok) { + this.score = res.data.finalScore.toFixed(2) + this.qualityCommentScore = res.data.quality.toFixed(2) + this.dynamicCommentScore = res.data.dynamic.toFixed(2) + } }, e => { }) @@ -3224,6 +3395,7 @@ export default { }, e => { }) + */ this.$http.get('sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', {indexType:this.indexType}, { _this: this }, res => { @@ -3446,6 +3618,11 @@ export default { } } .modular-header-btn{ + .active { + color: #409EFF; + border-color: #c6e2ff; + background-color: #ecf5ff; + } & > button{ height: 30px; line-height: 30px; diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index 491c9622e..9f9ad88a3 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -23,6 +23,7 @@ width="55"> {{ scope.row.standard }} diff --git a/src/pages/home2/components/release2/index.vue b/src/pages/home2/components/release2/index.vue index da0e972ef..f4391dce5 100644 --- a/src/pages/home2/components/release2/index.vue +++ b/src/pages/home2/components/release2/index.vue @@ -24,8 +24,12 @@ type="index" align="center" width="55"> + + {{ ($index + 1) + (page - 1) * pageSize }} + {{ scope.row.standard }} diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue index c6692f926..6713f63e7 100644 --- a/src/pages/home2/components/releaseBuss/index.vue +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -23,6 +23,7 @@ width="55"> {{ scope.row.standard }} @@ -32,7 +33,10 @@ prop="standName" label="标准名称"> - {{ scope.row.standardName }} + + {{ scope.row.standardName }} + + + + diff --git a/src/pages/phone/phoneHome.vue b/src/pages/phone/phoneHome.vue index 0c66fc044..0d15d352c 100644 --- a/src/pages/phone/phoneHome.vue +++ b/src/pages/phone/phoneHome.vue @@ -40,6 +40,7 @@ 标准化动态 + @@ -199,5 +200,12 @@ export default { font-weight: 500; } } + .footer{ + color: #3170A7; + position: absolute; + bottom: 10px; + left: 50%; + transform: translateX(-50%); + } } diff --git a/src/pages/phone/standDynamics.vue b/src/pages/phone/standDynamics.vue index dcf1cb6cd..6c469e87b 100644 --- a/src/pages/phone/standDynamics.vue +++ b/src/pages/phone/standDynamics.vue @@ -199,6 +199,8 @@ export default { this.page++; if (this.messageType == "ZLZX") { this.getAdvice(); + + console.log(this.$refs.cardBoxThree.scrollTop) } else { this.onDynamics(); } @@ -243,6 +245,10 @@ export default { //获取数据 getAdvice(first = false) { this.listFlag = false; + let scrollTop = 0 + if (this.$refs.cardBoxThree) { + scrollTop = this.$refs.cardBoxThree.scrollTop + } this.$http.get("fileMaterialCenter/file-material", { page: first ? 1 : this.page, pageSize: 10, @@ -255,6 +261,9 @@ export default { if (mList.length) { if (!first && this.standardReleaseList.length) { this.standardReleaseList = this.standardReleaseList.concat(mList); + this.$nextTick(() => { + this.$refs.cardBoxThree.scrollTop = scrollTop + }) } else { this.standardReleaseList = mList; } @@ -322,6 +331,7 @@ export default { mounted() { this.onDynamics(); this.getAdvice(); + this.$refs.cardBoxThree.addEventListener('scroll', this.scroolThree); //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index 880c31566..c1b047266 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -542,6 +542,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) @@ -556,8 +557,9 @@ export default { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -566,6 +568,7 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -597,9 +600,11 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.isSubmit = false + this.saveLoading = false this.$message.warning('流程启动失败') } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index 82015cf43..c824bbae5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -256,6 +256,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, // 委托人 @@ -270,6 +272,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -324,6 +329,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -331,16 +337,17 @@ commentText2: this.commentText2, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText2 json.responUserList = this.form.responUserList @@ -355,6 +362,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index db0421945..494e98a73 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -328,6 +328,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, // 委托人 @@ -342,6 +344,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -429,6 +434,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -437,15 +443,16 @@ commentText3: this.commentText3, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -453,6 +460,8 @@ this.$message.success('接收成功') this.$router.push('/processCenter') } + }).finally(() => { + this.saveLoading = false this.isSubmit = false }) }, @@ -461,6 +470,7 @@ if (valid) { this.json.dyhz = this.form.dyhz this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.fileId = this.form.fileId @@ -476,6 +486,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index d9066941d..879c08cd3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -210,6 +210,7 @@ show-submit :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back @back="handleSubmitNo" @@ -304,6 +305,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, // 委托人 @@ -318,6 +321,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 @@ -355,6 +361,7 @@ }, handleSubmit() { // 同意 this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText4 @@ -368,11 +375,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText4) { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText4 @@ -386,6 +395,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 97226269f..cac9b12f3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -299,6 +299,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, // 委托人 @@ -313,6 +315,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -387,6 +392,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let json = this.form json.responUserList = this.tableData this.form.docUser = this.newDocUser @@ -399,14 +405,16 @@ saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let json = this.jsonData json.commentText = this.commentText5 json.hzfileId = this.form.hzfileId @@ -423,6 +431,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index c9a454d2a..b760fc7d3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -202,6 +202,7 @@ @back="handleSubmitNo" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -294,6 +295,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, // 委托人 @@ -308,6 +311,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -382,6 +388,7 @@ }, handleSubmit() { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 0 json.commentText = this.commentText6 @@ -395,11 +402,13 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) }, handleSubmitNo() { if (this.commentText6) { this.isSubmit = true + this.saveLoading = true var json = this.json json.actionFlag = 1 json.commentText = this.commentText6 @@ -413,6 +422,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请输入审批意见') diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index c57b24558..f3c74aad9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -201,6 +201,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -293,6 +295,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -307,6 +310,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index cd033ce64..c7034cdfd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -199,7 +199,8 @@ show-submit approval :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @submit="handleSubmit" show-back show-transfer @@ -294,6 +295,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -308,6 +310,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index a2be9e220..d5789c8e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -233,7 +233,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -337,6 +338,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.userId, // 委托人 @@ -351,6 +353,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 224b78ed4..49c7200d4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -580,7 +580,6 @@ export default { queryTaskFirst({ bpnId: this.$route.query.bpnId }).then(res => { - debugger let obj = JSON.parse(res.mes) let mes = {} if(obj.json !== undefined){ @@ -805,6 +804,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) @@ -816,11 +816,11 @@ export default { commentInfo: this.commentInfo })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -839,6 +839,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -864,8 +865,13 @@ export default { } this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false }) + }).catch(() => { + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('请完成流程信息的人员选择') diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 8e7e65447..8425c2bf7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -208,7 +208,7 @@ show-submit show-back backBTNTexts="不涉及" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -380,7 +380,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -390,8 +390,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -417,6 +418,7 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false }); } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index 082d2b38d..45a3da2c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -467,6 +467,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -477,11 +478,11 @@ export default { commentStep3: this.commentStep3 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -496,6 +497,7 @@ export default { this.$refs['rh_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -505,8 +507,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(e => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index 4a358d522..5e28e9ced 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -228,7 +228,7 @@ show-back backBTNTexts="驳回" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -373,7 +373,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -383,8 +383,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -412,8 +413,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 73c8fbfc4..ab06a7f7c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -722,6 +722,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -730,10 +731,10 @@ export default { commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { + this.isSubmit = false this.saveLoading = false }) }, @@ -748,6 +749,7 @@ export default { this.$refs['rh_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -757,8 +759,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + this.saveLoading = false + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 40b039b2c..d328e9133 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -226,7 +226,7 @@ v-if="taskInfo !== '标准法规工程师汇总修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -396,7 +396,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -406,8 +406,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -446,8 +447,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index f28c9e77d..8028ecbfb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -713,6 +713,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) @@ -725,11 +726,11 @@ export default { })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, /** 提交按钮*/ @@ -748,6 +749,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -774,7 +776,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }) + }).catch(e => { + this.saveLoading = false + this.isSubmit = false }) } else { this.$message.warning('请完成流程信息的人员选择') diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 7e677b171..51fa53458 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -205,7 +205,7 @@ show-back backBTNTexts="不涉及" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -341,7 +341,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -351,8 +351,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -379,8 +380,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index 07b23a91c..82b8d9243 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -397,6 +397,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -407,11 +408,11 @@ export default { ch_pageData: this.ch_pageData, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -426,6 +427,7 @@ export default { this.$refs['ch_pageData'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -435,8 +437,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue index 25847e144..865e6d01d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue @@ -209,7 +209,7 @@ show-submit show-back :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -323,7 +323,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -333,8 +333,9 @@ export default { this.$message.success('退回成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -361,8 +362,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue index a833498e7..29d4b6158 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue @@ -502,6 +502,7 @@ export default { // 保存按钮 handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -510,11 +511,11 @@ export default { commentStep5: this.commentStep5 })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -527,6 +528,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { + this.saveLoading = true this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) @@ -537,8 +539,10 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue index bc24438ee..4aa6c9c39 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue @@ -212,7 +212,7 @@ v-if="taskInfo !== '标准法规工程师修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -375,7 +375,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) @@ -385,8 +385,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -425,8 +426,9 @@ export default { this.$message.success('提交成功') this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f92c3a402..e663cd815 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -1056,6 +1056,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) @@ -1069,11 +1070,11 @@ export default { sarType: this.sarType })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -1129,6 +1130,7 @@ export default { this.$message.warning('请选择责任人') } else { this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/startProcessRollBack', { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1164,10 +1166,13 @@ export default { } this.$router.push('/processCenter') } + this.isSubmit = false + this.saveLoading = false }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 5f35d1769..52292c875 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -332,6 +332,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, // 委托人 @@ -346,6 +348,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 点击跳转标准详情 @@ -454,6 +459,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -464,10 +470,10 @@ standInData: this.sarType })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { @@ -483,6 +489,7 @@ this.$message.warning('请选择执行人') } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.itemList = this.itemList json.commentText = this.commentText2 @@ -496,6 +503,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index f9dbbbb53..548446a2a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -714,6 +714,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, // 委托人 @@ -728,6 +730,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -831,6 +836,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -844,7 +850,8 @@ saveTaskForPub(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { + this.isSubmit = false this.saveLoading = false }) }, @@ -918,6 +925,7 @@ this.$message.warning('请选择责任人') } else { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText3 json.itemList = this.itemList @@ -932,6 +940,7 @@ this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 28824f9ec..eb0cb4c13 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -256,7 +256,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 15738aa9a..b63ddc292 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -255,7 +255,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue index bdd588f52..b0931bab0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -258,7 +258,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 0d663e0b2..b39b0cda4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -258,7 +258,8 @@ { + this.isSubmit = false }) }, // 点击跳转标准详情 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 0db4bd42c..743550ab1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -923,6 +923,7 @@ export default { handleSave() { if(!this.submitFlag){ this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -936,13 +937,14 @@ export default { commentText: this.commentText })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }else{ this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -955,11 +957,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 }); } }, @@ -977,7 +979,6 @@ export default { } }) if(peopleFlag){ - this.isSubmit = true; this.listForm.dataList = this.dataList; this.listForm.commentText = this.commentText; let json = Object.assign(this.listForm, this.roleForm); @@ -986,6 +987,8 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { + this.isSubmit = true; + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1020,7 +1023,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.isSubmit = false + this.saveLoading = false } }); } else { @@ -1038,6 +1045,8 @@ export default { if (valid) { this.$refs["roleForm"].validate((valid) => { if (valid) { + this.saveLoading = true + this.isSubmit = true let specialJson = { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1076,6 +1085,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); } else { this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index a0a96e66b..aaa30b670 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -202,9 +202,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -359,14 +359,13 @@ export default { }, //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -375,6 +374,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index b3c58022c..c19a00e95 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -379,7 +379,6 @@ show-save show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" :approval="true" @@ -746,6 +745,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true; + this.saveLoading = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -758,6 +758,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }else{ @@ -769,6 +770,7 @@ export default { //保存 handleSave() { this.saveLoading = true; + this.isSubmit = true // this.listForm.dataList = this.dataList; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -780,11 +782,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; }); }, checkedRole2(data) { @@ -795,14 +797,14 @@ export default { }, //确认转办 checkedRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -811,6 +813,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index a97671a00..d32e2a941 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -267,7 +267,6 @@ { }); } }, //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -484,6 +485,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false + this.saveLoading = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 65d19c8b2..9d9cb67bd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -448,7 +448,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -697,7 +696,8 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -713,6 +713,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -840,6 +843,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); this.listForm.dataList = this.dataList; _formData.append("id", this.bpnId || ""); @@ -853,13 +857,15 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -867,6 +873,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } + }).finally(() => { + this.saveLoading = false; this.isSubmit = false }) }, @@ -917,6 +925,7 @@ export default { this.listForm.dataList = this.dataList; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -929,6 +938,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 0c8193924..e8fab95de 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -352,8 +352,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transfer-loading="isTransfer" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -477,14 +477,13 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -493,6 +492,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 982972053..e70736efb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -361,7 +361,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -490,14 +489,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -506,6 +505,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -633,6 +635,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = false this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -645,6 +648,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue index 57cb4b6be..6fd0830ea 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -371,7 +371,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -502,14 +501,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -518,6 +517,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -646,6 +648,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -658,6 +661,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index 226a842e4..505be2934 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -361,7 +361,6 @@ show-transfer :submitLoading="isSubmit" :saveLoading="saveLoading" - :transfer-loading="isTransfer" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -490,7 +489,8 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -506,6 +506,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -633,6 +636,7 @@ export default { this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -645,6 +649,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 5d25f4aa5..d31fa7409 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -1051,6 +1051,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList this.listForm.fileName = this.fileInfoList let _formData = new FormData(); @@ -1068,8 +1069,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false }); }, //提交事件 @@ -1087,6 +1089,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1121,7 +1124,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.isSubmit = false + this.saveLoading = false } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 7626f1a8c..c63e8dbb9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -197,7 +197,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transferLoading="isTransfer" + :transferLoading="isSubmit" @transfer="handleTransfer" @submit="handleSubmit" > @@ -379,14 +379,13 @@ export default { }, //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -395,6 +394,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 347ba59f3..9fb44fec5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -377,7 +377,6 @@ show-save show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @transfer="handleTransfer" @save="handleSave" @@ -519,14 +518,14 @@ export default { methods: { //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -535,6 +534,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -847,6 +849,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "4"); @@ -856,11 +859,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 }); }, //提交事件 @@ -869,6 +872,7 @@ export default { this.listForm.dataList = this.dataList const json = JSON.stringify(this.listForm); this.isSubmit = true + this.saveLoading = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -881,6 +885,7 @@ export default { this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }); }, //标准表格选择框改变 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index c633a4a85..f37f7b539 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -199,9 +199,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" :saveLoading="saveLoading" + :isSubmitBack="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -296,14 +296,14 @@ export default { methods: { //确认转办 checkedRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -312,6 +312,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -475,6 +478,7 @@ export default { //提交事件 handleSubmit() { this.isSubmit = true; + this.saveLoading = true this.listForm.approvalOpinion = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); @@ -490,6 +494,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); }, //选择标准取消事件 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 79d7726ca..d17d72d7c 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 1266830c7..27b1a2596 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 d0963cd1d..1fa7656d9 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 65bd93551..698bde8b2 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 835035451..07d7fb746 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 07ce5ed81..51acd7b4b 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 ec3d165df..f5ffaf747 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 79126f38f..225c81555 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 9655bae77..bf071bbe5 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 a22af334f..da18fc8b7 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 1ce4ecf56..3c6db01ae 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 35e70c095..15706ce8e 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 f9cf49c62..37da97e63 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/cywbbzzxd/step1.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue index 02a574192..d06f9abee 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step1.vue @@ -187,6 +187,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -219,7 +220,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -230,6 +235,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); @@ -240,11 +246,11 @@ export default { roleForm: this.roleForm, })); saveTaskFirst(_formData).then(res => { - 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/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue index 92aaecb9b..9e3def10d 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step2.vue @@ -91,7 +91,7 @@ show-save show-submit :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue index 261920fa8..fd3d49264 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue @@ -390,9 +390,9 @@ show-save show-submit show-record - :recordLoading="recordLoading" + :recordLoading="isSubmit" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @record="handleRecord" @save="handleSave" @submit="handleSubmit" @@ -641,6 +641,7 @@ export default { let json = { signFlag: '2', }; + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -670,6 +671,7 @@ export default { wbbzform: this.wbbzform, signFlag: '1', }; + this.isSubmit = true; this.$refs["wbbzForm"].validate((valid) => { if (valid) { this.$http.post("lawss/activiti/completeTask", { diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue index 162046d03..5d733f897 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step4.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue index c2270e438..21adf95fd 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step5.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue index a15ff88e5..f1635d7c2 100644 --- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step6.vue @@ -223,8 +223,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -369,6 +369,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -389,7 +390,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -406,6 +406,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -433,14 +434,13 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -449,6 +449,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, }, diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue index 10dd1f3ba..3a0e50e42 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step1.vue @@ -186,6 +186,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -218,7 +219,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -229,6 +234,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); @@ -239,11 +245,11 @@ export default { roleForm: this.roleForm, })); saveTaskFirst(_formData).then(res => { - 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/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue index e181634fb..b7add981b 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue @@ -323,9 +323,9 @@ show-save show-submit show-record - :recordLoading="recordLoading" + :recordLoading="isSubmit" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @record="handleRecord" @save="handleSave" @submit="handleSubmit" @@ -561,7 +561,7 @@ export default { }, //不备案 handleRecord(){ - this.recordLoading = true + this.isSubmit = true this.dlFlag = '0' this.wbbzform.commentText = this.commentText; this.wbbzform.participantsData = this.participantsData @@ -578,14 +578,14 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } - this.recordLoading = false + this.isSubmit = false }, e => { }); }, //流程保存 handleSave() { - this.saveLoading = true + this.isSubmit = true this.wbbzform.fileName = this.fileInfoList this.wbbzform.commentText = this.commentText; this.wbbzform.participantsData = this.participantsData @@ -600,11 +600,10 @@ export default { form: this.wbbzform, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, //流程提交 diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue index adfb9110a..14bbac1e9 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue @@ -278,8 +278,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -384,14 +384,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -400,6 +399,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue index 40c626c42..7906c2d84 100644 --- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue @@ -278,8 +278,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -384,14 +384,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -400,6 +399,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { 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 769005a90..10e3eb4ba 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 572c2610a..2cbdd7ad6 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 1bdc9f3aa..80910b727 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 2ee80cce9..e3dcc90f9 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 eee48492c..39a009f7e 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 43e6fa471..9ab8bdd11 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 eb65e7b48..7ee3c4c6e 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 89e699c28..5edd5d3c3 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 9963976a9..4c7655f9e 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..2c4a62250 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -953,32 +953,41 @@ type="index" label="序号" width="80" - align="center" - > + align="center"> + + {{ scope.$index + 1 }} + + - {{ scope.row.standCode }} + {{ scope.row.standCode }} + + {{ scope.row.standName }} + + + {{ scope.row.standEnName }} + - {{ scope.row.standStatusShow }} + {{ scope.row.standStatusShow }} @@ -2097,6 +2106,9 @@ _this: this }, res => { if(res && res.data){ + if (res.data.textStatusBussShow === '作废') { + this.$message.error('本版本已作废') + } const bringData = res.data this.FBGBUSSFileList=[] this.BZSMBUSSFileList=[] @@ -2984,6 +2996,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() _formData.append('id', this.bpnId || '') @@ -2998,11 +3011,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 +3163,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 +3177,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 6afdce48c..5c94af0ed 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 9e587bd23..9aec619be 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 71fefda45..9b3ad3d03 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 03908d76a..fcd2ba283 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() { @@ -2620,7 +2620,7 @@ if(res.ok){ this.completeTask() }else{ - this.$message.error(res.data) + this.$message.error(res.message) } }) }else{ @@ -2693,7 +2693,9 @@ this.form.topId = this.pId this.form.prcNum = this.prcNum this.form.prcName = this.prcName - this.form.issueTime = this.dateFormatter() + if (this.form.standStatus !== '3') { + this.form.issueTime = this.dateFormatter() + } this.form['id'] = item.id this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS']) this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS']) @@ -2820,8 +2822,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 +2846,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 f4ff164cc..139b82df6 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 70141de07..766cd6ddc 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 3bb135bf6..2ee710a26 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 89fcd951b..6ac63aaad 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 049410ec2..bf177238a 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 7a4a38194..71c91533b 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 47070853a..c429347c5 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 020241a6f..b7363939e 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 b74f69bc3..9ae0fa642 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 ca0e2b674..413168c65 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 493f42dfa..e38a8a356 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 4700b42d1..6353d79fe 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..b42d734f8 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,12 +1106,23 @@ 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: { handler: function (val) { if(val){ - this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList); + this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,false,this.fileList,'',this.madelSubList); } }, deep: true //对象的深度验证 @@ -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..71914a9c6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2977,6 +2977,7 @@ if (type === 'preview') { this.$onlineEditPreview(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) } else { + this.handleSave() this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, this.form) } }, @@ -3236,6 +3237,7 @@ // } this.saveLoading = true + this.isSubmit = true let _formData = new FormData() this.fileInfoHandle() console.log(this.todoId) @@ -3254,8 +3256,9 @@ this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle() { @@ -3345,6 +3348,7 @@ // 接受按钮 handleReceive() { this.isSubmit = true + this.saveLoading = true // execTask({ // todoId: this.todoId // 当前节点ID // }).then(res => { @@ -3372,13 +3376,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) { @@ -3442,7 +3445,7 @@ if (res.success) { this.$message.success(res.message) const planForm = {} - planForm.id = this.form.planId + planForm.id = this.form.esId planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS planForm.processType = "buss1" @@ -3453,6 +3456,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 +3468,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..a5a5ea2cb 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() { @@ -3470,7 +3471,7 @@ if (res.success) { this.$message.success(res.message) const planForm = {} - planForm.id = this.form.planId + planForm.id = this.form.esId planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS planForm.processType = "buss1" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index edbf19c97..979666cf1 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 2a8192451..4cfb82555 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 c613e370e..ca06a50ac 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 bb90330f8..e5a99bab8 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 }) @@ -2785,7 +2786,7 @@ // 自动匹配配置标准 this.saveConfStand(res.data) const planForm = {} - planForm.id = this.form.planId + planForm.id = this.form.esId planForm.planStatus = '4' planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e921045f8..f2de6332c 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 5f77629be..89ecc0f21 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 d6cf164f2..914153944 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 0020cdc20..eaa2b1fa7 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 32dd50182..47761a136 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 62a3a4f9e..6ad658316 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 030ad6a69..028863fc5 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 d05bb0463..26f7e3e33 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 86e10d410..7c70c04b3 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(){ @@ -2768,7 +2772,7 @@ if (res.success) { this.$message.success(res.message) const planForm = {} - planForm.id = this.form.planId + planForm.id = this.form.esId planForm.reviseStatus = this.form.reviseStatus planForm.standCode = this.form.DTQBBHBUSS planForm.processType = "buss1"; @@ -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 b98d09257..0634bc299 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 b1451741d..b89646e81 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 0f0e15e16..31e35411d 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 b44866257..c2ab06b60 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 3e82282f8..a6b0029f4 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 626746e4f..2ce1b4a52 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 152375f0b..c919bcc33 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/processCenter/pages/creatProcess/wbsm/step1.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue index 119fd333c..418950078 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step1.vue @@ -644,6 +644,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) @@ -655,11 +656,11 @@ export default { commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { + }).finally(e => { this.saveLoading = false + this.isSubmit = false }) }, // 提交按钮 @@ -681,6 +682,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -714,7 +716,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -739,6 +745,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -751,6 +758,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/wbsm/step2.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue index 2dd40c2d6..923d5a620 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step2.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue index 299aba65a..cdbf3798d 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step3.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue index 9efc532a4..71371c831 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step4.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue index 984c9a989..ef80a2819 100644 --- a/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wbsm/step5.vue @@ -144,8 +144,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -256,14 +256,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -272,6 +271,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, processTable() { @@ -397,6 +398,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -408,6 +410,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index a50cbe1de..480ac7861 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -608,6 +608,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) @@ -619,12 +620,12 @@ export default { commentText: this.commentText })) saveTaskFirst(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 提交按钮 handleSubmit() { @@ -650,6 +651,7 @@ export default { this.$refs['roleForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let paramsInfo = new FormData() // paramsInfo.append('id', this.bpnId || '') paramsInfo.append('createUser', this.$store.getters.userInfo.userId) @@ -680,7 +682,13 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); + }).catch(e => { + this.isSubmit = false; + this.saveLoading = false; }) } }) @@ -698,6 +706,8 @@ export default { commentText: this.commentText } }; + this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTaskNew", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.userId, @@ -719,6 +729,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { this.isSubmit = false; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 5ae2af95e..c76e5acaf 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -151,8 +151,8 @@ show-transfer show-back :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" @back="beforeBack" @transfer="handleTurnTo" @save="handleSave" @@ -322,7 +322,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -331,11 +331,10 @@ export default { commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, //驳回按钮 @@ -370,13 +369,13 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) } @@ -384,7 +383,6 @@ export default { }, // 提交按钮 handleSubmit() { - this.isSubmit = true let zqa = new Map(); for (let lastDataListElement of this.dataList) { let a = zqa.get(lastDataListElement.dutyPeopleInfoId) @@ -420,20 +418,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -447,6 +445,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleRow = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue index 31d8c505a..e8437cbf9 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue @@ -154,8 +154,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @@ -366,11 +366,14 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') } + }).finally(() => { + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') @@ -407,7 +410,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -416,16 +419,14 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag=false this.dataList.forEach(item => { if (item.dutyPeople === '') { @@ -462,20 +463,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -483,12 +484,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleForm = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 94509d2a6..93fd4be91 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -153,8 +153,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @back="handleSubmitNo" @save="handleSave" @@ -341,12 +341,15 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') } - }) + }).finally(() => { + this.isSubmit = false; + }); } else { this.$message.warning('请输入反馈意见') } @@ -382,7 +385,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -391,16 +394,14 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag=false this.dataList.forEach(item => { if (item.dutyPeople === '') { @@ -437,20 +438,20 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if (res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(e => { this.isSubmit = false }) }, drawerCheck (data) { if (this.drawerTitle === '转办处理人') { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -458,12 +459,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { this.roleForm = data[0] diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index b74220316..7e38d5f6d 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -155,8 +155,7 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -389,21 +388,21 @@ export default { window.open(routeUrl.href, '_blank') }, drawerCheck (data) { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.userId, // 委托人 pId: this.pId // 流程实例 }).then(res =>{ - this.isSubmit = true if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -429,7 +428,7 @@ export default { for(let item of zqa) { list.push(item[1].standardInfoList) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -438,11 +437,10 @@ export default { commentInput: this.commentInput })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(e => { + this.isSubmit = false }) }, // 接受按钮 @@ -455,12 +453,12 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + }); }, // 提交按钮 handleSubmit() { - this.isSubmit = true let flag = false this.dataList.forEach(item => { if (item.fileText.length === 0) { @@ -479,15 +477,15 @@ export default { params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.userId) params.set('taskIds', this.taskIds) + this.isSubmit = true completeTask(params).then(res => { if(res.success === true) { this.$message.success('提交成功') this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + }); }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 9af768425..b32718f2f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -135,8 +135,7 @@ show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" - :isSubmitBack="backLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" @@ -312,7 +311,7 @@ export default { }) }, drawerCheck (data) { - this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -320,12 +319,13 @@ export default { pId: this.pId // 流程实例 }).then(res =>{ if (res.success) { - this.turnLoading = false this.$message.success('调整成功') this.$router.push("/processCenter") } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -335,13 +335,13 @@ export default { this.drawerTitle = '转办处理人' }, handleSubmitNo() { - this.backLoading = true if (this.commentText) { var json = { responUserList: this.dataList, actionFlag: 1, commentText: this.commentText } + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -350,12 +350,11 @@ export default { if (res.success) { this.$message.success('驳回成功') this.$router.push('/processCenter') - this.backLoading = false } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') - this.backLoading = false } }, //未整改项抽屉中的查询按钮 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue index 2275cefdf..00b7745c2 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue @@ -814,6 +814,7 @@ export default { //流程保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true this.listForm.dataList = this.dataList let _formData = new FormData(); _formData.append("id", this.bpnId || ""); @@ -826,11 +827,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 }); }, //流程提交事件 @@ -858,6 +859,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -891,7 +893,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false; } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue index 5746cc13e..8faf37b67 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue @@ -141,7 +141,7 @@ 流程列表加载中 - @@ -219,7 +219,8 @@ export default { methods: { //确认转办 checkedTransferRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -235,6 +236,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 @@ -423,6 +427,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -432,11 +437,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 }); }, //提交事件 @@ -449,7 +454,6 @@ export default { dataChildren.forEach((item, index) => { dataListChildren = dataListChildren.concat(item); }); - this.isSubmit = true; this.listForm.breakdownList.map(item => { if(item.termsConditions){ item.termsConditions = '' @@ -461,9 +465,10 @@ export default { const json = JSON.stringify(this.listForm); if(this.nodeList.length == 0){ this.$message.warning('请先分发责任人') - this.isSubmit = false; return } + this.isSubmit = true; + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -476,6 +481,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue index 80f1b663c..b566a9673 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue @@ -376,7 +376,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -609,14 +608,14 @@ export default { methods: { //确认转办 checkedTransferRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -625,6 +624,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }, // 请求转换流程图 @@ -903,6 +905,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -912,16 +915,17 @@ 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 }); }, // 接受按钮 handleAccept() { this.isSubmit = true; + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -929,7 +933,9 @@ export default { this.$message.success("接收成功"); this.$router.push("/processCenter"); } - this.isSubmit = false; + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false }); }, handlePrice() { @@ -985,6 +991,7 @@ export default { } }); this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -999,6 +1006,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue index bd2b139f2..08cb894ea 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue @@ -270,8 +270,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -337,14 +337,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -353,6 +352,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -514,6 +515,7 @@ export default { this.listForm.passFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -525,6 +527,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue index 89b2528c9..78fd086c5 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -269,8 +269,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -336,14 +335,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -352,6 +350,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue index fdf7f409a..aaa311f31 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue @@ -269,8 +269,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @submit="handleSubmit" @@ -334,14 +333,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -350,6 +348,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 317eab843..80087a072 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -575,6 +575,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); @@ -586,11 +587,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 }); }, //流程提交事件 @@ -617,6 +618,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -650,7 +652,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); + } else { + this.saveLoading = false; + this.isSubmit = false; } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 3fbf3e7f6..25d904605 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -681,6 +681,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); @@ -692,11 +693,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 }); }, //流程提交事件 @@ -723,6 +724,7 @@ export default { this.$refs["roleForm"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true; this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -755,8 +757,12 @@ export default { } this.$router.push("/processCenter"); } + this.saveLoading = false this.isSubmit = false; }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index c967540c8..a1e70fd5e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -293,8 +293,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.bzFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue index b96666714..4b2b60bfe 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue @@ -292,8 +292,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @submit="handleSubmit" @transfer="handleTransfer" @@ -358,14 +358,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -374,6 +373,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue index 10d134bd6..8c55b76ae 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue @@ -293,7 +293,7 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" + :isSubmitBack="isSubmit" :saveLoading="saveLoading" :approval="true" @back="beforeBack" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.dlFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue index e07c3d73f..8d0dc93ef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue @@ -196,8 +196,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -260,14 +260,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -276,6 +275,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -367,6 +368,7 @@ export default { this.listForm.BZFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -378,6 +380,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 18180843a..2953f322e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -207,7 +207,6 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -290,14 +289,14 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -306,6 +305,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -428,6 +430,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -437,12 +440,12 @@ export default { commentText: this.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 + }) }, //提交事件 handleSubmit() { @@ -450,6 +453,7 @@ export default { this.$message.warning("请选择架构经理"); } else { this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -464,6 +468,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue index 7a6509841..784589888 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue @@ -215,7 +215,6 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -299,14 +298,14 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -315,6 +314,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -431,6 +433,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -440,12 +443,12 @@ export default { commentText: this.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 + }) }, //提交事件 handleSubmit() { @@ -457,6 +460,7 @@ export default { }); if (this.peopleFlag === true) { this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -471,6 +475,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index b31834a2e..d586d6d6f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -131,7 +131,7 @@ 流程列表加载中 - @@ -209,14 +209,14 @@ export default { methods: { //确认转办 checkedTransferRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -225,7 +225,10 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; + }) }, // 请求转换流程图 processNum(row) { @@ -373,6 +376,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -385,8 +389,9 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { this.saveLoading = false; + this.isSubmit = false; }); }, //提交事件 @@ -401,6 +406,7 @@ export default { dataListChildren = dataListChildren.concat(item); }); this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; this.listForm.children = dataListChildren; this.listForm.dataList = this.dataList; @@ -419,6 +425,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); // }else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 1f0269507..9e586f876 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -321,7 +321,6 @@ :show-submit="submitShow" :show-confirm="acceptShow" :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @save="handleSave" @transfer="handleTransfer" @@ -518,14 +517,14 @@ export default { methods: { //确认转办 checkedTransferRole(data) { - this.assigneeNewLoading = true; + this.saveLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false; if (res.success) { this.drawerModal = false; this.$message.success("调整成功"); @@ -534,6 +533,9 @@ export default { } else { this.$message.warning(res.message); } + }).finally(() => { + this.saveLoading = false; + this.isSubmit = false; }); }, // 请求转换流程图 @@ -764,6 +766,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "6"); @@ -773,16 +776,17 @@ 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; }); }, // 接受按钮 handleAccept() { this.isSubmit = true; + this.saveLoading = true; execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -790,6 +794,8 @@ export default { this.$message.success("接收成功"); this.$router.push("/processCenter"); } + }).finally(() => { + this.saveLoading = false; this.isSubmit = false; }); }, @@ -824,6 +830,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); this.$http.post("lawss/activiti/completeTask", { @@ -838,6 +845,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue index 586efd7db..c2a2af9cb 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue @@ -251,8 +251,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -318,14 +318,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -334,6 +333,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -451,6 +452,7 @@ export default { this.listForm.ffFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -462,6 +464,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue index 99393bbe3..b614a6f45 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue @@ -291,8 +291,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -358,14 +358,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -374,6 +373,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -514,6 +515,7 @@ export default { this.listForm.jgFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -525,6 +527,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue index 5ec19a0c2..9c25ac827 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue @@ -293,8 +293,8 @@ show-transfer show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -360,14 +360,13 @@ export default { methods: { //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -376,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 @@ -516,6 +517,7 @@ export default { this.listForm.gcFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -527,6 +529,7 @@ export default { this.$message.success(res.message); this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue index 60c2fb5d0..76431297e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue @@ -876,7 +876,7 @@ export default { managementHostName: "", //管理主体 developmentHostName: "", //开发主体 categoryName: "", //项目细分类 - carType: "" + carType: "" }, qdform: { projectId:"", @@ -1381,6 +1381,7 @@ export default { this.$refs["Form"].validate((valid) => { if (valid) { this.isSubmit = true; + this.saveLoading = true this.$http.post("lawss/activiti/startProcessRollBack", { createUser: this.$store.getters.userInfo.userId, createUserName: this.$store.getters.userInfo.userName, @@ -1415,7 +1416,11 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false }); + } else { + this.saveLoading = false + this.isSubmit = false } }); } else { @@ -1430,6 +1435,7 @@ export default { //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -1443,11 +1449,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; }); }, // 将文本状态的id与name对应 diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 546fb5a7d..257b9ccef 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -635,7 +635,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -781,14 +780,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -797,6 +796,9 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -914,6 +916,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -921,12 +924,15 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -940,7 +946,8 @@ export default { this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { + }).finally(() => { + this.isSubmit = false; this.saveLoading = false; }); }, @@ -952,6 +959,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -967,6 +975,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 49293f16c..2cd812b9c 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -635,7 +635,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -781,14 +780,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -797,7 +796,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -913,6 +915,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -920,12 +923,15 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -936,11 +942,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; }); }, //提交事件 @@ -951,6 +957,7 @@ export default { } }) this.isSubmit = true; + this.saveLoading = true; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -966,6 +973,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue index 069bb9633..a30fb2d80 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -627,7 +627,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -774,14 +773,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -790,7 +789,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -907,6 +909,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -914,7 +917,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false + this.isSubmit = false; + this.saveLoading = false; }) }, //提交事件 @@ -928,6 +932,8 @@ export default { this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); + this.isSubmit = true + this.saveLoading = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -940,6 +946,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index ce30b3e23..6fd13a8df 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -627,7 +627,6 @@ show-transfer show-affirm :submitLoading="isSubmit" - :transfer-loading="isTransfer" :saveLoading="saveLoading" @submit="handleSubmit" @transfer="handleTransfer" @@ -772,14 +771,14 @@ export default { }, //确认转办 checkedTransferRole (data) { - this.assigneeNewLoading = true + this.isSubmit = true + this.saveLoading = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 userId: this.$store.getters.userInfo.userId, // 委托人 pId: this.$route.query.prcId // 流程实例 }).then(res => { - this.isTransfer = false if (res.success) { this.drawerModal = false this.$message.success('调整成功') @@ -788,7 +787,10 @@ export default { } else { this.$message.warning(res.message) } - }) + }).finally(() => { + this.isSubmit = false; + this.saveLoading = false; + }); }, // 请求转换流程图 processNum (row) { @@ -904,6 +906,7 @@ export default { // 接受按钮 handleAccept(){ this.isSubmit = true + this.saveLoading = true execTask({ todoId: this.todoId // 当前节点ID }).then(res => { @@ -911,7 +914,8 @@ export default { this.$message.success('接收成功') this.$router.push('/processCenter') } - this.isSubmit = false + this.isSubmit = false; + this.saveLoading = false; }) }, //提交事件 @@ -921,7 +925,8 @@ export default { this.$set(item, 'standId', item.id) } }) - this.isSubmit = true; + this.isSubmit = true + this.saveLoading = true this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList const json = JSON.stringify(this.qdform); @@ -937,6 +942,7 @@ export default { this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }, e => { }); }, diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue index 1a7a6b43a..0ec495e42 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step2.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue @@ -166,6 +166,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -182,6 +184,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -238,6 +243,7 @@ }, handleSave() { this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -245,16 +251,17 @@ commentText2: this.commentText2, })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') - }).catch(e => { + }).finally(() => { this.saveLoading = false + this.isSubmit = false }) }, handleSubmit() { this.$refs['qbkwForm'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true var json = this.json json.commentText = this.commentText2 json.responUserList = this.form.responUserList @@ -271,6 +278,7 @@ // this.$router.push('/processCenter') } this.isSubmit = false + this.saveLoading = false }) } else { return this.$message.warning('请完善基础信息') diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index 21aafa67a..e0015b33d 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -94,7 +94,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue index c08548834..6645dc5e2 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step6.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue @@ -103,7 +103,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -200,6 +201,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -216,6 +218,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue index 7f2548749..9ff559a7c 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step7.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue @@ -94,7 +94,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -158,6 +159,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -174,6 +176,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue index 85b60740f..4b77cb7c6 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step8.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue @@ -94,7 +94,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -158,6 +159,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -174,6 +176,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue index fe604e66f..c81afb3b8 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step9.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue @@ -119,7 +119,8 @@ approval @back="handleSubmitNo" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" show-transfer @transfer="handleTransfer" @submit="handleSubmit" @@ -185,6 +186,7 @@ this.drawerModal = true }, checkedRole (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -201,6 +203,8 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 053561ac1..33d486c99 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -104,7 +104,7 @@ show-back backBTNTexts="不涉及" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -207,7 +207,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -219,8 +219,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -249,8 +250,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue index 5c497784c..9260c9ccb 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue @@ -108,7 +108,7 @@ show-submit show-back :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -203,7 +203,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -215,8 +215,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -245,8 +246,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue index 981300b92..69641d365 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue @@ -110,7 +110,7 @@ v-if="taskInfo !== '标准法规工程师修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -253,7 +253,7 @@ export default { } this.$refs['ch_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -265,8 +265,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -307,8 +308,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue index 1dd910e18..2322ef2dd 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue @@ -126,7 +126,7 @@ show-back show-submit :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" /> @@ -276,7 +276,7 @@ export default { } this.$refs['hh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -288,8 +288,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) }, @@ -314,8 +315,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue index a63b906b9..2c0d928df 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue @@ -107,7 +107,7 @@ show-submit show-back backBTNTexts="不涉及" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -231,7 +231,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -243,8 +243,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -272,8 +273,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue index fc6b3373c..9a5dc14e1 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue @@ -121,7 +121,7 @@ show-back backBTNTexts="驳回" :submitLoading="isSubmit" - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" > @@ -244,7 +244,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -256,8 +256,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -287,8 +288,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) }, diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index 1a12b4245..2a90d914c 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -128,7 +128,7 @@ v-if="taskInfo !== '标准法规工程师汇总修订完毕'" show-submit show-back - :isSubmitBack="isBack" + :isSubmitBack="isSubmit" :submitLoading="isSubmit" @back="handleSubmitNo" @submit="handleSubmit" @@ -262,7 +262,7 @@ export default { } this.$refs['rh_pageData'].validate((valid) => { if (valid) { - this.isBack = true + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -274,8 +274,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isBack = false - }); + }).finally(() => { + this.isSubmit = false + }) } }) } @@ -311,8 +312,9 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + }).finally(() => { this.isSubmit = false - }); + }) } }) } diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index a8009b090..b9d425084 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -228,7 +228,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index d3ed35a30..fc5853aed 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -238,7 +238,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index c60efa2d1..2454f48be 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -226,7 +226,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step2.vue index c13037dcf..a108ca491 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step2.vue @@ -91,9 +91,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -265,6 +265,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -280,6 +281,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue index a6abe59be..9df3c3075 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -190,9 +190,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -371,6 +371,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -386,6 +387,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue index 4d75ef018..442da506c 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -201,9 +201,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzpg/step8.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue index 22c9333b8..b9ec63ac6 100644 --- a/src/pages/processCenter/pages/phone/bzpg/step8.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -201,9 +201,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue index 5fcf12276..0ca57fa35 100644 --- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue @@ -133,9 +133,9 @@ show-back show-submit show-transfer - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -265,6 +265,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -280,6 +281,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index 5d3975319..369397290 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -424,7 +424,7 @@ show-submit2 show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @transfer="handleTransfer" @submit2="handle2" @over2="handle1" @@ -661,6 +661,7 @@ export default { }, checkedRole(data) { this.assigneeNewLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId: this.$store.getters.userInfo.account, // 委托人 @@ -679,6 +680,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) }, downloadFileNew(attId) { diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 0de7ecd04..349182a79 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -170,6 +170,8 @@ this.drawerModal = true }, checkedRole (data) { + this.saveLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id userId:this.$store.getters.userInfo.account, // 委托人 @@ -186,6 +188,9 @@ } else { this.$message.warning(res.message) } + }).finally(() => { + this.saveLoading = false + this.isSubmit = false }) }, // 请求转换流程图 @@ -241,6 +246,7 @@ //保存事件 handleSave() { this.saveLoading = true; + this.isSubmit = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("prcType", "3"); @@ -250,17 +256,18 @@ 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; @@ -281,6 +288,7 @@ // this.$router.push("/processCenter"); } this.isSubmit = false; + this.saveLoading = false; }); } else { return this.$message.warning("请完善基础信息"); diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue index 18c5368d2..2b4ff8d52 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue @@ -147,7 +147,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -350,6 +354,7 @@ var json = this.json json.spFlag = '1' json.commentText = this.commentText41 + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -361,6 +366,7 @@ this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue index 40e61ddc1..3abb3fd25 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue @@ -134,7 +134,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -333,6 +337,7 @@ var json = this.json json.bzFlag = '1' json.commentText = this.commentText42 + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -344,6 +349,7 @@ this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index b8054799e..9faf5105c 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -169,7 +169,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue index a75ac4ef8..8f9d6c5f6 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue index e2af85e1d..dce586d69 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue index 9085f23bd..bebe87436 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue @@ -159,7 +159,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue index 84ea640c3..aff4ca1f4 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step2.vue @@ -75,7 +75,7 @@ show-save show-submit :submitLoading="isSubmit" - :saveLoading="saveLoading" + :saveLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue index ee91cc91d..e4e480aa7 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step4.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue index d002c4a37..2490fcaa6 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step5.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue index 45c13d9d5..c6415f46a 100644 --- a/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue +++ b/src/pages/processCenter/pages/phone/cywbbzzxd/step6.vue @@ -172,8 +172,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -324,6 +324,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -346,7 +347,6 @@ export default { } }, handleSubmit() { - this.isSubmit = true; if (this.participantsData.length < 1) { this.$message.warning("项目信息不能为空"); } else { @@ -363,6 +363,7 @@ export default { }; this.$refs["wbbzForm"].validate((valid) => { if (valid) { + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.$route.query.taskIds, userId: this.$store.getters.userInfo.account, @@ -395,6 +396,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -410,6 +412,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue index caa38853a..3d3c17f27 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue @@ -213,8 +213,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -478,6 +478,7 @@ export default { this.roleTransfer = data; this.phoneRoleList = this.roleTransfer; this.turnLoading = true; + this.isSubmit = true; changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -493,7 +494,9 @@ export default { } else { this.$message.warning(res.message); } - }); + }).finally(() => { + this.isSubmit = false + }) this.modalshowflag = false; }, //流程提交 diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue index cedaeed14..0f68accbf 100644 --- a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue +++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue @@ -213,8 +213,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -464,6 +464,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -479,6 +480,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue index 39537283d..86a0ced25 100644 --- a/src/pages/processCenter/pages/phone/qbfs/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -562,6 +562,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.account) @@ -572,11 +573,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 }) }, processEditFile(id) { @@ -615,13 +616,16 @@ export default { return res }) } - this.submitLoading = false // hwh5.close() this.$router.go(-2) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { + this.submitLoading = false this.isSubmit = false } + }).catch(() => { + this.submitLoading = false + this.isSubmit = false }) }, async routerBussProStand(){ @@ -651,10 +655,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 }) }, //流程提交 @@ -674,8 +679,10 @@ export default { _this: this }, res => { if (res.success) { - this.isSubmit = false this.processCreateFsBuss(json) + } else { + this.isSubmit = false + this.saveLoading = false } }, e => { }); diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue index 1877c55c2..f4b4d02e9 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step2.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -53,9 +53,9 @@ show-back show-transfer show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -241,6 +241,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -256,6 +257,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue index d06996a92..d4ab4ba2d 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -300,6 +300,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -315,6 +316,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue index ddc59c752..730179d61 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step6.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -294,6 +294,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -309,6 +310,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue index 4bf9be0b3..50df76c28 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step7.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue @@ -91,9 +91,9 @@ show-transfer show-submit show-back - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -300,6 +300,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -315,6 +316,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue index 895f2f6a6..d18a4faa4 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue index c5589eef6..33c2550ce 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue index 4b6506d62..8f3f9490e 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -1914,6 +1914,7 @@ export default { 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); @@ -1932,7 +1933,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1940,6 +1940,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue index bb043f408..e4bee7381 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue @@ -2024,8 +2024,6 @@ export default { if (res.success) { this.$message.success(res.message) // 流程提交之后,应该流转至待办任务页面 - this.isSubmit = false - this.saveLoading = false // hwh5.close() this.$router.go(-2) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) @@ -2040,6 +2038,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) } diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue index c0722663f..d6cfee5d4 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue @@ -1916,6 +1916,7 @@ export default { 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); @@ -1934,7 +1935,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1942,6 +1942,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step10.vue b/src/pages/processCenter/pages/phone/qbrk/step10.vue index 7fa1f61ab..afc38827d 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step10.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step10.vue @@ -1915,6 +1915,7 @@ export default { 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); @@ -1932,7 +1933,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1940,6 +1940,8 @@ export default { }else { this.$message.success(res.message) } + this.saveLoading = false + this.isSubmit = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step11.vue b/src/pages/processCenter/pages/phone/qbrk/step11.vue index 99e07308c..a7e02c8ad 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step11.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step11.vue @@ -1914,6 +1914,7 @@ export default { 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); @@ -1931,7 +1932,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1939,6 +1939,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step4.vue b/src/pages/processCenter/pages/phone/qbrk/step4.vue index 2bdc8f54e..ae823c05d 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step4.vue @@ -2260,6 +2260,7 @@ export default { 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); @@ -2278,7 +2279,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -2286,6 +2286,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbrk/step8.vue b/src/pages/processCenter/pages/phone/qbrk/step8.vue index 61547c122..d101fae88 100644 --- a/src/pages/processCenter/pages/phone/qbrk/step8.vue +++ b/src/pages/processCenter/pages/phone/qbrk/step8.vue @@ -1970,8 +1970,6 @@ export default { this.$message.success(res.message) // this.processCreateLaws(json) } - this.isSubmit = false - this.saveLoading = false // hwh5.close() this.$router.go(-2) // 流程提交之后,应该流转至待办任务页面 @@ -1979,6 +1977,8 @@ export default { }else { this.$message.success(res.message) } + this.isSubmit = false + this.saveLoading = false }) }}) }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue index f8bcad178..dda47e964 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step2.vue @@ -85,8 +85,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -246,6 +246,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -261,6 +262,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue index e1082b62f..3f0253cc3 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue @@ -85,8 +85,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -246,6 +246,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -261,6 +262,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue index 3c34180a3..531bbe459 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue @@ -85,8 +85,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -245,6 +245,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -260,6 +261,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue index f313f6a39..5889aa049 100644 --- a/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue @@ -85,8 +85,8 @@ show-back show-submit :submitLoading="isSubmit" - :transfer-loading="isTransfer" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @back="beforeBack" @transfer="handleTransfer" @@ -245,6 +245,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -260,6 +261,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wbsm/step3.vue b/src/pages/processCenter/pages/phone/wbsm/step3.vue index d4b35a331..35138ef03 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step3.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step3.vue @@ -74,9 +74,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -275,7 +275,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -284,11 +284,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -330,6 +329,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -343,6 +343,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -358,6 +359,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -373,6 +375,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wbsm/step4.vue b/src/pages/processCenter/pages/phone/wbsm/step4.vue index 090206f95..458c4b837 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step4.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step4.vue @@ -80,9 +80,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -281,7 +281,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -290,11 +290,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -336,6 +335,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -349,6 +349,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -364,6 +365,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -379,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wbsm/step5.vue b/src/pages/processCenter/pages/phone/wbsm/step5.vue index 326a4ce0a..9b610cba9 100644 --- a/src/pages/processCenter/pages/phone/wbsm/step5.vue +++ b/src/pages/processCenter/pages/phone/wbsm/step5.vue @@ -80,9 +80,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -281,7 +281,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -290,11 +290,10 @@ export default { commentText: this.commentText })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -336,6 +335,7 @@ export default { roleForm: this.roleForm } var json = JSON.stringify(son) + this.isSubmit = true this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -349,6 +349,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false }, e => { }); } @@ -364,6 +365,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -379,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue index 7b4d2c330..322fa32c4 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step2.vue @@ -92,8 +92,8 @@ show-back show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :saveLoading="isSubmit" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -250,7 +250,7 @@ export default { }, // 保存按钮 handleSave() { - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -259,11 +259,10 @@ export default { commentInfo: this.commentInfo })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, //驳回按钮 @@ -294,6 +293,7 @@ export default { passFlag: '1', commentText: this.commentInfo } + this.isSubmit = true const params = new FormData(); params.set('json', JSON.stringify(json)) params.set('userId', this.$store.getters.userInfo.account) @@ -305,8 +305,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) } @@ -358,7 +357,7 @@ export default { // this.$router.push("/processCenter"); } this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) }, @@ -366,6 +365,7 @@ export default { drawerCheck (data) { if (this.drawerTitle === '转办处理人') { this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -381,6 +381,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { if (data.length > 0) { diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue index 39a53ca52..6d10c2b81 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step3.vue @@ -95,8 +95,8 @@ show-submit show-transfer :submitLoading="isSubmit" - :saveLoading="saveLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" @transfer="handleTurnTo" @save="handleSave" @submit="handleSubmit" @@ -272,7 +272,7 @@ export default { for(let item of zqa) { list.push(item[1]) } - this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('taskIds', this.taskIds) _formData.append('json', JSON.stringify({ @@ -281,11 +281,10 @@ export default { textarea: this.textarea })) saveTaskForPub(_formData).then(res => { - this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result - }).catch(e => { - this.saveLoading = false + }).finally(() => { + this.isSubmit = false }) }, // 提交按钮 @@ -334,8 +333,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } - this.isSubmit = false - }).catch(e => { + }).finally(() => { this.isSubmit = false }) }, @@ -343,6 +341,7 @@ export default { phoneSumit (data) { if (this.roleTitle === '转办处理人') { this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -360,6 +359,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) } else { if (data.length > 0) { diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue index 3b4e12028..d63d615b0 100644 --- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue @@ -73,8 +73,7 @@ show-transfer @back="handleSubmitNo" :submitLoading="isSubmit" - :isSubmitBack="backLoading" - :transferLoading="turnLoading" + :isSubmitBack="isSubmit" @transfer="handleTurnTo" @submit="handleSubmit" submitBTNText="同意" @@ -242,6 +241,7 @@ export default { }, // 转办选人框 phoneSumit (data) { + this.isSubmit = true changeAssigneeNew({ taskId: this.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -257,6 +257,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) // this.showPage = false }, @@ -268,6 +270,7 @@ export default { actionFlag: 1, commentText: this.commentText } + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -280,6 +283,7 @@ export default { // this.$router.push('/processCenter') this.backLoading = false } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/xmpg/step4.vue b/src/pages/processCenter/pages/phone/xmpg/step4.vue index 32532ee04..b490c801c 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step4.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step4.vue @@ -180,9 +180,9 @@ show-back show-submit show-transfer - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -316,6 +316,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -331,6 +332,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -471,6 +474,7 @@ export default { this.listForm.passFlag = "1"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -484,6 +488,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/phone/xmpg/step5.vue b/src/pages/processCenter/pages/phone/xmpg/step5.vue index efb87a427..1964ac11f 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step5.vue +++ b/src/pages/processCenter/pages/phone/xmpg/step5.vue @@ -179,9 +179,9 @@ { + this.isSubmit = false }) this.modalshowflag = false }, @@ -469,6 +472,7 @@ export default { this.listForm.dlFlag = "2"; this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -482,6 +486,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue index 5c5785514..ff8336f4e 100644 --- a/src/pages/processCenter/pages/phone/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/phone/xmqdqr/step5.vue @@ -196,9 +196,9 @@ show-transfer show-back show-submit - :transfer-loading="isTransfer" :submitLoading="isSubmit" - :saveLoading="saveLoading" + :isSubmitBack="isSubmit" + :saveLoading="isSubmit" :approval="true" @transfer="handleTransfer" @back="beforeBack" @@ -369,6 +369,7 @@ export default { this.roleTransfer = data this.phoneRoleList = this.roleTransfer this.turnLoading = true + this.isSubmit = true changeAssigneeNew({ taskId: this.$route.query.taskIds, // 任务id assignee: data[0].id, // 被委托人 @@ -384,6 +385,8 @@ export default { } else { this.$message.warning(res.message) } + }).finally(() => { + this.isSubmit = false }) this.modalshowflag = false }, @@ -516,7 +519,7 @@ export default { }, //保存事件 handleSave() { - this.saveLoading = true; + this.isSubmit = true; let _formData = new FormData(); this.qdform.dataList = this.dataList _formData.append("id", this.bpnId || ""); @@ -527,12 +530,11 @@ export default { commentText: this.commentText })); saveTaskForPub(_formData).then(res => { - this.saveLoading = false; this.$message.success("保存成功"); this.bpnId = res.result; - }).catch(e => { - this.saveLoading = false; - }); + }).finally(() => { + this.isSubmit = false + }) }, handleRemark(){ this.dataList.map(item => { @@ -549,6 +551,7 @@ export default { this.qdform.passFlag = "1"; this.qdform.commentText = this.commentText; const json = JSON.stringify(this.qdform); + this.isSubmit = true; this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, userId: this.userId, @@ -562,6 +565,7 @@ export default { this.$router.go(-2) // this.$router.push("/processCenter"); } + this.isSubmit = false; }, e => { }); } diff --git a/src/pages/processCenter/pages/phone/zczqyj/step4.vue b/src/pages/processCenter/pages/phone/zczqyj/step4.vue index 47f59da57..eea7ac717 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step4.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step4.vue @@ -133,7 +133,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 @@ -285,6 +289,7 @@ export default { //这个就是原来的actionFlag,用来表示流程是驳回还是同意 json.actionFlag = 1 json.commentText = this.commentText + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -296,6 +301,7 @@ export default { this.$router.go(-2) // this.$router.push('/processCenter') } + this.isSubmit = false }) } else { this.$message.warning('请输入反馈意见') diff --git a/src/pages/processCenter/pages/phone/zczqyj/step5.vue b/src/pages/processCenter/pages/phone/zczqyj/step5.vue index 3def4a3f4..ec07bc303 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step5.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step5.vue @@ -207,7 +207,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step6.vue b/src/pages/processCenter/pages/phone/zczqyj/step6.vue index 309620d97..7fb8e9da8 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step6.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step7.vue b/src/pages/processCenter/pages/phone/zczqyj/step7.vue index 9b81e5b34..4090c36de 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step7.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step7.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step8.vue b/src/pages/processCenter/pages/phone/zczqyj/step8.vue index 87163a7ad..fa39b6103 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step8.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step8.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/processCenter/pages/phone/zczqyj/step9.vue b/src/pages/processCenter/pages/phone/zczqyj/step9.vue index 3f613cbbd..acb0ea311 100644 --- a/src/pages/processCenter/pages/phone/zczqyj/step9.vue +++ b/src/pages/processCenter/pages/phone/zczqyj/step9.vue @@ -141,7 +141,8 @@ { + this.isSubmit = false }) }, // 请求转换流程图 diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index 3b90f4534..af6ac475f 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -178,6 +178,9 @@ width="55" label="序号" align="center"> + + {{ ($index + 1) + (dataCenterSearch.page - 1) * dataCenterSearch.pageSize }} + { if (res.ok) { - this.selectMenuListNew() + // this.selectMenuListNew() + this.getTreeAsync() this.productModal = false this.productModelAdd = { // 模态框信息 @@ -3052,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 = { // 模态框信息 @@ -3126,7 +3128,7 @@ export default { }, selectMenu2(res,json) { return new Promise((resolve, reject) => { - this.$http.get('lawss/sarMenuStandardLimit/getListStandLimit', {dicId:'9m4qqqaansxmox5e82zm'}, { + this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, { _this: this }, res => { const history = res; @@ -3210,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/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index d13763ea2..9cdd34a2a 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -100,6 +100,15 @@ align="center" width="55"> + + + {{ ($index + 1) + (form.page - 1) * form.pageSize }} + +