From 35154e1ba2f64226c872c47dd4b5cff3632e772f Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 5 Nov 2021 14:13:01 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=A4=96=E9=83=A8=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8D=8F=E4=BC=9A=E6=B5=81=E7=A8=8B=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 39 ++++++++++++------- .../pages/creatProcess/bzhHh-hh/step1.vue | 4 +- .../pages/creatProcess/bzhHy-ch/step1.vue | 6 ++- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 1934c16bf..d36e5c488 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -18,7 +18,7 @@ - + @@ -26,12 +26,12 @@ v-for="item in comityNameOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> - + @@ -39,12 +39,12 @@ v-for="item in comityNameOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> - + @@ -52,7 +52,7 @@ v-for="item in comityNameOptions" :key="item.value" :label="item.label" - :value="item.value"/> + :value="item.label"/> @@ -134,29 +134,30 @@ - + - + - + - + - + @@ -164,7 +165,7 @@ - + @@ -455,9 +456,17 @@ export default { engineerUserId: '', }, - rh_rules: {}, + rh_rules: { + comityName: [{required: true, message: "请选择协会名称", trigger: ['blur', 'change']}], + comityNameOne: [{required: true, message: "请选择分标委", trigger: ['blur', 'change']}], + comityNameTwo: [{required: true, message: "请选择工作组", trigger: ['blur', 'change']}] + }, roleFormRules: { - dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] + dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}], + startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], + leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}], + feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], }, roleShowflag: false, roleShowflagOne: false, @@ -700,6 +709,8 @@ export default { this.isSubmit = false }) }) + } else { + this.$message.warning('请完成流程信息的人员选择') } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 7a8f68681..852c4b869 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -269,7 +269,9 @@ export default { engineerUserId: '', engineerUser: '', }, - roleFormRules: {}, + roleFormRules: { + engineerUser: [{required: true, message: "选择法规工程师", trigger: ['blur', 'change']}], + }, upDialog: false, upThemeDialog: false, diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 924b557b6..7bcecba5d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -378,7 +378,11 @@ export default { engineerUserId: '', }, roleFormRules: { - dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] + dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}], + startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}], + leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}], + feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}], + engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}], }, deleteDataList: [], From c3a648566bed7d133027e71d91552e89e7c0024e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 5 Nov 2021 18:01:47 +0800 Subject: [PATCH 02/17] commit --- .../components/workingGroup1/index.vue | 298 +++++++++++++++ .../components/workingGroup2/index.vue | 324 ++++++++++++++++ .../workingGroup/index.vue | 349 +++--------------- 3 files changed, 665 insertions(+), 306 deletions(-) create mode 100644 src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue create mode 100644 src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue new file mode 100644 index 000000000..89d6116d9 --- /dev/null +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -0,0 +1,298 @@ + + + + + diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue new file mode 100644 index 000000000..2e65282c6 --- /dev/null +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue index c5a47ff1b..ff3e1afcc 100644 --- a/src/pages/regulatoryRepository/workingGroup/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/index.vue @@ -1,325 +1,62 @@ From 6485222f0e72f7e41ce24e5c8c92fab4f384a2bc Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sat, 6 Nov 2021 23:17:10 +0800 Subject: [PATCH 03/17] feat: There is no way the,Laws --- .../searchCenter/pages/standardSearch.vue | 140 ++++++++++++------ 1 file changed, 96 insertions(+), 44 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 7ec74b0a1..a3e724097 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -34,10 +34,10 @@
{{ condition.title }}
    -
  • - {{ conditionOpt.label }} - ({{ conditionOpt.number}}) - +
  • + {{ conditionOpt.label }} + ({{ conditionOpt.number}}) +
{{ condition.isClose ? '展开' : '收缩' }}
@@ -366,11 +366,11 @@ module: ['all'] }, seniortypeAll: ['selectIndex'], - seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'], - seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD'], + seniortypeStand: ['selectIndex', 'standSort', 'category', 'nature', 'standState', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD','NYLX','NYLXCLASS'], + seniortypeBuss: ['selectIndex', 'country', 'standSort', 'category', 'nature', 'standState', 'textStatus', 'applyArctic', 'applyAuth', 'CLLX', 'CBCD', 'ZRLX', 'CYSD','NYLX','NYLXCLASS'], // seniortypeLaws: ['selectIndex', 'country', 'SYCLLX', 'ZRLX', 'WSSFCY'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样 seniortypeLaws: ['selectIndex', 'lawsSyqy', 'lawsSycx', 'CYSDLAWS'], // 政策的适用车辆类型、我司是否参与 和 国内的字段不一样 - seniortypeEnterprise : ['selectIndex','BUSSSTATE','ORGLIST'], + seniortypeEnterprise : ['selectIndex','standSort','CLLX','BUSSSTATE','ORGLIST','NYLXCLASS','NYLX'], seniortypeMsg: ['selectIndex', 'module'], // 检索选项 searchOptions: { @@ -405,6 +405,38 @@ index: 0 } }, + searchOptions2: { + selectIndex: { + title: '资源类型', + options: [ + { + label: '全部', + value: 'All' + }, + { + label: '国内标准法规', + value: 'stand' + }, + { + label: '海外标准法规', // value没改 + value: 'bussstand' + }, + { + label: '国内外政策', + value: 'laws' + }, + { + label: '企业标准', + value: 'enterprise' + } + // { + // label: '资料中心', + // value: 'msgdyinfo' + // } + ], + index: 0 + } + }, // 展开条件 conditionBtnOpen: false, saveRoleBuss: [], @@ -433,6 +465,13 @@ } }, methods: { + optionsFun(items){ + if(Object.prototype.toString.call(items) === '[object Object]'){ + return items; + } + const list = items.filter ( item => !item.type || item.type === this.selectIndex); + return list + }, checkItems (item) { this.itermsConditionsFlag = true this.itermsConditionsTitle1 = item.textContent @@ -878,30 +917,12 @@ // 检索栏每一项回显数字 if (seniortype[i] === 'standSort') { renameType = 'standSort' - }else if (seniortype[i] === 'applyArctic') { - renameType = 'apply_arctic' - } else if (seniortype[i] === 'energyKind') { - renameType = 'energy_kind' - } else if (seniortype[i] === 'applyAuth') { - renameType = 'apply_auth' - } else if (this.selectIndex === 'laws' && seniortype[i] === 'CLLX') { - renameType = 'SYCLLX' - } else if (this.selectIndex === 'laws' && seniortype[i] === 'CYSD') { - renameType = 'WSSFCY' - } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'ORGLIST'){ - renameType = 'QCDW' - } else if (this.selectIndex === 'enterprise' && seniortype[i] === 'BUSSSTATE'){ - renameType = 'textStatusBuss' - }else if (this.selectIndex === 'bussstand' && seniortype[i] === 'standState'){ - renameType = 'textStatus' - }else { + }else{ renameType = seniortype[i] } - console.log(renameType) let resultsubdata = resultdata[renameType] || {} let countAll = 0 if (nowdata) { - console.log(nowdata) for (let ji = 0; ji < nowdata.length; ji++) { if (resultsubdata[nowdata[ji].value] === undefined) { nowdata[ji].number = 0 @@ -1055,6 +1076,36 @@ case 'CYSDLAWS': option.title = '我司参与深度' option.index = 18 + case 'NYLXCLASS': + option.title = '能源类型' + option.index = 19 + } + if(key === 'STANDCLASSIFY'){ + const standVerify = ["GB","GB/T","QC/T","JT","JB","GA","GJB","HJ"]; + const standEnVerify = ["ECE","EU","EC","EEC","ISO","IEC","GTR","CFR", + "JASO","JIS","GSO","GOST","ΓOCT","TP","SASO","UAE","CONTRAN","DENATRAN", + "ABNT NBR","NBR","INMETRO","CONAMA","Normative Instruction","ADR"]; + const bussStandVerify = ["Q/FT A","Q/FT B","Q/FT E","Q/FT F","Q/FT G","Q/FT M", + "Q/FT Q","Q/FT R","Q/FT S","Q/FT T","Q/FT V","Q/FT X","Q/FT Y","Q/FT Z","Q/QCBFC"]; + if(data[key]){ + console.log(data[key]) + const list = [] + data[key].forEach( data => { + const listFilter1 = standVerify.filter ( item => item === data.label); + if(listFilter1 && listFilter1.length > 0){ + list.push({label:data.label,value:data.value,type:'stand'}); + } + const listFilter2 = standEnVerify.filter ( item => item === data.label); + if(listFilter2 && listFilter2.length > 0){ + list.push({label:data.label,value:data.value,type:'bussstand'}); + } + const listFilter3 = bussStandVerify.filter ( item => item === data.label); + if(listFilter3 && listFilter3.length > 0){ + list.push({label:data.label,value:data.value,type:'enterprise'}); + } + }) + data[key] = list + } } option.showOpenBtn = false option.options = data[key] @@ -1102,9 +1153,9 @@ // filterOptions.standState.title = '标准状态' // filterOptions.standState.index = 2 // 我司参与状态 - filterOptions.CYSD = originOptions.CYSD - filterOptions.CYSD.title = '我司参与深度' - filterOptions.CYSD.index = 2 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 // 监管类型 // filterOptions.ZRLX = originOptions.ZRLX // filterOptions.ZRLX.title = '监管类型' @@ -1142,9 +1193,9 @@ // filterOptions.standSort.options = [{label: '全部', value: 'all'}] filterOptions.standSort.index = 1 // 标准状态 - filterOptions.standState = originOptions.WBZTCLASS - filterOptions.standState.title = '文本状态' - filterOptions.standState.index = 2 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 // 我司参与状态 // filterOptions.CYSD = originOptions.CYSD // filterOptions.CYSD.title = '我司参与深度' @@ -1162,14 +1213,16 @@ break // 企业标准 case 'enterprise': - //标准状态 - filterOptions.BUSSSTATE = originOptions.TEXTSTATUSBUSS - filterOptions.BUSSSTATE.title = '文本状态' - filterOptions.BUSSSTATE.index = 1 - //主起草部门 - filterOptions.ORGLIST = originOptions.QCDW - filterOptions.ORGLIST.title = '主起草部门' - filterOptions.ORGLIST.index = 2 + // 标准类别 + filterOptions.standSort = originOptions.standSort + filterOptions.standSort.index = 1 + // 我司参与状态 + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 2 + // 适用车辆类型 + filterOptions.CLLX = originOptions.CLLX + filterOptions.CLLX.index = 3 break // 资料中心 case 'msgdyinfo': @@ -1265,6 +1318,7 @@ } }, searchSarBykey () { + console.log(this.searchOptions) let searchCondition = this.searchCondition let condition = {} let searchKeys = Object.keys(this.searchOptions) @@ -1282,15 +1336,12 @@ if (condition.selectIndex === 'bussstand') { condition.selectIndex = 'stand' condition.standType = 'FOREIGN' - condition.textStatus = condition.standState } else if (condition.selectIndex === 'stand') { condition.standType = 'INLAND' } if(condition.selectIndex === 'enterprise'){ condition.selectIndex='bussstand' condition.standType = 'bussstand' - condition.textStatusBuss = condition.BUSSSTATE - condition.QCDW = condition.ORGLIST } // 查询为国内外政策时，改变查询参数名 if (condition.selectIndex === 'laws') { @@ -2500,7 +2551,7 @@ this.filterOptions(val).then(() => { this.resultColumns = this.getResultColumns() this.$nextTick(() => { - let options = this.searchOptions + let options = this.optionsFun(this.searchOptions) for (let key in options) { let dom = document.getElementsByClassName(key) if ($(dom).height() > 38) { @@ -2510,6 +2561,7 @@ } }) }) + this.searchCondition['standSort'].splice(0, 1, 'all') } }, mounted () { From 370b03c6151e7b4d77dd0543e3523e42382519f0 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Sun, 7 Nov 2021 11:31:04 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/index.vue | 5 +++-- .../localProductsOrProjectLibrary/pages/details.vue | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue index da31f68c8..9e7cdd3d6 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue @@ -882,7 +882,7 @@ export default { this.probaseOptions = res.data.PROBASE; this.productTypeOptions = res.data.XMLB; this.targetMarketOptions = res.data.SCXX; - }); + }) }, // 更多 handleCommand(command) { @@ -1541,6 +1541,7 @@ export default { } }, created() { + console.log(this.productTypeOptions) this.getDept().then(res => { this.getUser(res); }, e => { @@ -1590,7 +1591,7 @@ export default { } /deep/ .pagination { - position: relative; + position: absolute; } .row-col-box { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 6a1a49764..06c924df7 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -453,7 +453,7 @@
- +
Date: Sun, 7 Nov 2021 14:14:23 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BA=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8E=20=E8=B5=8B=E5=80=BC?= =?UTF-8?q?=E5=88=B0=E6=8F=90=E4=BA=A4=E7=9A=84=E8=A1=A8=E5=8D=95=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step4.vue | 96 ++++++++----------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 95668c70b..ad5702bcb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -1217,6 +1217,7 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-change="fileChange" + :on-remove="removeOneFile" :show-file-list="true" >
@@ -2007,6 +2008,7 @@ export default { } },removeOneFile(file, fileList) { + switch (this.fileType){ case 'fbgbjbd': this.FBGBJBDFileList=fileList; @@ -2032,6 +2034,12 @@ export default { case 'ca': this.caFileList=fileList; break; + case 'zbjbd': + this.zbjbdFileList=fileList + break; + case 'glwj': + this.glwjFileList=fileList + break default : ; } }, @@ -2324,70 +2332,42 @@ export default { }, fileInfoHandle(){ - if(this.fileType === 'fbgbjbd'){ - this.FBGBJBDFileList=fileList; - this.form.fbgbjbd += response.data.id+','; - if( this.form.fbgbjbdName=== undefined){ - this.form.fbgbjbdName='' - } - this.form.fbgbjbdName += response.data.name+','; - }else if(this.fileType === 'xgd'){ - this.xgdFileList=fileList; - console.log(this.xgdFileList) + //拼接文件名和id 提交到流程Activity + this.form.fbgbjbd=this.FBGBJBDFileList.map(item => item.response.data.id).join(",") + this.form.fbgbjbdName=this.FBGBJBDFileList.map(item => item.name).join(",") - this.form.xgd += response.data.id+','; - if( this.form.xgdName=== undefined){ - this.form.xgdName='' - } - this.form.xgdName += response.data.name+','; - }else if(this.fileType === 'bpg'){ - this.bpgFileList=fileList; - this.form.bpg += response.data.id+','; - if( this.form.bpgName=== undefined){ - this.form.bpgName='' - } - this.form.bpgName += response.data.name+','; - }else if(this.fileType === 'ssg'){ - this.ssgFileList=fileList; - this.form.ssg += response.data.id+','; - if( this.form.ssgName=== undefined){ - this.form.ssgName='' - } - this.form.ssgName += response.data.name+','; - }else if(this.fileType === 'zqyjg'){ - this.zqyjgFileList=fileList; - this.form.zqyjg += response.data.id+','; - if( this.form.zqyjgName=== undefined){ - this.form.zqyjgName='' - } - this.form.zqyjgName += response.data.name+','; - }else if(this.fileType === 'jdwj'){ - this.jdwjFileList=fileList; - this.form.jdwj += response.data.id+','; - if( this.form.jdwjName=== undefined){ - this.form.jdwjName='' - } - this.form.jdwjName += response.data.name+','; - }else if(this.fileType === 'kwj'){ - this.kwjFileList=fileList; - this.form.kwj += response.data.id+','; - if( this.form.kwjName=== undefined){ - this.form.kwjName='' - } - this.form.kwjName += response.data.name+','; - }else if(this.fileType === 'ca'){ - this.caFileList=fileList; - this.form.ca += response.data.id+','; - if( this.form.caName=== undefined){ - this.form.caName='' - } - this.form.caName += response.data.name+','; - } + this.form.xgd=this.xgdFileList.map(item => item.response.data.id).join(",") + this.form.xgdName=this.xgdFileList.map(item => item.name).join(",") + + this.form.bpg=this.bpgFileList.map(item => item.response.data.id).join(",") + this.form.bpgName=this.bpgFileList.map(item => item.name).join(",") + + this.form.ssg=this.ssgFileList.map(item => item.response.data.id).join(",") + this.form.ssgName=this.ssgFileList.map(item => item.name).join(",") + + this.form.zqyjg=this.zqyjgFileList.map(item => item.response.data.id).join(",") + this.form.zqyjgName=this.zqyjgFileList.map(item => item.name).join(",") + + this.form.jdwj=this.jdwjFileList.map(item => item.response.data.id).join(",") + this.form.jdwjName=this.jdwjFileList.map(item => item.name).join(",") + + this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",") + this.form.kwjName=this.kwjFileList.map(item => item.name).join(",") + + this.form.ca=this.caFileList.map(item => item.response.data.id).join(",") + this.form.caName=this.caFileList.map(item => item.name).join(",") + + this.form.zbjbd=this.zbjbdFileList.map(item => item.response.data.id).join(",") + this.form.zbjbdName=this.zbjbdFileList.map(item => item.name).join(",") + + this.form.glwj=this.glwjFileList.map(item => item.response.data.id).join(",") + this.form.glwjName=this.glwjFileList.map(item => item.name).join(",") }, handleSubmit() { this.form.country=this.countryArr; this.$refs['form'].validate((valid) => { if (valid) { + this.fileInfoHandle(); this.isSubmit = true this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion From b4c9475132c5075964a1c3137e70c22863e68fc3 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Sun, 7 Nov 2021 14:52:34 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7,=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=90=8D=E7=A7=B0=E5=88=86=E5=BC=80=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 35 ++++++++++++------- .../foreignStandardsAndRegulations/index.vue | 33 ++++++++++------- 2 files changed, 43 insertions(+), 25 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index efdb5d22c..614be7aaf 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -73,19 +73,27 @@
- - - - - - + + + + + + + + + + + + + +
- - - - - - + + + + + + + + + + + + + + Date: Sun, 7 Nov 2021 16:01:30 +0800 Subject: [PATCH 07/17] feat: There is no way the,es --- .../searchCenter/pages/standardSearch.vue | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index a3e724097..f892ae472 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -36,7 +36,7 @@
  • {{ conditionOpt.label }} - ({{ conditionOpt.number}}) + ({{ conditionOpt.number}})
@@ -739,6 +739,8 @@ * @date: 2018/12/19 11:38:21 */ optChecked (key, value) { + console.log(value) + console.log(this.selectIndex) if (value === 'All') { this.AllCheck = true // 点击全部-显示分页 @@ -775,12 +777,18 @@ index: 0 } } + let originOptions = this.searchOriginOptions + this.searchOptions.NYLXCLASS = originOptions.NYLXCLASS + this.searchOptions.NYLXCLASS.title = '能源类型' + this.searchOptions.NYLXCLASS.index = 1 + // 适用车辆类型 + this.searchOptions.CLLX = originOptions.CLLX + this.searchOptions.CLLX.index = 2 this.searchCondition.selectIndex = ['All'] + this.selectIndex = value this.searchSarByInputKey() + this.$forceUpdate() } else { - this.AllPage = false - this.Allitems = [] - this.AllCheck = false let index = this.searchCondition[key].indexOf(value) // 资源类型为单选且必选 if (key !== 'selectIndex') { @@ -876,6 +884,12 @@ this.searchCondition[key].splice(0, 1, value) } } + this.AllPage = this.selectIndex === 'All' ? true : false + this.Allitems = [] + this.AllCheck = this.selectIndex === 'All' ? true : false + if (this.selectIndex === 'All'){ + this.searchSarByInputKey() + } } }, // 统计搜索条件结果个数 @@ -1257,6 +1271,12 @@ if (filterOptions.module) { filterOptions.module.options = [] } + filterOptions.NYLXCLASS = originOptions.NYLXCLASS + filterOptions.NYLXCLASS.title = '能源类型' + filterOptions.NYLXCLASS.index = 1 + // 适用车辆类型 + filterOptions.CLLX = originOptions.CLLX + filterOptions.CLLX.index = 2 break } this.searchOptions = filterOptions @@ -1287,13 +1307,19 @@ if (this.keywords === undefined) { this.keywords = '' } - const Alllist = { - selectIndex: 'fulltextserch', - selectValue: this.keywords, - page: this.pageAll, - pageSize: this.$store.getters.userInfo.configContent + const AllList = {} + let searchCondition = this.searchCondition + let searchKeys = Object.keys(this.searchOptions) + for (let key in searchCondition) { + if (searchKeys.indexOf(key) !== -1) { + AllList[key] = searchCondition[key].join(',') === 'all' ? '' : searchCondition[key].join(',') + } } - this.$http.post('search/searchCenter/searchSarBykey', Alllist, { + AllList.selectIndex = 'fulltextserch' + AllList.selectValue = this.keywords + AllList.page = this.pageAll + AllList.pageSize = this.$store.getters.userInfo.configContent + this.$http.post('search/searchCenter/searchSarBykey', AllList, { _this: this, loading: 'resultLoading' }, res => { @@ -2562,6 +2588,8 @@ }) }) this.searchCondition['standSort'].splice(0, 1, 'all') + this.searchCondition['NYLXCLASS'].splice(0, 1, 'all') + this.searchCondition['CLLX'].splice(0, 1, 'all') } }, mounted () { From 4b181eafe43fa770537037b7e69ca72946ff9940 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Sun, 7 Nov 2021 16:37:20 +0800 Subject: [PATCH 08/17] commit --- src/pages/localTool/standardWarning.vue | 4 ++-- src/sysConfig/index.js | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 43c1a6c3b..019b2aa1b 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -326,8 +326,8 @@ :pageSize="pageConfig.oldStandPageSize" :total="pageConfig.count4" autoSize - @pageChange="page => handlePageChange('oldItems', page)" - @pageSizeChange="pageSize => handlePageSizeChange('oldItems', pageSize)"> + @pageChange="page => handlePageChange('oldStand', page)" + @pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)">
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 3d38d1c7b..23bedc3ed 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,9 +6,10 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -const devIp = '192.168.10.50' -// const devIp = '62.234.136.153' -const devInterfacePORT = '9999' +// const devIp = '192.168.10.249' +const devIp = '62.234.136.153' +// const devInterfacePORT = '9999' +const devInterfacePORT = '8033' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' // 配置 前端服务 From 70b1d5c43b524fc697870d70dd958c4e3083a28a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 7 Nov 2021 16:45:00 +0800 Subject: [PATCH 09/17] feat: There is no way the,Laws --- .../searchCenter/pages/standardSearch.vue | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index f892ae472..5dd1ca88d 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -1308,13 +1308,46 @@ this.keywords = '' } const AllList = {} + console.log(this.searchOptions) + console.log(this.searchCondition) let searchCondition = this.searchCondition let searchKeys = Object.keys(this.searchOptions) + console.log(searchCondition) + console.log(searchKeys) for (let key in searchCondition) { if (searchKeys.indexOf(key) !== -1) { - AllList[key] = searchCondition[key].join(',') === 'all' ? '' : searchCondition[key].join(',') + if(key !== 'CLLX' && key !== 'NYLXCLASS'){ + AllList[key] = searchCondition[key].join(',') === 'all' ? '' : searchCondition[key].join(',') + }else { + AllList[key] = searchCondition[key].join(',') === 'all' ? '' : searchCondition[key].join(',') + const list = AllList[key].split(",") + const listSum = [] + list.forEach(item =>{ + if(key === 'CLLX' && this.searchOptions.CLLX && this.searchOptions.CLLX.options){ + const ids = this.searchOptions.CLLX.options + ids.forEach(data =>{ + if(data.value === item){ + listSum.push(data.label) + } + + }) + }else if(key === 'NYLXCLASS' && this.searchOptions.NYLXCLASS && this.searchOptions.NYLXCLASS.options){ + const ids = this.searchOptions.NYLXCLASS.options + ids.forEach(data =>{ + if(data.value === item){ + listSum.push(data.label) + } + + }) + } + }) + AllList[key] = listSum.join(',') + } + } } + if(AllList[""]){ + } AllList.selectIndex = 'fulltextserch' AllList.selectValue = this.keywords AllList.page = this.pageAll From ed63d88addbc94a37b3c7be88f748db4bdd833d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Sun, 7 Nov 2021 16:49:03 +0800 Subject: [PATCH 10/17] commit --- .../pages/creatProcess/xmpg2/step1-1.vue | 5 ++++ .../pages/creatProcess/xmpg2/step1.vue | 5 ++++ .../pages/creatProcess/xmpg2/step3.vue | 6 ++++- .../pages/creatProcess/xmpg2/step5.vue | 2 ++ .../pages/creatProcess/xmqdqr/step2.vue | 25 ++++++++++++++----- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 779a2bd7a..c42bee374 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -515,6 +515,11 @@ export default { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { _this: this }, res => { + res.data.records.forEach(item => { + if(item.zrbm === "[]"){ + item.zrbm = '' + } + }) this.listForm.dataList = res.data.records; this.dataList = res.data.records; let ids = []; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index b192d5f89..fbf732ac1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -525,6 +525,11 @@ export default { this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, { _this: this }, res => { + res.data.records.forEach(item => { + if(item.zrbm === "[]"){ + item.zrbm = '' + } + }) this.listForm.dataList = res.data.records; this.dataList = res.data.records; this.listForm.dataList.forEach(item => { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue index 842ceab23..4e770b15a 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue @@ -337,7 +337,6 @@ export default { }, // 点击查看 handlePreview(item) { - console.log(item); let routeUrl = this.$router.resolve({ name: "OtherStandardDetails", params: { @@ -400,6 +399,11 @@ export default { this.listForm["id"] = item.id; this.listForm.dataList = item.dataList; this.dataList = item.dataList; + this.dataList.forEach(item => { + if(item.zrbm === "[]"){ + item.zrbm = '' + } + }) this.dataList.distributePerson = item.dataList[0].distributePerson; this.listForm.breakdownList = item.breakdownList; } else { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 2b1b5616d..141206bc9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -407,6 +407,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { this.listForm = JSON.parse(JSON.stringify(item)); if (item.form === undefined) { @@ -472,6 +473,7 @@ export default { //提交事件 handleSubmit() { this.isSubmit = true; + console.log(this.dataList); this.listForm.commentText = this.commentText; this.listForm.children = this.dataList[0].children this.listForm.dataList = this.dataList diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 2ad37bfa7..66fd6aece 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -382,21 +382,34 @@
+ + + + + + + + + + + + + + + + Date: Sun, 7 Nov 2021 17:03:19 +0800 Subject: [PATCH 11/17] commit --- .../pages/creatProcess/xmpg2/step6.vue | 713 ++++++++++-------- 1 file changed, 387 insertions(+), 326 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 3fff5346e..376ac71f1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -44,7 +44,8 @@
- 批量编辑 + 批量编辑
@@ -121,206 +122,206 @@ {{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }} - - - - - -

{{ @@ -1360,8 +1369,8 @@ filters: { ellipsis (value) { if (!value) return '' - if (value.length > 25) { - return value.slice(0,25) + '...' + if (value.length > 18) { + return value.slice(0,18) + '...' } return value } @@ -3142,6 +3151,31 @@ @import '~@/assets/styles/mixins'; @import '~@/assets/styles/style'; + /deep/ .decomposition-btn { + position: absolute; + top: 6px; + right: 0; + padding: 0 10px; + height: 30px; + line-height: 30px; + font-size: 14px; + color: #07C160; + border: 1px solid #07C160; + background: rgba(1, 193, 96, 0.1); + + /deep/ .icon-separate { + display: inline-block; + margin-right: 3px; + width: 16px; + height: 16px; + background-repeat: no-repeat; + background-size: 100% 100%; + background-position: center center; + vertical-align: sub; + background-image: url("~assets/images/shangqi/standardDetails/separate.png"); + } + } + /deep/ .el-collapse-item__content { padding-bottom: 0px; font-size: 13px; From 3c35c536e7cd79ce50b1b14ee5515475a1d46f4e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 7 Nov 2021 21:53:00 +0800 Subject: [PATCH 13/17] feat: There is no way the,Laws --- .../details/otherStandardDetails/index.vue | 82 ++++++++++++++++--- 1 file changed, 69 insertions(+), 13 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 42e4a956c..ce703e2fa 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -57,7 +57,7 @@

{{ @@ -134,7 +137,7 @@

@@ -180,7 +183,7 @@
@@ -362,7 +365,7 @@