From 2d3fe39e2803e88172fac1cbfa6b9031344a923c Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Tue, 4 Jan 2022 15:48:52 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E4=BA=BA=E5=91=98=E5=BF=85=E9=80=89=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=88=86=E8=A7=A3=E5=8D=95=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../details/otherStandardDetails/index.vue | 2 +- .../pages/creatProcess/bzhHd-rh/step2.vue | 6 +- .../pages/creatProcess/bzhHy-ch/step2.vue | 6 +- .../domesticStandardsAndRegulations/index.vue | 97 +------------------ 4 files changed, 14 insertions(+), 97 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 1d3f00ea0..85e0aecc1 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1314,7 +1314,7 @@ }}
- + {{ diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 90f200642..fa5ae3de2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -111,7 +111,7 @@ - + - + {{ textStatusMap[scope.row.textStatus] }} + + { - if (res.ok) { - const {data = {}} = res - this.formFieldListData = data['INLAND_STAND'] || [] - // 追加高级查询动态下拉框数据s - this.twoOptions = [ - { - label: '标准类别', - value: 'stand_sort', - type: 'SEL_OPTION', - disabled: false - }, - { - label: '文本状态', - value: 'stand_state_show', - type: 'SEL_OPTION', - disabled: false - }, - // { - // label: '适用区域', - // value: 'country', - // type: 'SEL_OPTION', - // disabled: false - // }, - { - label: '重要度', - value: 'is_relate_access', - type: 'SEL_OPTION', - disabled: false - }, - { - label: '标准编号', - value: 'stand_number', - type: 'INPUT', - disabled: false - }, - { - label: '标准年份', - value: 'stand_year', - type: 'INPUT', - disabled: false - }, - { - label: '中文名称', - value: 'stand_name', - type: 'INPUT', - disabled: false - }, - { - label: '英文名称', - value: 'stand_en_name', - type: 'INPUT', - disabled: false - }, - { - label: '发布日期', - value: 'issue_time', - type: 'DATE_PIC_OPTS', - disabled: false - }, - { - label: '文本说明', - value: 'synopsis', - type: 'INPUT', - disabled: false - } - ] - this.formFieldListData.map(item => { - if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') { - this.twoOptions.push({ - value: item.attrField, - label: item.attrName, - selVal: item.selVal, - type: item.attrType, - disabled: false, - __wx__: item - }) - } - }) - // this.resolveFormFieldList() - } - }, e => { - }) - }, /** * 展示位置 */ @@ -5718,7 +5632,6 @@ export default { // 加载所有的部门 this.getOrgTreeSource() // 加载动态表单数据 - this.getAddFormFieldList() this.getDept() this.busVsFunc() this.modelFunc() From fadd8674aded01c08a9ca9ab4e4a8ca6fe1607a5 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, 4 Jan 2022 16:39:40 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E5=8D=95=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/establish.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/component/merge.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index c91987b76..221b2be10 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -12,7 +12,7 @@ > - + - + Date: Tue, 4 Jan 2022 16:50:33 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E3=80=81=E5=8F=82?= =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step2.vue | 2 +- .../pages/creatProcess/bzhHy-ch/step2.vue | 2 +- .../pages/phone/bzhHd-ch/step2.vue | 44 ++++++------------- .../pages/phone/bzhHd-ch/step4.vue | 38 ++++------------ .../pages/phone/bzhHd-ch/step6.vue | 38 ++++------------ .../pages/phone/bzhHd-rh/step2.vue | 44 ++++++------------- .../pages/phone/bzhHd-rh/step4.vue | 38 ++++------------ .../pages/phone/bzhHd-rh/step6.vue | 42 ++++++------------ 8 files changed, 68 insertions(+), 180 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index fa5ae3de2..1ce2f8320 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -244,7 +244,7 @@ export default { return { active: '1', // 默认显示 rh_rules: { - meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}] + comityOpRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}] }, rh_pageData: { comityFileNum: '', diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue index 6f0f9b648..de701e95d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue @@ -240,7 +240,7 @@ export default { acceptShow: false, ch_pageData: {}, ch_rules: { - meetingInRoleId: [{required: true, message: "请选择入会人员", trigger: ['blur', 'change']}] + meetingInRoleId: [{required: true, message: "请选择参会人员", trigger: ['blur', 'change']}] }, nodeList: [], commentText: '', diff --git a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue index 40e757002..f105da6c2 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue @@ -15,65 +15,42 @@
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - - - +
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - -
- - {{ ch_pageData.meetingName || '-' }} - - {{ ch_pageData.primaryUnit || '-' }} - - - - - {{ ch_pageData.associaName || '-' }} + + {{ item.name || '-'}} + - - {{ ch_pageData.meetingStartTime || '-' }} - - - - {{ ch_pageData.meetingPlace || '-' }} - - {{ ch_pageData.feeStand || '-' }} - - - - {{ ch_pageData.feeKind || '-' }} - - {{ '-' }} {{ item.name }} {{ ';' }} - - - - 计划内 计划外 - -
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -95,7 +72,7 @@ - +
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -327,6 +304,9 @@ export default { .prc-content-border { overflow: auto; } + /deep/.el-form-item__content { + margin-top: 5px; + } /deep/.prc-content-border .el-form-item__content { width: 270px; } diff --git a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue index a962d58c6..d6b40386b 100644 --- a/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue @@ -17,64 +17,45 @@
- - - {{ rh_pageData.comityName || '-' }} + + {{ item.name || '-'}} + - - {{ rh_pageData.comityState || '-' }} - - - - + {{ rh_pageData.comityKind || '-' }} - - {{ rh_pageData.comityMake.makeQualification || '-' }} - - - - + {{ rh_pageData.comityMake.makeRole || '' }} - - {{ rh_pageData.comityMake.makeCost || '-' }} - - - - + {{ rh_pageData.comityMake.makeDuties || '-' }} - - {{ rh_pageData.comityMake.makeTime || '-' }} - - - - + {{ '-' }} {{ item.name }} {{ ';' }} - - @@ -340,6 +321,9 @@ export default { .prc-content-border { overflow: auto; } + /deep/.el-form-item__content { + margin-top: 5px; + } /deep/.prc-content-border .el-form-item__content { width: 270px; } From cc4c02bd3fd6a673afe001fc868926f238f8ab58 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 4 Jan 2022 18:09:32 +0800 Subject: [PATCH 04/10] feat: There is no way the, --- .../qbrk-product/common/formEditList.vue | 1310 +++++++++-------- .../qbrk-product/common/formList.vue | 883 ++++++----- .../qbrk-product/common/formListIn.vue | 517 +++++++ .../pages/creatProcess/qbrk-product/step1.vue | 244 +-- .../pages/creatProcess/qbrk-product/step2.vue | 1 - .../pages/creatProcess/qbrk-product/step3.vue | 16 +- .../pages/creatProcess/qbrk-product/step5.vue | 81 +- .../pages/creatProcess/qbrk-product/step6.vue | 16 +- .../pages/creatProcess/qbrk/step12.vue | 2 +- 9 files changed, 1921 insertions(+), 1149 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 97c3b1122..40b526665 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -1,673 +1,701 @@ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index c41f9480e..11262c1ae 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -58,13 +58,6 @@ - - - @@ -109,11 +102,18 @@ clearable > - - + + placeholder="请选择企标实施日期" + value-format="yyyy-MM-dd" + > + + + + + @@ -262,19 +262,25 @@ > + + + + + + + + + - - - @@ -300,8 +306,14 @@ > - - + + + + + + + + @@ -478,7 +490,7 @@

其他起草人

- +
@@ -964,17 +976,44 @@ :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> - + + +
@@ -986,6 +1025,8 @@ import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; + import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; + let Base64 = require('js-base64').Base64; export default { @@ -995,7 +1036,8 @@ ProcessFooter, ProcessTitle, TreeSelect, - TreeSelectNew + TreeSelectNew, + treeSelectModule }, data () { const validateZrUserIdName = (rule, value, callback) => { @@ -1225,6 +1267,12 @@ TXLBBUSS: '', VPPSBMBUSS: '', VPPSCNBUSS: '', + KCVPPSBMBUSS: '', + KCVPPSCNBUSS: '', + CYCVPPSBMBUSS: '', + CYCVPPSCNBUSS: '', + DYBXHBUSS: '', + DYMCBUSS: '', // 关联信息 DTQBBHBUSS: '', BDTQBBHBUSS: '', @@ -1433,6 +1481,64 @@ }, }, methods: { + popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.CYCVPPSBMBUSS = checkedData.code + this.form.CYCVPPSCNBUSS = checkedData.chineseName + } + }else { + this.form.CYCVPPSBMBUSS = '' + this.form.CYCVPPSCNBUSS = '' + } + this.modalShowFlag2 = false + this.$forceUpdate() + }, + popoverHideBusVsCancel(){ + this.modalShowFlag2 = false + }, + popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + } else { + this.form.KCVPPSBMBUSS = checkedData.code + this.form.KCVPPSCNBUSS = checkedData.chineseName + } + }else { + this.form.KCVPPSBMBUSS = '' + this.form.KCVPPSCNBUSS = '' + } + this.modalShowFlag3 = false + this.$forceUpdate() + }, + popoverHideCarVsCancel(){ + this.modalShowFlag3 = false + }, + popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { + console.log(checkedData) + if (checkedData && checkedData.length != 0) { + if (checkedData.length > 0) { + this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",") + this.form.DYMCBUSS = checkedData.map(item => item.name).join(",") + } else { + this.form.DYBXHBUSS = checkedData.model + this.form.DYMCBUSS = checkedData.name + } + }else { + this.form.DYBXHBUSS = '' + this.form.DYMCBUSS = '' + } + this.modalShowFlag4 = false + this.$forceUpdate() + }, + popoverHideModelCancel(){ + this.modalShowFlag4 = false + }, modelProp(row,index){ console.log(row) console.log(index) @@ -1950,13 +2056,13 @@ }, choiceZRRList (type, title, id) { this.nodeList2 = [] - if(type === 'qcUserId'){ - if ( this.roleForm.qcUserId.length > 0) { - this.nodeList2 = this.roleForm.qcUserId.split(',') + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') } - }else if(type === 'hqUserId'){ - if ( this.roleForm.hqUserId.length > 0) { - this.nodeList2 = this.roleForm.hqUserId.split(',') + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') } }else if(type === 'QCRBUSS'){ if ( this.form.QCRBUSSID.length > 0) { @@ -2027,14 +2133,15 @@ this.modalShowFlag1 = true this.key++ }, - choiceZRR2 (type, title, id) { + choiceZRR2 (type, title, id,flag) { this.drawerTitle = title this.modalShowFlag2 = true + this.multipleFlag2 = flag this.url = '' this.urlChild = '' + this.type = type this.url="sarVppsTree/list" this.urlChild="sarVppsTree/childByList" - this.key1++ }, choiceZRR3 (type, title, id) { this.drawerTitle = title @@ -2043,7 +2150,6 @@ this.urlChild = '' this.url="sarVppsTree/list" this.urlChild="sarVppsTree/childByList" - this.key2++ }, choiceZRR4 (type, title, id) { this.drawerTitle = title @@ -2052,7 +2158,6 @@ this.urlChild = '' this.url="sarModelTree/list" this.urlChild="sarModelTree/childByList" - this.key3++ }, getTree () { this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> { @@ -2372,19 +2477,6 @@ this.form.QCDWID = idList }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.VPPSBMBUSS = checkedData.code - this.form.VPPSCNBUSS = checkedData.chineseName - } - } - this.modalShowFlag2 = false - this.$forceUpdate() - }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { if(checkedData.length > 0){ @@ -2399,54 +2491,6 @@ popoverHideCancel(){ this.modalShowFlag1 = false }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0 && checkedData.length != 0){ - this.form.cycvppsbm = checkedData.map(item => item.code).join(",") - this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.cycvppsbm = checkedData.code - this.form.cycvppscn = checkedData.chineseName - } - this.modalShowFlag2 = false - } - - }, - popoverHideBusVsCancel(){ - this.modalShowFlag2 = false - }, - popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0){ - this.form.kccvppsbm = checkedData.map(item => item.code).join(",") - this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") - }else { - this.form.kccvppsbm = checkedData.code - this.form.kccvppscn = checkedData.chineseName - } - this.modalShowFlag3 = false - - } - }, - popoverHideCarVsCancel(){ - this.modalShowFlag3 = false - }, - popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData && checkedData.length != 0) { - if(checkedData.length > 0){ - this.form.dybxh = checkedData.map(item => item.model).join(",") - this.form.dymc = checkedData.map(item => item.name).join(",") - }else { - this.form.dybxh = checkedData.model - this.form.dymc = checkedData.name - } - this.modalShowFlag4 = false - } - - }, - popoverHideModelCancel(){ - this.modalShowFlag4 = false - }, closeDrawer() { this.ListModel = false }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue index 3f987bda5..1d1a00bb0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue @@ -2225,7 +2225,6 @@ this.form.footFileName=this.footFileList.map(item => item.name).join(",") this.isSubmit = true this.saveLoading = true - // 会签意见存储 const infoList = [] const info = {} info.footFile = this.form.footFile diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 73ad99dda..905cf69cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1650,8 +1650,20 @@ } }, choiceZRRList (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) + this.nodeList2 = [] + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') + } + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') + } + }else if(type === 'QCRBUSS'){ + if ( this.form.QCRBUSSID.length > 0) { + this.nodeList2 = this.form.QCRBUSSID.split(',') + } + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index 089efc835..15fda4eee 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -31,11 +31,47 @@
-
+
+ + + + + + + + + + +
+
+
+ {{ item.name }} + + + +
+
+
+ + + +
+
+ @@ -659,6 +695,7 @@ prcName: this.$route.query.prcName, detailData: [], fileList: [], + summaryList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], LSBBBUSSFileList: [], @@ -1335,6 +1372,7 @@ 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.summaryList=this.assemble(mes.summary,mes.summaryName); this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -1958,22 +1996,33 @@ // this.fileList = fileList.splice(0, 1) // } if (response.ok) { - + const fileObj = {} + fileObj.id = file.response.data.id + fileObj.name = file.response.data.name switch (this.fileType){ case 'FBGBUSS': - this.FBGBUSSFileList = fileList + this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); + this.FBGBUSSFileList.push(fileObj) break; case 'BZSMBUSS' : - this.BZSMBUSSFileList = fileList + this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined); + this.BZSMBUSSFileList.push(fileObj) break; case 'LSBBBUSS': - this.LSBBBUSSFileList = fileList + this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined); + this.LSBBBUSSFileList.push(fileObj) break; case 'GLWJLAWS': - this.QTWJBUSSFileList = fileList + this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined); + this.GLWJLAWSFileList.push(fileObj) break; case 'GLWJBUSS': - this.GLWJBUSSFileList = fileList + this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); + this.GLWJBUSSFileList.push(fileObj) + break; + case 'summary': + this.summaryList = this.summaryList.filter ( item => item.response === undefined); + this.summaryList.push(fileObj) break; default : ; } @@ -2010,6 +2059,9 @@ case 'GLWJBUSS': this.fileList=this.GLWJBUSSFileList break; + case 'summary': + this.fileList=this.summaryList + break; default : ; } this.fileMadel = true; @@ -2033,6 +2085,9 @@ case 'GLWJBUSS': this.GLWJBUSSFileList = fileList break; + case 'summary': + this.summaryList = fileList + break; default : ; } }, @@ -2134,6 +2189,8 @@ // if(item.country !== undefined && item.country !== null){ // this.sarStandardsInfoEO.country = item.country.split(","); // } + this.summary=this.summaryList.map(item => item.id).join(",") + this.summaryName=this.summaryList.map(item => item.name).join(",") this.saveLoading = true let _formData = new FormData() @@ -2266,14 +2323,22 @@ if (valid) { this.isSubmit = true this.saveLoading = true + + this.summary=this.summaryList.map(item => item.id).join(",") + this.summaryName=this.summaryList.map(item => item.name).join(",") + this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion // 会签意见存储 const infoList = [] + const maryList=this.assemble(this.summary,this.summaryName); const info = {} info.userId = this.userId info.userName = this.userName info.commentText = this.formTongGuo.commentText + info.summary = this.summary + info.summaryName = this.summaryName + info.summaryList = maryList infoList.push(info) this.form.infoList = infoList const json = JSON.stringify(this.form); @@ -2397,6 +2462,8 @@ this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); + this.summaryList=this.assemble(processForm.summary,processForm.summaryName); + } }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 1e2d38fcc..0cb23fd01 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1655,8 +1655,20 @@ } }, choiceZRRList (type, title, id) { - this.nodeList = [] - this.nodeList.push(id) + this.nodeList2 = [] + if(type === 'bussUser2'){ + if ( this.roleForm.bussUser2.length > 0) { + this.nodeList2 = this.roleForm.bussUser2.split(',') + } + }else if(type === 'bussUser5'){ + if ( this.roleForm.bussUser5.length > 0) { + this.nodeList2 = this.roleForm.bussUser5.split(',') + } + }else if(type === 'QCRBUSS'){ + if ( this.form.QCRBUSSID.length > 0) { + this.nodeList2 = this.form.QCRBUSSID.split(',') + } + } this.userType = type this.drawerTitle = title this.modalShowRoleFlag = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index db1e618d1..00571932a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2335,7 +2335,7 @@ let year = date.getFullYear(); this.form.standSn = standSn this.form.standNumber = standSn - this.form.standYear = year + ' X' + this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, e => { }) From 60dc24cee71d86c65924cd8e61e9972b0d5dfaf3 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 09:31:48 +0800 Subject: [PATCH 05/10] feat: There is no way the, --- .../domesticStandardsAndRegulations/index.vue | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 00a6f4de9..0a7ae0d29 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -5141,6 +5141,97 @@ export default { }) } }, + /** + * 获取新增弹框的表单 + */ + getAddFormFieldList(isEdit) { + this.$http.get('lawss/sarStandAttrDetails/list', {}, { + _this: this + }, + res => { + if (res.ok) { + const {data = {}} = res + this.formFieldListData = data['INLAND_STAND'] || [] + // 追加高级查询动态下拉框数据s + this.twoOptions = [ + { + label: '标准类别', + value: 'stand_sort', + type: 'SEL_OPTION', + disabled: false + }, + { + label: '文本状态', + value: 'stand_state_show', + type: 'SEL_OPTION', + disabled: false + }, + // { + // label: '适用区域', + // value: 'country', + // type: 'SEL_OPTION', + // disabled: false + // }, + { + label: '重要度', + value: 'is_relate_access', + type: 'SEL_OPTION', + disabled: false + }, + { + label: '标准编号', + value: 'stand_number', + type: 'INPUT', + disabled: false + }, + { + label: '标准年份', + value: 'stand_year', + type: 'INPUT', + disabled: false + }, + { + label: '中文名称', + value: 'stand_name', + type: 'INPUT', + disabled: false + }, + { + label: '英文名称', + value: 'stand_en_name', + type: 'INPUT', + disabled: false + }, + { + label: '发布日期', + value: 'issue_time', + type: 'DATE_PIC_OPTS', + disabled: false + }, + { + label: '文本说明', + value: 'synopsis', + type: 'INPUT', + disabled: false + } + ] + this.formFieldListData.map(item => { + if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') { + this.twoOptions.push({ + value: item.attrField, + label: item.attrName, + selVal: item.selVal, + type: item.attrType, + disabled: false, + __wx__: item + }) + } + }) + // this.resolveFormFieldList() + } + }, e => { + }) + }, /** * 展示位置 */ @@ -5632,6 +5723,7 @@ export default { // 加载所有的部门 this.getOrgTreeSource() // 加载动态表单数据 + this.getAddFormFieldList() this.getDept() this.busVsFunc() this.modelFunc() From 41f9590033926fe8fcdc6a14e6eda19de54dac2b Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 10:08:20 +0800 Subject: [PATCH 06/10] feat: There is no way the, --- .../creatProcess/qbrk-product/step13.vue | 39 ++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index b509579d8..981bd4612 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -557,7 +557,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process"; + import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process"; import {getEvaluationIndex} from "api/businessApi"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; @@ -794,6 +794,8 @@ countryArr:'', commentCycleDate:'', form: { + reviseStatus:'', + standSn:'', evaluationData:[], modelData:[], modelDataNameVerify:[], @@ -2340,6 +2342,7 @@ // 流程提交之后，应该流转至待办任务页面 this.isSubmit = false this.saveLoading = false + this.processCreateBuss(json) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2357,6 +2360,24 @@ } }) }, + /** + * @description: 流程入库 + * @date: 2020-11-18 21:47:58 + */ + processCreateBuss(json) { + const _formData = new FormData() + _formData.append('infoJson', json) + processCreateBuss(_formData).then(res => { + if (res.result === '操作成功' || res.data === '入库成功') { + this.$message.success(res.data) + this.submitLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + } else { + this.$message.warning(res.message) + this.isSubmit = false + } + }) + }, busVsFunc(){ this.$http.get('sarVppsTree/list', '', { _this: this @@ -2392,6 +2413,7 @@ this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form['id'] = item.id + this.getStandInfoByReviseStatus() }) }, assemble(ids,names){ @@ -2454,6 +2476,21 @@ }) } }, + getStandInfoByReviseStatus() { + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, { + _this: this + }, res => { + const obj = res.data + let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn + let date = new Date(); + let year = date.getFullYear(); + this.form.standSn = standSn + this.form.standNumber = standSn + this.form.standYear = this.form.reviseStatus === '2' ? (year + ' X') : year // 待带入立项标准 + this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + }, e => { + }) + }, processTable () { this.$nextTick(() => { Promise.all([this.getTaskId()]).then((value) => { From b7be041a713ec5b7eaed7d85f1e757bf93fe9d9a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 5 Jan 2022 10:10:53 +0800 Subject: [PATCH 07/10] feat: There is no way the, --- .../pages/creatProcess/qbrk-product/step13.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 981bd4612..81327f6f9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -19,7 +19,7 @@ label-width="210px" >
- + >
@@ -553,7 +553,7 @@