From 2fe751a72a0a2b511a7be3e50d62576b5b7a36fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 11 Jan 2022 09:56:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 10 +++++----- .../qbzxdjhgk/component/delay.vue | 10 +++++----- .../qbzxdjhgk/component/establish.vue | 8 ++++---- .../qbzxdjhgk/component/merge.vue | 20 +++++++++---------- .../qbzxdjhgk/component/rename.vue | 10 +++++----- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step2.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step3.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step4.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step5.vue | 4 ++-- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 0153e9590..6a113aacd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -200,8 +200,8 @@ placeholder="根据企标名称查找" > - - + + @@ -257,7 +257,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index a6588fd7f..c0f6b8804 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -216,8 +216,8 @@ placeholder="根据企标名称查找" > - - + + @@ -273,7 +273,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index cfa58cfd8..dd759d443 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -27,9 +27,9 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + @@ -373,7 +373,7 @@ export default { unitName: "", esName: "", // 企标名称 planStatus: "0", // 计划状态 - reviseStatus: "", // 制修订状态 + reviseStatus: "", // 制修订类型 area: "", //适用车型 isRelate: "", //采用何种标准 technologic: '', //指标依据 @@ -400,7 +400,7 @@ export default { { required: true, message: "请输入企标名称", trigger: "blur" } ], reviseStatus: [ - { required: true, message: "请选择制修订状态", trigger: "blur" } + { required: true, message: "请选择制修订类型", trigger: "blur" } ], resPersonName: [ { required: true, message: "请输入评审责任人", trigger: "blur" } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index 122b25651..d40285c76 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -20,8 +20,8 @@ - - + + @@ -31,8 +31,8 @@ - - + + @@ -64,8 +64,8 @@ clearable > - - + + @@ -222,8 +222,8 @@ placeholder="根据企标名称查找" > - - + + @@ -279,7 +279,7 @@ + label="制修订类型"> @@ -558,7 +558,7 @@ export default { {required: true, message: '请输入企标名称', trigger: 'blur'}, ], reviseStatus: [ - {required: true, message: '请选择制修订状态', trigger: 'change'}, + {required: true, message: '请选择制修订类型', trigger: 'change'}, ], resPersonName: [ {required: true, message: '请输入评审责任人', trigger: 'blur'}, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 1ddae5222..aa622b986 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -40,8 +40,8 @@ clearable > - - + + @@ -207,8 +207,8 @@ placeholder="根据企标名称查找" > - - + + @@ -264,7 +264,7 @@ + label="制修订类型"> diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue index 7c1ca6056..7135d0c3f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue index 9e2ef5889..df88ceb56 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue index b388590b8..3f749b734 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue index ebd00421f..aab680de4 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue index c021631fd..b9c64d605 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue @@ -29,8 +29,8 @@ placeholder="请输入企标名称" :maxlength="500"/> - - + + From a9c1b124717a5dd466894964014811de8737d29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 11 Jan 2022 10:20:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/establish.vue | 12 +++++++++++- .../creatProcess/qbzxdjhgk/component/merge.vue | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index dd759d443..2c01e202f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -283,7 +283,6 @@ :data="standSystemOptions" show-checkbox node-key="id" - default-expand-all check-strictly :default-checked-keys="TXJGList" :props="defaultProps"> @@ -591,18 +590,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { + console.log(data); let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName }); if(this.roleType === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.roleType === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -611,6 +618,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); } diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index d40285c76..b407db76d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -447,7 +447,6 @@ :data="standSystemOptions" show-checkbox node-key="id" - default-expand-all check-strictly :default-checked-keys="TXJGList" :props="defaultProps"> @@ -783,19 +782,26 @@ export default { this.modalshowflag2 = true; }, checkedRole2(data) { - let idList = ""; - let nameList = ""; + let idList = "", nameList = "" + let unitList = "", unitNameList = "" data.forEach(item => { if (nameList.length) { nameList += ","; idList += ","; + unitList += ","; + unitNameList += ","; } idList += item.id; nameList += item.name; + unitList += item.institutionId + unitNameList += item.institutionName + }); if(this.type === '1'){ this.$set(this.qbfsForm, 'drafter', idList) this.$set(this.qbfsForm, 'drafterName', nameList) + this.$set(this.qbfsForm, 'unit', unitList) + this.$set(this.qbfsForm, 'unitName', unitNameList) }else if(this.type === '2'){ this.$set(this.qbfsForm, 'resPerson', idList) this.$set(this.qbfsForm, 'resPersonName', nameList) @@ -803,6 +809,9 @@ export default { if(this.qbfsForm.drafterName){ this.$refs.qbfsForm.validateField('drafterName'); } + if(this.qbfsForm.unitName){ + this.$refs.qbfsForm.validateField('unitName'); + } if(this.qbfsForm.resPersonName){ this.$refs.qbfsForm.validateField('resPersonName'); } From c96efba70cca6d74447ffb90d65bf69b55feeaa3 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 11 Jan 2022 10:26:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 7 +++++++ src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 5 ++--- src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 2 ++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 40ed0b811..83452e6b0 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3673,8 +3673,9 @@ export default { // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) { // return // } + console.log(displayLocation) displayLocation.forEach((location) => { - console.log(location); + console.log(location.child) location.isShowImp = '0' if (dynamicFormField) { let value = dynamicFormField[field.attrField] @@ -3705,7 +3706,6 @@ export default { displayLocation.forEach(location => { // 动态属性字段-FBGBJBD 单独添加至基础信息 const list = displayLocation.filter(item => item.label === '过程稿件'); - console.log('3535', list) if (location.label === '基础信息' && list && list.length > 0) { //发布稿必读 if (!list[0].child) { @@ -3772,6 +3772,7 @@ export default { } } }) + console.log(child) const fieldsIsTextAreaOrFile = child.filter(field => { return field.attrType === 'TEXTAREA' || field.attrType === 'FILE' }) @@ -3783,7 +3784,6 @@ export default { location.half = half location.showAll = false }) - console.log(displayLocation) this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { id: this.$route.params.id }, { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 4540d8489..ba3e6623d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -836,6 +836,11 @@ + { if (res.success) { - console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion); if(this.formTongGuo.approvalOpinion == '1'){ - console.log("shibai"); this.$message.warning("驳回成功") this.isSubmit = false this.formTongGuo.commentText = '' // 流程提交之后，应该流转至待办任务页面 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else{ - console.log("hello"); this.processCreateStand(json) } } @@ -1294,6 +1292,7 @@ * @auth: chenxiaoxi */ processCreateStand(json) { + console.log(json) const _formData = new FormData() _formData.append('infoJson', json) processCreateStand(_formData).then(res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index bb2a4bb25..896790f91 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1576,6 +1576,7 @@ export default { caName: '', // 草案 fbgbjbdName: '', // 发布稿 bfbdtbzh: '', // 发布稿 + bfdtbzh: '', xgdName: '', // 修改单 bpgName: '', // 报批稿 ssgName: '', // 送审稿 @@ -1949,6 +1950,7 @@ export default { this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + this.form.bfdtbzh = this.form.bfdtbzh ? this.form.bfdtbzh + ',' + textArr.join(',') : textArr.join(',') } else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } From 60cc5e200ad8bd60b502db98d9e6e06595f2ca79 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 11 Jan 2022 11:23:37 +0800 Subject: [PATCH 4/5] commit --- .../enterpriseStandardPlan/index.vue | 5 +++++ .../pags/consultationDetails.vue | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 81f4d6857..ae33dc5c2 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -834,6 +834,11 @@ this.addForm.unit = list this.addForm.unitName = listName this.modalshowflagZRBM = false + this.$http.get('SarInstitution/institution/getInstitutionIdToDept', { + institutionIds: list + }, {}, res => { + console.log(res); + }) }, choiceZRBM(id) { if (this.DrawerType === 'see') { diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index d42f83c03..381663abc 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -141,6 +141,13 @@ > + + + + +
@@ -260,6 +270,7 @@ export default { newText: '', reason: '', chapterName: '', + cause: '', }, opinionContentRules: { partCode: [ @@ -382,6 +393,7 @@ export default { this.opinionContent.reason = row.reason this.opinionContent.oldText = row.oldText this.opinionContent.newText = row.newText + this.opinionContent.cause = row.cause } else { this.id = '' this.opiniontitle = '新增意见' @@ -389,6 +401,7 @@ export default { this.opinionContent.reason = '' this.opinionContent.oldText = '' this.opinionContent.newText = '' + this.opinionContent.cause = '' } this.isDialog = true }, @@ -433,6 +446,7 @@ export default { reason: this.opinionContent.reason, partCode: this.opinionContent.partCode, chapterName: this.opinionContent.chapterName, + cause: this.opinionContent.cause, userId: this.$store.getters.userInfo.userId || '', userName: this.$store.getters.userInfo.userName || '', deptName: this.$store.getters.userInfo.orgName || '', From 697fab7bf08a87292d991f268eed4eb7b9670080 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 11 Jan 2022 11:43:40 +0800 Subject: [PATCH 5/5] commit --- .../processCenter/pages/creatProcess/bzzqyj/step5.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index a3b328df4..fc5ac8428 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -179,7 +179,7 @@ class="common-button-primary" size="mini" type="primary" - @click="itemEdit(scope.row)">处理 + @click="itemEdit(scope.row, scope.$index)">处理 @@ -447,14 +447,13 @@ }, saveUserInfo2 () { for( let a = 0; a < this.data.length; a++) { - if (this.data[a].id === this.itemId) { + if (a === this.itemId) { this.data[a].chapterNumber = this.editForm.chapterNumber this.data[a].chapterName = this.editForm.chapterName this.data[a].oldText = this.editForm.oldText this.data[a].newText = this.editForm.newText this.data[a].reason = this.editForm.reason this.data[a].cause = this.editForm.cause - this.$set(this.data, a,this.editForm) } } this.modalshowflag2 = false @@ -462,8 +461,8 @@ cancleUserInfo2 () { this.modalshowflag2 = false }, - itemEdit (row) { - this.itemId = row.id + itemEdit (row, index) { + this.itemId = index this.modalshowflag2 = true this.editForm = { chapterNumber: row.chapterNumber,