From 3a4b0954a5199a27caf0432cdd1fa520898b2730 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Mon, 6 Dec 2021 16:57:33 +0800 Subject: [PATCH] feat: There is no way the, BUSS PROCESS --- src/api/businessApi.js | 14 ++ .../pages/creatProcess/qbrk/step1.vue | 2 +- .../pages/creatProcess/qbrk/step10.vue | 18 +- .../pages/creatProcess/qbrk/step11.vue | 18 +- .../pages/creatProcess/qbrk/step12.vue | 4 +- .../pages/creatProcess/qbrk/step2.vue | 24 ++- .../pages/creatProcess/qbrk/step3.vue | 25 ++- .../pages/creatProcess/qbrk/step4.vue | 19 +- .../pages/creatProcess/qbrk/step5.vue | 185 ++++++++++++++++-- .../pages/creatProcess/qbrk/step6.vue | 10 +- .../pages/creatProcess/qbrk/step7.vue | 5 +- .../pages/creatProcess/qbrk/step8.vue | 18 +- .../pages/creatProcess/qbrk/step9.vue | 18 +- .../pages/creatProcess/qbrk/stepC3.vue | 2 +- .../pages/creatProcess/qbrk/stepC6.vue | 2 +- .../pages/creatProcess/qbrk/stepDetail.vue | 2 +- .../tabComponents/processCenter/index.vue | 24 +-- .../tabComponents/taskDraft/index.vue | 145 ++++++++++++++ 18 files changed, 433 insertions(+), 102 deletions(-) create mode 100644 src/api/businessApi.js diff --git a/src/api/businessApi.js b/src/api/businessApi.js new file mode 100644 index 000000000..ea47c1ba3 --- /dev/null +++ b/src/api/businessApi.js @@ -0,0 +1,14 @@ +/** + * @description: 业务相关API接口 + */ + +import axios from '@/common/axiosV2' + +// 企标评价-获取评价指标 +export function getEvaluationIndex (data) { + return axios({ + url: '/api/sarEnterpriseStandardEvaluation/evaluation-index/getEvaluationIndex', + method: 'get', + params: data + }) +} diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 994fa5ce4..836f564c2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2622,7 +2622,7 @@ this.fileInfoHandle() this.isSubmit = true this.form.country=this.countryArr; - this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) + this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X' var json = Object.assign(this.form, this.roleForm) json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 0a9274da0..0c47fa2e3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -2516,17 +2516,15 @@ _this: this }, res => { if (res.success) { - this.$message.success(res.message) + if(this.formTongGuo.approvalOpinion === '1'){ + this.$message.warning("驳回成功") + }else{ + this.$message.success(res.message) + // this.processCreateLaws(json) + } + this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } }else { this.$message.success(res.message) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 9635ea314..d4fa6f320 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -2516,17 +2516,15 @@ _this: this }, res => { if (res.success) { - this.$message.success(res.message) + if(this.formTongGuo.approvalOpinion === '1'){ + this.$message.warning("驳回成功") + }else{ + this.$message.success(res.message) + // this.processCreateLaws(json) + } + this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } }else { this.$message.success(res.message) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index acae858f6..f8aec76ed 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -456,6 +456,7 @@ show-save show-submit :saveLoading="saveLoading" + :submitLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > @@ -2473,6 +2474,7 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 + this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index 1acc953ba..10f5c2ac7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -455,6 +455,7 @@ v-show="verifySarStandard" show-save show-submit + :submitLoading="isSubmit" :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" @@ -872,6 +873,7 @@ } }] }, + taskInfo:'', loading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, @@ -1526,6 +1528,11 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -2331,16 +2338,10 @@ // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', 'laws1') - _formData.append('prcName', '政策入库流程') + _formData.append('prcType', 'buss1') + _formData.append('prcName', '企标制修订流程及企业标准库流程') _formData.append('json', JSON.stringify({ - // prcForm: this.prcForm, - // sarAccessInfoList: this.sarAccessInfoList, - // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - // bzqdForm: this.bzqdForm, - // listInfo: this.listInfo, - // id: this.id - taskInfo: '申请人发起', + taskInfo: this.taskInfo, form: this.form, roleForm: this.roleForm, commentText: this.commentText @@ -2460,6 +2461,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion const json = JSON.stringify(this.form); @@ -2473,6 +2475,7 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 + this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2541,6 +2544,7 @@ pId: this.pId }).then(res => { if (res) { + this.taskInfo = res.taskInfo const processForm = JSON.parse(res.mesg) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 567943f56..0e945affb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -456,6 +456,7 @@ show-save show-submit :saveLoading="saveLoading" + :submitLoading="isSubmit" @save="handleSave" @submit="handleSubmit" > @@ -872,6 +873,7 @@ } }] }, + taskInfo:'', loading: false, disabledState: true, userId:this.$store.getters.userInfo.userId, @@ -1526,6 +1528,11 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -2331,16 +2338,10 @@ // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', 'laws1') - _formData.append('prcName', '政策入库流程') + _formData.append('prcType', 'buss1') + _formData.append('prcName', '企标制修订流程及企业标准库流程') _formData.append('json', JSON.stringify({ - // prcForm: this.prcForm, - // sarAccessInfoList: this.sarAccessInfoList, - // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - // bzqdForm: this.bzqdForm, - // listInfo: this.listInfo, - // id: this.id - taskInfo: '申请人发起', + taskInfo: this.taskInfo, form: this.form, roleForm: this.roleForm, commentText: this.commentText @@ -2472,8 +2473,10 @@ }, res => { if (res.success) { this.$message.success(res.message) + this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") // this.isSubmit = false @@ -2541,6 +2544,7 @@ pId: this.pId }).then(res => { if (res) { + this.taskInfo = res.taskInfo const processForm = JSON.parse(res.mesg) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ @@ -2593,6 +2597,7 @@ }, }, mounted () { + this.getTaskId() this.getData() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 860ad47b4..d6468fde7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -2531,17 +2531,16 @@ _this: this }, res => { if (res.success) { - this.$message.success(res.message) + // 流程提交之后，应该流转至待办任务页面 + if(this.formTongGuo.approvalOpinion === '1'){ + this.$message.warning("驳回成功") + }else{ + this.$message.success(res.message) + // this.processCreateLaws(json) + } + this.isSubmit = false // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } }else { this.$message.success(res.message) } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index e44a9097c..81da641c4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2,10 +2,11 @@ - +
-
基础信息
+
会签点评
+
基础信息
审批历史
@@ -18,6 +19,86 @@ label-width="210px" >
+ +
+
@@ -269,7 +350,7 @@
- +
{//循环后端查询出来的数据(orderdata) + if(index === 0){ + spanOneArr.push(1) + }else{ + //name 修改 + if(item.twoIndexTitle === this.form.evaluationData[index - 1].twoIndexTitle){ //第一列需合并相同内容的字段 + spanOneArr[concatOne] += 1 + spanOneArr.push(0) + }else{ + spanOneArr.push(1) + concatOne = index + } + } + }) + return { + one: spanOneArr, + } + }, + objectSpanMethod({ row, column, rowIndex, columnIndex },value) { + if (columnIndex === 0) { + if (rowIndex === 0) { + return { + rowspan: value.length, + colspan: 1 + }; + } else { + return { + rowspan: 0, + colspan: 0 + }; + } + }else if(columnIndex === 1 ) { + const _row = (this.filterData2(this.form.evaluationData).one)[rowIndex] + const _col = _row > 0 ? 1 : 0 + return { + rowspan: _row, + colspan: _col + } + } + }, modelProp(row,index){ console.log(row) console.log(index) @@ -1526,6 +1655,11 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); + this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -2331,16 +2465,10 @@ // _formData.append('id', this.bpnId) _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) - _formData.append('prcType', 'laws1') - _formData.append('prcName', '政策入库流程') + _formData.append('prcType', 'buss1') + _formData.append('prcName', '企标制修订流程及企业标准库流程') _formData.append('json', JSON.stringify({ - // prcForm: this.prcForm, - // sarAccessInfoList: this.sarAccessInfoList, - // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, - // bzqdForm: this.bzqdForm, - // listInfo: this.listInfo, - // id: this.id - taskInfo: '申请人发起', + taskInfo: this.taskInfo, form: this.form, roleForm: this.roleForm, commentText: this.commentText @@ -2462,7 +2590,14 @@ this.isSubmit = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion + const infoList = [] + const info = {} + info.userId = this.userId + info.userName = this.userName + info.commentText = this.formTongGuo.commentText + infoList.push(info) const json = JSON.stringify(this.form); + json.infoList = infoList this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2473,6 +2608,7 @@ if (res.success) { this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 + this.isSubmit = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2533,6 +2669,25 @@ return list; }, + getEvaluation() { + return new Promise((resolve, reject) => { + getEvaluationIndex({ + indexType: 'quality' + }).then(res => { + if (res) { + const evalList = [] + res.data.forEach(item =>{ + item.score = 0 + item.reason = '' + item.userId = this.userId + item.processNode = '' + }) + this.form.evaluationData = res.data + } + }).catch(e => { + }) + }) + }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { @@ -2541,6 +2696,7 @@ pId: this.pId }).then(res => { if (res) { + this.taskInfo = res.taskInfo const processForm = JSON.parse(res.mesg) const dateArr = [] if(processForm.commentCycleStart && processForm.commentCycleEnd){ @@ -2593,6 +2749,8 @@ }, }, mounted () { + this.getTaskId() + this.getEvaluation() this.getData() this.processTable() this.$http.get('sys/dictype/getDicTypeListCode', '', { @@ -2634,6 +2792,9 @@