From 1cc3bfff12f6553b3a1db13b59a0a3ac9de4fc3f Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 27 Jan 2022 22:34:40 +0800 Subject: [PATCH] feat: There is no way the, --- src/api/process.js | 24 + src/pages/home2/components/todoList/index.vue | 24 +- .../pages/components/ProcessFooter.vue | 44 + .../creatProcess/qbrk/common/formEditList.vue | 30 +- .../pages/creatProcess/qbrk/step1.vue | 29 +- .../pages/creatProcess/qbrk/step10.vue | 1 + .../pages/creatProcess/qbrk/step11.vue | 1 + .../pages/creatProcess/qbrk/step12.vue | 1 + .../pages/creatProcess/qbrk/step13.vue | 11 +- .../pages/creatProcess/qbrk/step2.vue | 269 +- .../pages/creatProcess/qbrk/step3.vue | 1 + .../pages/creatProcess/qbrk/step4.vue | 1 + .../pages/creatProcess/qbrk/step5.vue | 4 + .../pages/creatProcess/qbrk/step6.vue | 4 + .../pages/creatProcess/qbrk/step7.vue | 29 +- .../pages/creatProcess/qbrk/step8.vue | 3 +- .../pages/creatProcess/qbrk/step9.vue | 112 +- .../pages/creatProcess/qbrk/stepC1.vue | 2937 +++++++++++++++++ .../pages/creatProcess/qbrk/stepC6.vue | 30 +- .../pages/creatProcess/qbrk/stepDetail.vue | 1 + .../tabComponents/processCenter/index.vue | 24 +- .../tabComponents/taskDraft/index.vue | 14 +- src/router/index.js | 8 + 23 files changed, 3546 insertions(+), 56 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue diff --git a/src/api/process.js b/src/api/process.js index a5ea70a6e..8da9d45c1 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -480,6 +480,30 @@ export function evaluationHisList (data) { }) } +export function evaluationHisListByOne (data) { + return axios({ + url: '/api/lawss/activiti/evaluationHisListByOne', + method: 'get', + params: data + }) +} + +export function evaluationHisListRepSum (data) { + return axios({ + url: '/api/lawss/activiti/evaluationHisListRepSum', + method: 'get', + params: data + }) +} + +export function evaluationHisListRep (data) { + return axios({ + url: '/api/lawss/activiti/evaluationHisListRep', + method: 'get', + params: data + }) +} + export function execTask (data) { return axios({ url: '/api/lawss/activiti/execTask', diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 1e10f3f57..f30255b14 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -120,6 +120,17 @@ export default { prcType: row.prcType } }) + }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){ + this.$router.push({ + name: 'bussLibraryC1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) }else if (row.taskInfo === '标准化员初审'){ this.$router.push({ name: 'bussLibrary4', @@ -186,7 +197,18 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '审核'){ + }else if (row.taskInfo === '起草单位高级经理审核'){ + this.$router.push({ + name: 'bussLibrary8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部高级经理审核'){ this.$router.push({ name: 'bussLibrary9', query: { diff --git a/src/pages/processCenter/pages/components/ProcessFooter.vue b/src/pages/processCenter/pages/components/ProcessFooter.vue index cc93a03d2..eed291aa7 100644 --- a/src/pages/processCenter/pages/components/ProcessFooter.vue +++ b/src/pages/processCenter/pages/components/ProcessFooter.vue @@ -64,6 +64,7 @@ icon="el-icon-s-promotion" @click="handleTransfer" :loading="submitLoading" + :disabled="disabledStatus" v-if="showTransfer" >转办 通过 + +

选择驳回类型 质量问题、其他问题

+
+ 其他问题 + 质量问题 +
+ 驳回 + @@ -108,6 +132,7 @@ size="small" class="common-button-primary" icon="el-icon-check" + :disabled="disabledStatus" @click="handleSubmit" :loading="submitLoading" v-if="showSubmit" @@ -188,6 +213,14 @@ export default { type: Boolean, default: false }, + showOver3: { + type: Boolean, + default: false + }, + visible: { + type: Boolean, + default: false + }, // 是否显示保存按钮 showSave: { type: Boolean, @@ -248,6 +281,11 @@ export default { type: Boolean, default: false }, + // 按钮disabled 是否可用 + disabledStatus: { + type: Boolean, + default: false + }, //转办按钮loading transferLoading: { type: Boolean, @@ -329,6 +367,12 @@ export default { handleOver2() { this.$emit('over2') }, + handleOver3() { + this.$emit('over3') + }, + handleOver4() { + this.$emit('over4') + }, handleSave() { this.$emit('save') }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index 2cc725d16..a5383a5fe 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -17,11 +17,6 @@ > - - - - - + + + + + @@ -86,10 +84,12 @@ clearable > - - + + - - - - - - - - - - + + + +

起草单位高级经理

+
+ +
+ + + -

起草单位高级经理/标准法规部高级经理

+

标准法规部高级经理

- +
@@ -1332,6 +1332,7 @@ commentCycleDate:'', planDisabled:true, form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', @@ -1393,6 +1394,8 @@ standNum:'', }, // 标准信息 roleForm:{ + cfqUserId: this.$store.getters.userInfo.userId, + cfqUserName: this.$store.getters.userInfo.userName, hzUserId: this.$store.getters.userInfo.userId, hzUserName: this.$store.getters.userInfo.userName, xdUserId: this.$store.getters.userInfo.userId, @@ -1451,7 +1454,7 @@ { required: true, message: '选择起草单位高级经理', trigger: 'blur' }, ], bzUserName: [ - { required: true, message: '选择标准法规部高级经理审核', trigger: 'blur' }, + { required: true, message: '选择标准法规部高级经理', trigger: 'blur' }, ], fzrUserName: [ { required: true, message: '选择起草单位中心主任', trigger: 'blur' }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 67ba7de76..02e6e0f97 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -798,6 +798,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue index 6f5dced02..9e832a2c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue @@ -798,6 +798,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index d3479545c..1f750a67b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -807,6 +807,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 0a4007d5b..3cee575ea 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -587,7 +587,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; let Base64 = require('js-base64').Base64; @@ -808,6 +808,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', @@ -2378,6 +2379,14 @@ this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { _this: this }, res => { + if (this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.submitLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue index e5d2ad5f1..8381c1378 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue @@ -5,7 +5,9 @@
-
基础信息
+
历史评分
+
基础信息
+
基础信息
审批历史
@@ -17,7 +19,130 @@ class="label-input-form" label-width="210px" > -
+
+ + +
+
{ + evaluationHisListRep({ + pid: this.pId + }).then(res => { + this.historyData = res + if(this.historyData && this.historyData.length > 0){ + this.form.evaluationData = JSON.parse(this.historyData[0].mesg) + + } + this.$forceUpdate() + }).catch(e => { + }) + }) + }, + evaluationHisListRepSum() { + return new Promise((resolve, reject) => { + evaluationHisListRepSum({ + pid: this.pId + }).then(res => { + this.evaluationMap = res + this.$forceUpdate() + }).catch(e => { + }) + }) + }, + filterData2(){ + let spanOneArr = [] + let concatOne = 0 + this.form.evaluationData.forEach((item,index)=>{//循环后端查询出来的数据(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, + } + }, + setScoreMin(row){ + return row.scoreMin = ((row.score === undefined || row.score === '') ? '' : row.valueType === 'add' ? row.score : (row.score / 10).toFixed(1)) + + }, + getSummaries(param) { + const { columns, data } = param; + const sums = []; + columns.forEach((column, index) => { + if (index === 3) { + sums[index] = '合计：'; + return; + }else if(index === 6){ + sums[index] = ''; + return; + } + const values = data.map(item => Number(item[column.property])); + if (!values.every(value => isNaN(value))) { + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr); + if (!isNaN(value)) { + return prev + curr; + } else { + return prev; + } + }, 0); + sums[index] += ' '; + } else { + sums[index] = ''; + } + if(sums[index] !== '' && sums[index].indexOf(".") !== -1){ + sums[index] = parseFloat(sums[index]).toFixed(1); + } + }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } + return sums; + }, + 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) @@ -1252,6 +1507,7 @@ 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.fileList=this.assemble(this.form.footFile,this.form.footFileName); this.footFileList=this.assemble(this.form.footFile,this.form.footFileName); this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); @@ -2335,6 +2591,9 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.form.evaluationData = [] + this.evaluationHisListRep() + this.evaluationHisListRepSum() }) }, assemble(ids,names){ @@ -2367,6 +2626,7 @@ this.getFormFieldList(processForm) if(processForm.footFile !== undefined && processForm.footFile !== ""){ this.footFileList=this.assemble(processForm.footFile,processForm.footFileName); + this.fileList=this.assemble(processForm.footFile,processForm.footFileName); } this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); @@ -2457,6 +2717,9 @@ /deep/ .el-input__suffix{ display: none !important; } + /deep/ #active1 .el-form-item__content{ + margin-left: 0px !important; + } /deep/ #active2 .el-form-item__content{ margin-left: 0px !important; } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index a3dd414bc..686758f8f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -854,6 +854,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 1360e73fb..4dee872dd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -795,6 +795,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index cae29c68c..ea6ab8778 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1058,6 +1058,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', @@ -1384,6 +1385,9 @@ sums[index] = parseFloat(sums[index]).toFixed(1); } }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } return sums; }, objectSpanMethod({ row, column, rowIndex, columnIndex },value) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index bac5a25b2..b83fd0990 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1087,6 +1087,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', evaluationData:[], planId:'', planStatus:'', @@ -1432,6 +1433,9 @@ sums[index] = parseFloat(sums[index]).toFixed(1); } }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } return sums; }, objectSpanMethod({ row, column, rowIndex, columnIndex },value) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index f0dee8e5e..c20a98774 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -82,7 +82,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -677,7 +677,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -916,6 +916,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', @@ -1240,6 +1241,9 @@ sums[index] = parseFloat(sums[index]).toFixed(1); } }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } return sums; }, objectSpanMethod({ row, column, rowIndex, columnIndex },value) { @@ -2502,7 +2506,11 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.form.evaluationData = [] - this.getEvaluation() + if(this.form.fsRejectStatus === 1){ + this.evaluationHisListByOne() + }else { + this.getEvaluation() + } this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -2518,6 +2526,19 @@ return list; }, + evaluationHisListByOne() { + return new Promise((resolve, reject) => { + evaluationHisListByOne({ + pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审' + }).then(res => { + if (res) { + this.form.evaluationData = JSON.parse(res.mesg) + this.$forceUpdate() + } + }).catch(e => { + }) + }) + }, getEvaluation() { return new Promise((resolve, reject) => { getEvaluationIndex({ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue index d6c9cc7cd..b5e4918bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue @@ -2,7 +2,7 @@ - +
基础信息
@@ -738,6 +738,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index 95493bb7b..b92db31c2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2,7 +2,7 @@ - +
审核评分
@@ -18,8 +18,14 @@ class="label-input-form" label-width="210px" > -
+
@@ -105,7 +114,7 @@ - + @@ -314,15 +323,17 @@ @@ -677,7 +688,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew,evaluationHisListByOne,evaluationHisListRepSum} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -778,6 +789,7 @@ prcNum: this.$route.query.prcNum, prcName: this.$route.query.prcName, detailData: [], + evaluationMap: new Map(), fileList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], @@ -917,6 +929,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', planId:'', planStatus:'', reviseStatus:'', @@ -1189,6 +1202,31 @@ }, }, methods: { + filterTwoTitle(row){ + if(row.twoIndexTitle && row.twoIndexTitle.indexOf("%") === -1 && row.twoIndexTitle !== "创新性" && row.twoIndexTitle !== "经济效益" && row.twoIndexTitle !== "社会效益" ){ + return row.twoIndexTitle + '%' + } + return row.twoIndexTitle + }, + calScope(){ + if(this.evaluationMap){ + const hqSum = this.evaluationMap["会签征求意见"] + const jsWySum = this.evaluationMap["技术委员会评审/评审意见修改评审"] + const fsSum = this.evaluationMap["复审"] + const shSum = this.form.evaluationData && this.form.evaluationData.length > 0 ? this.form.evaluationData[0].sum : 0 + const aveCount = (hqSum ? hqSum * 0.3 : 0) + (jsWySum ? jsWySum * 0.4 : 0) + (fsSum ? fsSum * 0.3 : 0) + (shSum ? shSum * 0.3 : 0) + return parseFloat(aveCount).toFixed(1) + } + return 0 + }, + subFunc(){ + this.form.fsRejectStatus = 2 + this.$refs['form'].validate((valid) => { + if (valid) { + + } + }) + }, filterData2(){ let spanOneArr = [] let concatOne = 0 @@ -1243,6 +1281,9 @@ sums[index] = parseFloat(sums[index]).toFixed(1); } }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } return sums; }, objectSpanMethod({ row, column, rowIndex, columnIndex },value) { @@ -2404,13 +2445,29 @@ this.drawerModal = true this.drawerTitle = '转办处理人' }, - handle1(){ + handle3(){ this.formTongGuo.approvalOpinion = 1 - this.handleSubmit() + this.form.fsRejectStatus = 1 + const json = JSON.stringify(this.form); + console.log(json) + this.$refs['form'].validate((valid) => { + if (valid) { + this.handleSubmit() + } + }) + }, + handle4(){ + const json = JSON.stringify(this.form); + this.formTongGuo.approvalOpinion = 2 + this.form.fsRejectStatus = 2 + this.$refs['form'].validate((valid) => { + if (valid) { + this.handleSubmit() + } + }) }, handle2(){ const json = JSON.stringify(this.form); - console.log(json) this.formTongGuo.approvalOpinion = 0 this.$refs['form'].validate((valid) => { if (valid) { @@ -2500,10 +2557,15 @@ this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) this.form.evaluationData = [] - this.getEvaluation() + if(this.form.fsRejectStatus === 1){ + this.evaluationHisListByOne() + }else { + this.getEvaluation() + } this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.evaluationHisListRepSum() }) }, assemble(ids,names){ @@ -2516,6 +2578,30 @@ return list; }, + evaluationHisListRepSum() { + return new Promise((resolve, reject) => { + evaluationHisListRepSum({ + pid: this.pId + }).then(res => { + this.evaluationMap = res + this.$forceUpdate() + }).catch(e => { + }) + }) + }, + evaluationHisListByOne() { + return new Promise((resolve, reject) => { + evaluationHisListByOne({ + pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审' + }).then(res => { + if (res) { + this.form.evaluationData = JSON.parse(res.mesg) + this.$forceUpdate() + } + }).catch(e => { + }) + }) + }, getEvaluation() { return new Promise((resolve, reject) => { getEvaluationIndex({ @@ -2531,6 +2617,10 @@ item.processNode = this.taskInfo evalList.push(item) }) + + if(evalList && evalList.length > 0){ + evalList[0].sum = '' + } this.form.evaluationData = evalList this.$forceUpdate() } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue new file mode 100644 index 000000000..027e95360 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -0,0 +1,2937 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index fe2493472..09b1ced95 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -82,7 +82,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -835,7 +835,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import {getEvaluationIndex} from "api/businessApi"; @@ -1087,6 +1087,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', evaluationData:[], planId:'', planStatus:'', @@ -1432,6 +1433,9 @@ sums[index] = parseFloat(sums[index]).toFixed(1); } }); + if(this.form.evaluationData && this.form.evaluationData.length > 0){ + this.form.evaluationData[0].sum = sums[4] + } return sums; }, objectSpanMethod({ row, column, rowIndex, columnIndex },value) { @@ -2848,8 +2852,13 @@ getFormFieldList (item) { this.$nextTick(() => { this.form = JSON.parse(JSON.stringify(item)) + console.log(this.form) this.form.evaluationData = [] - this.getEvaluation() + if(this.form.fsRejectStatus === 1){ + this.evaluationHisListByOne() + }else { + this.getEvaluation() + } this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id @@ -2889,6 +2898,19 @@ }) }) }, + evaluationHisListByOne() { + return new Promise((resolve, reject) => { + evaluationHisListByOne({ + pid: this.pId,taskInfo:'技术委员会评审/评审意见修改评审' + }).then(res => { + if (res) { + this.form.evaluationData = JSON.parse(res.mesg) + this.$forceUpdate() + } + }).catch(e => { + }) + }) + }, getData() { if(this.taskIds && this.pId){ return new Promise((resolve, reject) => { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue index b4f1c6de6..151634715 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue @@ -782,6 +782,7 @@ countryArr:'', commentCycleDate:'', form: { + fsRejectStatus:'', modelData:[], modelDataNameVerify:[], modelDataZrUserVerify:[], diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e2fc878e5..e9569dfe9 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -341,6 +341,17 @@ export default { prcType: row.prcType } }) + }else if (row.taskInfo === '重新发起企标制修订-技术标准流程'){ + this.$router.push({ + name: 'bussLibraryC1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) }else if (row.taskInfo === '标准化员初审'){ this.$router.push({ name: 'bussLibrary4', @@ -407,7 +418,18 @@ export default { prcType: row.prcType } }) - }else if (row.taskInfo === '审核'){ + }else if (row.taskInfo === '起草单位高级经理审核'){ + this.$router.push({ + name: 'bussLibrary8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + }else if (row.taskInfo === '标准法规部高级经理审核'){ this.$router.push({ name: 'bussLibrary9', query: { diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index a5f18c6c3..d9d3608df 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -301,6 +301,16 @@ export default { verifySarStandard: true, } }) + }else if (mes.taskInfo === '重新发起企标制修订-技术标准流程'){ + this.$router.push({ + name: 'bussLibraryC1', + query: { + type: 'buss1', + processName: mes.taskInfo, + bpnId: id, + verifySarStandard: true, + } + }) }else if (mes.taskInfo === '企标编写汇总修订'){ this.$router.push({ name: 'bussLibrary3', @@ -377,7 +387,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '审核'){ + }else if (mes.taskInfo === '起草单位高级经理审核'){ this.$router.push({ name: 'bussLibrary8', query: { @@ -388,7 +398,7 @@ export default { verifySarStandard: true, } }) - }else if (mes.taskInfo === '审核'){ + }else if (mes.taskInfo === '标准法规部高级经理审核'){ this.$router.push({ name: 'bussLibrary9', query: { diff --git a/src/router/index.js b/src/router/index.js index 1aa31497d..dd8a2fb83 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1033,6 +1033,14 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } + }, { + path: '/bussLibraryC1', + name: 'bussLibraryC1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } }, { path: '/bussLibrary2',