From 88fbde8b51b09cb84eb46c26130860eb03f2a180 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 14:09:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3bug=20#45290?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 18 ++-- .../pages/creatProcess/bzrk/step2.vue | 28 +++++-- .../pages/creatProcess/bzrk/step3.vue | 28 +++++-- .../pages/creatProcess/bzrk/step4.vue | 27 ++++-- .../domesticStandardsAndRegulations/index.vue | 9 +- .../foreignStandardsAndRegulations/index.vue | 83 ++++++++++--------- 6 files changed, 120 insertions(+), 73 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 72064daeb..73d8c3e67 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -532,11 +532,15 @@ > - + + + @@ -1331,6 +1335,8 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -2011,6 +2017,8 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 我司署名人 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 78391027b..9d3675641 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -361,12 +361,15 @@ > - + + + @@ -437,8 +440,13 @@ - - + @@ -811,6 +819,8 @@ categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -1006,6 +1016,8 @@ this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 6c87cb661..29007b56f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -354,12 +354,15 @@ > - + + + @@ -430,8 +433,13 @@ - - + @@ -803,6 +811,8 @@ export default { categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -994,6 +1004,8 @@ export default { this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 7dd189237..7b4087fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -519,11 +519,15 @@ > - + + + @@ -594,8 +598,13 @@ - - + @@ -1173,6 +1182,8 @@ export default { categoryOptions: [], // 能源类型 applyAuthOptions: [], // 适用认证 cysdOptions: [], // 我司参与深度 + wssmrOptions: [], // 我司署名人 + qcdwOptions: [], // 起草单位 sycpxOptions: [], // 适用产品线 zrbmOptions: [], // 责任部门 zrgcsOptions: [], // 责任工程师 @@ -1602,6 +1613,8 @@ export default { this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.wssmrOptions = res.data.WSSMR // 我司署名人 + this.qcdwOptions = res.data.QCDW // 起草单位 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 9b46f8ae4..38a043c73 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -3713,11 +3713,12 @@ export default { this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { if(item.attrField === 'WSSMR'){ - const options = [ - {label:"署名人1",value:"1"},{label:"署名人2",value:"2"} - ] return Object.assign({}, item, { - options: options + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] }) }else if(item.attrField === 'CYSD'){ return Object.assign({}, item, { diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 12f3fabf4..96ec1a812 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3591,50 +3591,51 @@ export default { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - if(item.attrField === 'WSSMR'){ - const options = [ - {label:"署名人1",value:"1"},{label:"署名人2",value:"2"} - ] - return Object.assign({}, item, { - options: options - }) - }else if(item.attrField === 'CYSD'){ + if(item.attrField === 'WSSMR'){ + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + }else if(item.attrField === 'QCDW'){ + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + }else if(item.attrField === 'CYSD'){ return Object.assign({}, item, { options: this.allSelectOptions["WSCYSD"] }) - }else if(item.attrField === 'CLLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ENERGYTYPES"] - }) - }else if(item.attrField === 'NYLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["NYLXCLASS"] - }) - }else if(item.attrField === 'SYCPX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYCPXCLASS"] - }) - }else if(item.attrField === 'SYRZ'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYRZCLASS"] - }) - }else if(item.attrField === 'ZRBM'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRBMCLASS"] - }) - }else if(item.attrField === 'ZRGCS'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRGCSCLASS"] - }) - }else if(item.attrField === 'TXLB'){ - return Object.assign({}, item, { - options: this.allSelectOptions["TXLBCLASS"] - }) - }else { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) - } + }else if(item.attrField === 'CLLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + }else if(item.attrField === 'NYLX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + }else if(item.attrField === 'SYCPX'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + }else if(item.attrField === 'SYRZ'){ + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + }else if(item.attrField === 'ZRBM'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + }else if(item.attrField === 'ZRGCS'){ + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + }else if(item.attrField === 'TXLB'){ + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + }else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } } else { return item } From 44e0d3c5855f1a1cfbcda8e973b1082e3d87b327 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 19 Jul 2021 14:12:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standLawsAttrManage/pages/standLawsAttrDetails.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue index 04eb43e8e..47450ec7e 100644 --- a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue +++ b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue @@ -26,14 +26,14 @@
新增 查看
- 编辑 - 删除 + 编辑 + 删除 From 5cf729ce4637ddc3c75e232c6fe660f630ec2eef Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 19 Jul 2021 14:35:38 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=8F=91=E5=B8=83?= =?UTF-8?q?=20bug=2079825?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home1/components/release/index.vue | 17 ++++++++++++++--- src/pages/home1/index.vue | 6 +++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue index ec4dd0162..ae97964bb 100644 --- a/src/pages/home1/components/release/index.vue +++ b/src/pages/home1/components/release/index.vue @@ -3,8 +3,8 @@
@@ -28,6 +28,17 @@ export default { this.getAdvice() }, methods: { + // 点击查看 + handlePreview (item) { + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: item.standType + '_STAND' + } + }) + window.open(routeUrl.href, '_blank') + }, //截取时间 getDate (date) { return date != null ? date.substring(0, date.indexOf(' ')) : '' @@ -37,7 +48,7 @@ export default { let obj = {} obj.msgType = 'RESOURCE' obj.rowLimit = 8 - this.$http.get('lawss/msgDynamicInfo/page', obj, { + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', obj, { _this: this }, res => { this.standardReleaseList = res.data.list diff --git a/src/pages/home1/index.vue b/src/pages/home1/index.vue index b622318c8..7d097d8de 100644 --- a/src/pages/home1/index.vue +++ b/src/pages/home1/index.vue @@ -31,9 +31,9 @@ - - - + + + From 4ae7335a24ec0134d69ab6680d84e464b4e46292 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 19 Jul 2021 15:27:18 +0800 Subject: [PATCH 4/9] commit --- .../pages/components/ProcessMixin.vue | 30 +++++-- .../pages/creatProcess/bzdy/step1.vue | 3 +- .../pages/creatProcess/bzzqyj/step1.vue | 83 ++++++++++--------- .../pages/creatProcess/bzzqyj/step3.vue | 2 +- .../pages/creatProcess/bzzqyj/step7.vue | 3 - .../pages/creatProcess/bzzqyj/step8.vue | 3 - .../pages/creatProcess/bzzqyj/step9.vue | 3 - .../processCenter/pages/newProcess/index.vue | 4 +- 8 files changed, 74 insertions(+), 57 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 150749f60..bd5db2fb6 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -9,13 +9,33 @@ export default { return { processTypeList: [ { - label: '标准入库流程', + label: '标准调研流程', + value: '2' + }, + { + label:'标准入库流程', value: '1' }, - { - label:'标准清单发布流程', - value: '3' - }, + { + label:'标准征求意见流程', + value: '3' + }, + { + label:'标准清单发布/更新流程', + value: '6' + }, + { + label: '项目合规评估流程', + value: '7' + }, + { + label: '未符合项整改流程', + value: '8' + }, + { + label: '标准解读流程', + value: '9' + }, ], formDisableFlag: false, pickerOptions: { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index fd4a84a06..b63a411c5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -441,11 +441,12 @@ export default { this.$message.success('流程发起成功') this.$router.push('/processCenter') } + this.isSubmit = false }) } else { + this.isSubmit = false this.$message.warning('流程启动失败') } - this.isSubmit = false }) } else { return this.$message.warning('请完善人员信息') diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index de3c10b13..4189c2423 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -26,7 +26,7 @@
- 选择征求意见 + 选择标准
@@ -164,46 +164,46 @@ >
-
- - - - - - - - - - - - - - - - - - - - + + + + + + + {{ opt.label }} + + + + + + + + + + + 查询--> - - - - - - + @click="sarStandCompareHisInfo">查询 + 清空 + +
@@ -332,10 +332,9 @@ export default { }, // 标准征求意见数据可库 standCommonlySearch: { - // categorg: '', - // cname: '', - // start: '', - // end: '', + standSort: '', + standNumber: '', + standType: '', page: 1, pageSize: this.$store.getters.userInfo.configContent }, @@ -383,6 +382,7 @@ export default { label: 'name' }, roleRow: {}, + standSortOptions: [], } }, components: { @@ -393,6 +393,12 @@ export default { mounted () { this.getTree() this.sarStandCompareHis() + this.$http.get('sys/dictype/getDicTypeListCode', '', { + _this: this + }, res => { + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + }, e => { + }) this.tableHeight = $('.content').height() - 44 window.onresize = () => { this.tableHeight = $('.content').height() - 44 @@ -408,15 +414,14 @@ export default { // 清空 clearSearchStand () { this.standCommonlySearch.page = 1 - this.standCommonlySearch.start = '' - this.standCommonlySearch.end = '' - this.standCommonlySearch.categorg = '' - this.standCommonlySearch.cname = '' + this.standCommonlySearch.standSort = '' + this.standCommonlySearch.standNumber = '' + this.standCommonlySearch.standType = '' this.sarStandCompareHis() }, // 搜索 sarStandCompareHisInfo() { - this.splitInfoPage = 1 + this.standCommonlySearch.page = 1 this.sarStandCompareHis() }, // 查询表格 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 137f08c2b..793a68287 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -234,7 +234,7 @@ handleSave() {}, handleSubmit() { if (this.data.length < 1) { - this.$message.warning('请输入征求意见搞') + this.$message.warning('请输入征求意见') } else { var a = 0 var b = 0 diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 5b85f6e87..4b003a4c5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -209,9 +209,6 @@ return '处理后上报' } }, - upload (row) { - console.log(row); - }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 755e59d0b..4a2cd66fd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -209,9 +209,6 @@ return '处理后上报' } }, - upload (row) { - console.log(row); - }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index c1af9cd25..f7756a3c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -209,9 +209,6 @@ return '处理后上报' } }, - upload (row) { - console.log(row); - }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index e67bc49f0..709ebe063 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -7,8 +7,8 @@
标准调研流程
标准入库流程
标准征求意见流程
-
标准需求(翻译)申请流程
-
标准发放申请流程
+ +
标准清单发布/更新流程
项目合规评估流程
未符合项整改流程
From 62a6db8e98345604a393e4c7cc60024116adbba5 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 19 Jul 2021 15:40:49 +0800 Subject: [PATCH 5/9] commit --- src/pages/processCenter/pages/creatProcess/bzdy/step1.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step7.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step8.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/bzdy/step9.vue | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index b63a411c5..c6005f448 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -343,11 +343,11 @@ export default { var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index 14af91974..b12708de0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -169,11 +169,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 00b5d764b..d4156d554 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -193,11 +193,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 13cb22e11..76ab545cb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -191,11 +191,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index e8cf6fc3e..a9fb712bb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -191,11 +191,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue index e7c97df17..2dcffae27 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue @@ -191,11 +191,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue index 4d56b7895..9d5374da9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue @@ -191,11 +191,11 @@ var fileSuffix = filename.substring(index1, index2) // const fileSuffix = file.name.split('.')[1] // 后缀名 // 判断上传文件格式 - if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { + if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') { return true } else { this.spinShow = false - this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件') + this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片') return false } // 判断文件上传大小 From ebed4570341aff907775179a7aa230ab6e446203 Mon Sep 17 00:00:00 2001 From: shen_yan_pu <1975145892@qq.com> Date: Mon, 19 Jul 2021 16:14:02 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standAutoSplit/pages/itemSplitInfo.vue | 48 +++++-------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index bcddb0367..7c38fa00b 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -37,10 +37,10 @@
导入 - 导出 - 删除 + 导出 + 删除 模板下载 - 批量复制 + 批量复制 合并条款 提交 审核 @@ -64,6 +64,7 @@ @@ -80,7 +81,6 @@ {{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}
- - - - - - - - - - - - + --> { this.sarAccessListDatas = res.data.records; + this.sarAccessListDatas.forEach(item => { + this.$set(item,'relateFile','') + }) this.sarAccessListTotal = res.data.total }, e => { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue index 2bcab6947..403e5e87a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue @@ -108,7 +108,7 @@ }} - @@ -117,14 +117,14 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - @@ -118,14 +118,14 @@ v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope }} - + --> - +

+ prop="issueTime" + align="center" + width="180px" + label="英文名称"> + prop="issueTime" + align="center" + width="180px" + label="适用车型"> + prop="issueTime" + align="center" + width="180px" + label="能源类型"> + prop="issueTime" + sortable + align="center" + width="210px" + label="标准实施日期"> + + + + + + + + + + + + + + @@ -484,7 +537,7 @@ export default { type: '', relateFile: '', remark: '', // 清单说明 - applicationScope: '' //适用领域 + // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 @@ -525,7 +578,7 @@ export default { sarAccessInfoSearch: { id: '', countryArea: '', // 国家 - applicationScope: '', //适用区域 + // applicationScope: '', //适用区域 keywords: '', // 关键字 detailedListName: '', //清单名称 applyArctic: '', // 能源种类 @@ -790,6 +843,7 @@ export default { uploadBackSuccess (res, file, fileList) { if (res.ok) { this.fileInfoList = fileList + console.log(this.fileInfoList) this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id this.$message.success('上传成功') } else { @@ -1122,7 +1176,7 @@ export default { let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') - sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') + // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // 判断是否有附件 if (this.fileInfoList.length > 0) { let relateFile = [] @@ -1130,6 +1184,7 @@ export default { relateFile.push(item.id) }) sarAccessEO.relateFile = relateFile.join(',') + console.log(sarAccessEO.relateFile) } if (!sarAccessEO.id) { // 新增 @@ -1140,10 +1195,15 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('新增成功') this.isNext = true this.$router.push({ - name: 'AccessStandardsAndRegulations' + name: 'AccessStandardsAndRegulations', + query: { + relateFile: sarAccessEO.relateFile + } }) + console.log(sarAccessEO) } }, e => { }) @@ -1154,6 +1214,7 @@ export default { loading: 'loadData' }, res => { if (res.ok) { + this.$message.success('编辑成功') this.isNext = true this.$router.push({ name: 'AccessStandardsAndRegulations' @@ -1376,8 +1437,8 @@ export default { this.sarAccessInfoList.push(nowstandinfo) this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number this.number++ - this.isSubmit = false this.$message.success('添加成功') + this.isSubmit = false } else { this.sarAccessInfoList.map((item, index) => { if (item.uuid === nowstandinfo.uuid) { @@ -1678,7 +1739,7 @@ export default { this.$nextTick(() => { this.sarAccessEO.type = accessRow.type this.sarAccessEO.countryArea = accessRow.countryArea.split(',') - this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') + // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',') this.sarAccessEO.detailedListName = accessRow.detailedListName this.sarAccessEO.id = accessRow.id this.sarAccessEO.remark = accessRow.remark || '' @@ -1768,4 +1829,4 @@ export default { margin: 2px; } } - \ No newline at end of file + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 644a3cbf6..ff7774729 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -26,13 +26,13 @@ title="下载" @click="downloadFile(item.id)" class="icon-download" - v-btn-permission="'E5QPKLR9CFVXTV64N32C'" + v-btn-permission="''" />

@@ -452,6 +452,7 @@ export default { }, // 请求上传的文件信息 getFileInfo() { + console.log(this.sarAccessEO) this.$http.get("att/attFile/getMultiFileInfos", { fileIds: this.sarAccessEO.relateFile }, { @@ -564,6 +565,7 @@ export default { mounted() { this.$nextTick(() => { let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); + console.log(accessRow) this.pageId = accessRow.id this.sarAccessEO = accessRow; this.selectInfobyAccid(); diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index aece23601..e2308f462 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -13,7 +13,7 @@ - +

+ align="center" + width="180px" + label="英文名称"> + + + + + align="center" + width="210px" + label="标准实施日期"> + + + + + width="180px" + align="center" + label="适用产品线"> + + + + + +