From 454bff7c8bd154fc66aaa0d01cc3bf4961f1f9f2 Mon Sep 17 00:00:00 2001 From: zyn Date: Tue, 18 Apr 2023 16:21:21 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=B3=95=E8=A7=84=E5=BA=93-=E7=BC=96?= =?UTF-8?q?=E8=BE=91-=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0;=EF=BC=9B=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/verify/index.js | 10 ++++++++++ .../domesticStandardsAndRegulations/index.vue | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) 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/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index fa5a583a1..c27def6ee 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2844,7 +2844,7 @@ export default { standNumber: [ {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, - {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'} + {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'} ], synopsis: [ {type: 'string', max: 500, message: '文本说明不能超过500个字符', trigger: 'change'} From f21363553715549a506da3d396ef281992c1870f Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 09:34:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/process.js | 8 ++++++++ .../processCenter/pages/creatProcess/qbrk/step1-2.vue | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) 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/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 00ff850ee..796300cac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1327,6 +1327,7 @@ import ProcessTitle from '../../components/ProcessTitle' import { saveTaskFirst, + updateBusProcessNew, queryTaskFirst, getBusStandFileByAttId, taskDel, @@ -3156,7 +3157,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 +3169,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 @@ -3451,6 +3453,7 @@ const processForm = JSON.parse(res.mesg) console.log(processForm); this.todoId = res.id + _formData.append("id",this.todoId || '') if (processForm.reviseStatus == '制定') { processForm.reviseStatus = '1' } else if (processForm.reviseStatus == '修订') { From a18545e1aff28ada59a123eeac2a2526f2aa89f9 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 19 Apr 2023 10:20:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=9B=9E=E5=A1=AB?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 796300cac..72b532e13 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3453,12 +3453,12 @@ const processForm = JSON.parse(res.mesg) console.log(processForm); this.todoId = res.id - _formData.append("id",this.todoId || '') 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 From a589bd401a9e733e0fde3cd02f0b862745bc660d Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 19 Apr 2023 10:49:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 10 ++++++++-- .../processList/tabComponents/alreadyProcess/index.vue | 5 ++++- .../processList/tabComponents/alreadySend/index.vue | 7 ++++++- .../processList/tabComponents/monitorProcess/index.vue | 6 ++++++ 4 files changed, 24 insertions(+), 4 deletions(-) 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/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" > + Date: Wed, 19 Apr 2023 14:21:33 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 74 +++++++++++-------- 1 file changed, 44 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 72b532e13..2f0f60af2 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) + } } + }) } }, }, @@ -3442,6 +3456,9 @@ }) }) }, + selectChange(){ + this.$forceUpdate() + }, getData() { if (this.$route.query.taskIds && this.$route.query.prcId) { return new Promise((resolve, reject) => { @@ -3450,8 +3467,11 @@ 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' @@ -3465,18 +3485,12 @@ 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 =>{ @@ -3489,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.area.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, From 6a4d04fece01165fe69e098fd9956611c3e7ef84 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 19 Apr 2023 14:43:43 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 2f0f60af2..b7d58bbdf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -3507,7 +3507,7 @@ 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.area.length === 0 ? processForm.SYCXCLASS : processForm.area + this.form.SYCXCLASS = processForm.SYCXCLASS.length > 0 ? processForm.SYCXCLASS : processForm.area if (processForm.type == '1') { this.esId1 = processForm.esId1 this.esId2 = processForm.esId2