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 71ce2c5a5..f1796f4fc 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 0455a912e..18967588d 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 7604ffa9b..79851b502 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 19c1c5247..424b604ed 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 cbabe8a33..25de6aa29 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 01e72b4db..b2e2d7959 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 4a05173a9..04d10cf87 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 27e6f984d..e56609c13 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 ac9963081..c5d46507f 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 91c3f5d74..e94efd3f0 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 62ec888ca..63b5d6a6a 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 0866b7979..e110cb0c3 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 1a583571d..6d2f267de 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 c9a4fe6c2..d56321a69 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 2d03578f6..5b47bb21e 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 8466f755f..3bfa026c4 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 add1315c9..1ef81fa52 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 f6fd4971f..da752ab5e 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 bb3b4bd9b..23da0993b 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 7310b5f2d..4eb1e46b3 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 898cad8f7..342ec39c8 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 37ac1e362..4c05f37c6 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 c29d61510..c27a7daec 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 11a4befaa..42bd290aa 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 8cababb40..8bca1a075 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 51fc6a081..4a99f6464 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 60347236d..f340831f6 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 9cf1520bb..b42a2208a 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 e9aa8c21b..c1332ff08 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 889804e20..9ca82fa39 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 d8176254a..ab29a469b 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 0c7be036c..64ffbeaec 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 2633a1551..cd1fa0f2e 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 6f3f3d862..cc7e4b604 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 34790a035..c23a749d7 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 b2b9c9e9f..189a50bed 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/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 c9ca3a08b..a59d3732a 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 dc940fcd6..90124e5fc 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 8d06df2c1..bfd2e493f 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 dd03a2f2a..3bb5f3f61 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 05ee6e34a..49523d86f 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 0f23a679e..5eb757811 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 7a9aef656..9f40f9f2c 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/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 787d794c7..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=[] diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index acdb793c0..51b38e036 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -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']) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index 3757bc3fb..b42d734f8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -1122,7 +1122,7 @@ export default { 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 //对象的深度验证 diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index cd994c8cb..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) } }, @@ -3444,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" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 5645d3763..a5a5ea2cb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -3471,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/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 10bad6f83..95379faa6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2786,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/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index faf3695dd..80cd087f3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2772,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"; 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 efc1fdaa5..f034f4c1c 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 e7f4643f3..e9b9773f2 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 08df9f657..39a4eeead 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 22b582b93..b4a45ac98 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 42ad31db3..278602b68 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 8aa6591fc..63ed005a5 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 7b5cc534c..c6a2b0342 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 a016e1e26..2a356bf76 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 0aec6a122..398c476d7 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 8dcad4a34..601d77021 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 9220ff056..fd3110d03 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 a81be10d7..f753e895a 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 23969e05c..412867b74 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 33fcea93a..f3f484f13 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 b56a98477..3c7147b9f 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 bdc7d7358..c710a40ef 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 e27b15d3c..164508e40 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 f8c32626c..26c6892d3 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 78ccb5915..27f106a79 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 05f0d4e29..1860d528a 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 63252848a..ec4faea10 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 fb4157a59..8b5b71cfb 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 fdb764220..5ae0d65f4 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 ccae07d4e..31469971b 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 a93a22e8d..54f64fda1 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 d69a8e1c3..2758ff464 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 32dc298cd..0263c0dcd 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 a5fd98b67..951bf0dbf 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 574a75065..a86d0a088 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 5c72a6682..52394faca 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 1f4fb5d30..13e8a7cfa 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 fe9b5bcce..36f445c4d 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 54996611a..31c187f64 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 efe3046a9..e5dbc16c9 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 eccadfa1f..d2780f0db 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 ae49dc117..886e1c04e 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 44200a88d..6184af6f0 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 5ec5af1c6..745d227a1 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 3b0f7a6e1..b37bcb1ff 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 }} + { - this.$http.get('lawss/sarMenuStandardLimit/getListStandLimit', {dicId:'9m4qqqaansxmox5e82zm'}, { + this.$http.get('lawss/sarMenuStandard/getListStand', {dicId:'9m4qqqaansxmox5e82zm'}, { _this: this }, res => { const history = res; diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index e1f135847..480b0824d 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 }} + +