diff --git a/src/api/process.js b/src/api/process.js index ab709c7b6..44ac63ddc 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -150,6 +150,14 @@ export function saveTaskFirst (data) { data }) } +// 技术标准-起草 保存 +export function updateBusProcessNew (data) { + return axios({ + url: '/api/lawss/activiti/updateBusProcessNew', + method: 'post', + data + }) +} // 复审流程-模拟发起 export function autoTaskFirst (data) { diff --git a/src/common/verify/index.js b/src/common/verify/index.js index b217a4af9..eb3e8843a 100644 --- a/src/common/verify/index.js +++ b/src/common/verify/index.js @@ -32,6 +32,16 @@ export default { callback() } }, + validateStandardItem2 (rule, value, callback) { + // return callback() + let testval = /^[A-Za-z0-9/]+$/ + let testval1 = /[.-;；]+/ + if (value && !value.match(testval) && !value.match(testval1)) { + return callback(new Error('只能为（字母、数字、.、-、;、；）')) + } else { + callback() + } + }, /** * 验证字母、数字、.、-的正则且不能重复 diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index ca846edeb..702d4db09 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -52,9 +52,15 @@ export default { watch: {}, mounted() {this.queryProcess()}, methods: { - getPrcNameFilter(row){ + getPrcNameFilter(row){ + if(row && row.prcType === '25' && row.taskInfo === '技术标准起草'){ + let _index = row.prcName.lastIndexOf('-') + return row.prcName.slice(0 , _index + 1) + '企标制修订' + }else { return row.prcName - }, + } + + }, togo () { this.$router.push('/processCenter') }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 00ff850ee..b7d58bbdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -358,7 +358,7 @@ + v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple @change="selectChange"> { + if (res) { + if(this.form.FBGBUSS.indexOf(res.id) === -1 ){ + this.form.FBGBUSS = res.id + ',' + this.form.FBGBUSS + } + + if (val && val !== '') { + if(this.form.FBGBUSSName.indexOf(val) === -1 ){ + this.form.FBGBUSSName = val + ',' + this.form.FBGBUSSName + this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName) + } + } else { + this.form.FBGBUSSName = '企业标准' + ',' + this.form.FBGBUSSName + // this.FBGBUSSFileList = [] + // this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准'); + this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName) + } } + }) } }, }, @@ -3156,7 +3171,8 @@ this.saveLoading = true let _formData = new FormData() this.fileInfoHandle() - _formData.append('id', this.bpnId || '') + console.log(this.todoId) + _formData.append('id', this.todoId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', '25') @@ -3167,7 +3183,7 @@ roleForm: this.roleForm, commentText: this.commentText })) - saveTaskFirst(_formData).then(res => { + updateBusProcessNew(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result @@ -3440,6 +3456,9 @@ }) }) }, + selectChange(){ + this.$forceUpdate() + }, getData() { if (this.$route.query.taskIds && this.$route.query.prcId) { return new Promise((resolve, reject) => { @@ -3448,32 +3467,30 @@ pId: this.$route.query.prcId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - console.log(processForm); + let processForm = JSON.parse(res.mesg) + this.commentText = processForm.commentText + if(processForm.form){ + processForm = processForm.form + } this.todoId = res.id if (processForm.reviseStatus == '制定') { processForm.reviseStatus = '1' } else if (processForm.reviseStatus == '修订') { processForm.reviseStatus = '2' } + this.form = processForm this.form.standSort = processForm.bussSort this.form.planId = processForm.nowEsId this.nowEsId = processForm.nowEsId this.form.reviseStatus = processForm.reviseStatus this.form.standName = processForm.renameEs ? processForm.renameEs : processForm.esName - this.$http.get('/lawss/activiti/saveEditFile', { - model: 'model_qb' - }, { - _this: this - }, res => { - if (res) { - this.form.FBGBUSS = res.id - this.form.FBGBUSSName = this.form.standName - this.FBGBUSSFileList = this.assemble(res.id, this.form.FBGBUSSName); - } - }) + this.FBGBUSSFileList=[...this.FBGBJBDFileList,...this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName)] + this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); // 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本 if(processForm.reviseStatus === '2'){ this.selectByIdAtt(processForm.rqbJson).then(res =>{ @@ -3486,19 +3503,19 @@ } - this.form.QCDW = processForm.unitName - this.form.QCDWID = processForm.unit - this.form.QCRBUSSID = processForm.drafter - this.form.QCRBUSS = processForm.drafterName - this.form.SYCXCLASS = processForm.area + this.form.QCDW = processForm.QCDW || processForm.unitName + this.form.QCDWID = processForm.QCDWID || processForm.unit + this.form.QCRBUSSID = processForm.QCRBUSSID || processForm.drafter + this.form.QCRBUSS = processForm.QCRBUSS || processForm.drafterName + this.form.SYCXCLASS = processForm.SYCXCLASS.length > 0 ? processForm.SYCXCLASS : processForm.area if (processForm.type == '1') { this.esId1 = processForm.esId1 this.esId2 = processForm.esId2 } this.taskType = processForm.type - this.form.DTQBBHBUSS = processForm.rqbName - this.form.CYBZ = processForm.esStandRelations - this.form.YYBZ = processForm.esMatingRelations + this.form.DTQBBHBUSS = processForm.DTQBBHBUSS || processForm.rqbName + this.form.CYBZ = processForm.CYBZ || processForm.esStandRelations + this.form.YYBZ = processForm.YYBZ || processForm.esMatingRelations // this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用' this.$http.get('lawss/activiti/judgeAcceptTack', { nowEsId: this.nowEsId, diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue index e03a3a6f6..62d7a23f4 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue @@ -84,7 +84,7 @@ width="180" > + + + @@ -94,6 +97,9 @@ align="center" min-width="250" > +