From 987f442c6467ea39ae3eeccd202773c4b01f1d2f Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 8 Sep 2021 17:27:47 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E8=AF=A6?= =?UTF-8?q?=E6=83=85->=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81->=E5=8F=B9?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 8a4d22587..8bb8a7bd5 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -63,7 +63,7 @@

+ >文本状态 {{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}

{{ From 17d53c28771264faef2a7ab6b97fb6c73f4f475a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 8 Sep 2021 17:47:42 +0800 Subject: [PATCH 2/6] commit --- src/pages/config/pages/mechanismManage/index.vue | 2 +- .../accessStandardsAndRegulations/pages/details.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue index 8d72796c6..07bfb775a 100644 --- a/src/pages/config/pages/mechanismManage/index.vue +++ b/src/pages/config/pages/mechanismManage/index.vue @@ -325,7 +325,7 @@ export default { watch: { filterText(val) { this.$refs.tree.filter(val); - } + }, }, mounted () { // 获取组织结构树 diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index 9527ef9ca..c8368e9f5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -16,7 +16,7 @@

- {{ sarAccessEO.countryArea }} + {{ sarAccessEO.countryAreaShow }}

From 6f7bab556cf605b649f7a82d3775c9e03840ecda Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 8 Sep 2021 17:57:03 +0800 Subject: [PATCH 3/6] commit --- .../details/otherStandardDetails/index.vue | 2 - src/pages/details/process/ruku/index.vue | 4 +- .../pages/creatProcess/bzdy/step1-1.vue | 82 ++++++++++++++++++ .../pages/creatProcess/bzdy/step1.vue | 85 ++++++++++++++++++- .../pages/creatProcess/bzdy/step2.vue | 12 +++ .../pages/creatProcess/bzdy/step3.vue | 12 +++ .../pages/creatProcess/bzdy/step4.vue | 12 +++ 7 files changed, 203 insertions(+), 6 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 8a4d22587..4afcc8a12 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3075,8 +3075,6 @@ export default { /*padding: 0 67px;*/ .details-content-modular { - margin-bottom: 20px; - .modular-header { display: flex; align-items: center; diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue index 6e82b6638..ee24e0886 100644 --- a/src/pages/details/process/ruku/index.vue +++ b/src/pages/details/process/ruku/index.vue @@ -5,7 +5,7 @@ {{ title }}
-
+
标准信息
@@ -2737,7 +2737,7 @@ export default { /deep/.details-content{ /*padding: 0 67px;*/ .details-content-modular{ - margin-bottom: 20px; + /*margin-bottom: 20px;*/ .modular-header{ display: flex; align-items: center; diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue index 9d1c8d3e1..dd7c2ab28 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue @@ -60,6 +60,28 @@
+ + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+
@@ -188,6 +210,26 @@
+ + +
+ +

点击或拖拽上传文件

+
+ +
@@ -201,6 +243,7 @@ name: "bzdyStep1-1", data() { return { + fileMadel2: false, nodeList: [], nodeList2: [], commentText: '', @@ -216,6 +259,8 @@ form: { title: '', // 调研标题 date: '', // 完成时间 + fjList: [], + fjNameList: '', modelList: [], modelNameList: '' }, @@ -362,6 +407,20 @@ }) this.form.modelNameList = list }, + importFileRemove2 (file, fileList) { + let list = '' + this.form.fjList = [] + fileList.forEach(item => { + this.form.fjList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.fjNameList = list + }, // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { @@ -383,9 +442,32 @@ }) } }, + importFileSuccess2 (response, file) { + if (response.ok) { + this.form.fjList.push(response.data) + let list = '' + this.form.fjList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.fjNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } + }, fileUpload () { this.fileMadel = true }, + fileUpload2 () { + this.fileMadel2 = true + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue index d0324a5ff..ec04289c7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue @@ -60,6 +60,28 @@ + + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+ @@ -169,7 +191,7 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - + + + +
+ +

点击或拖拽上传文件

+
+ + @@ -202,6 +244,7 @@ export default { name: "bzdyStep1", data() { return { + fileMadel2: false, commentText: '', nodeList: [], nodeList2: [], @@ -217,6 +260,8 @@ export default { form: { title: '', // 调研标题 date: '', // 完成时间 + fjList: [], + fjNameList: '', modelList: [], modelNameList: '' }, @@ -325,7 +370,6 @@ export default { if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') { return true } else { - this.spinShow = false this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件') return false } @@ -353,6 +397,20 @@ export default { }) this.form.modelNameList = list }, + importFileRemove2 (file, fileList) { + let list = '' + this.form.fjList = [] + fileList.forEach(item => { + this.form.fjList.push(item) + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.fjNameList = list + }, // 导入标准数据成功后执行 importFileSuccess (response, file) { if (response.ok) { @@ -374,9 +432,32 @@ export default { }) } }, + importFileSuccess2 (response, file) { + if (response.ok) { + this.form.fjList.push(response.data) + let list = '' + this.form.fjList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.form.fjNameList = list + this.$message({ + showClose: true, + message: response.message, + type: 'success' + }) + } + }, fileUpload () { this.fileMadel = true }, + fileUpload2 () { + this.fileMadel2 = true + }, handleTabs(name) { this.active = name }, diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue index b8f2b7825..0378c41da 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue @@ -50,6 +50,16 @@ - - + +
+
+ {{ item.name }} +
+
+
+ - - +
+ { let data = JSON.parse(res.mesg) + this.form.fjList = data.fjList || data.form.fjList this.form.modelList = data.modelList || data.form.modelList this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue index a3183f640..32e314426 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue @@ -50,6 +50,16 @@ - - + +
+
+ {{ item.name }} +
+
+
+ - - +
+ + +
+
+ {{ item.name }} +
+
+
+ - - +
+
{{ form.fileName }} @@ -172,6 +182,7 @@ title: '', // 调研标题 date: '', // 完成时间 modelList: [], + fjList: [], fileId: '', fileName: '', responUserList: '', @@ -259,6 +270,7 @@ this.form.file = data.fileId || data.form.fileId this.form.fileName = data.fileName || data.form.fileName this.form.modelList = data.modelList || data.form.modelList + this.form.fjList = data.fjList || data.form.fjList }).catch(e => { }) }) From 6ce3d151f170a2babc4285396c7cf37cbfd7b5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Wed, 8 Sep 2021 18:32:05 +0800 Subject: [PATCH 4/6] commit --- src/components/navMenu/index.vue | 10 +++++----- .../domesticStandardsAndRegulations/index.vue | 4 +++- .../foreignStandardsAndRegulations/index.vue | 4 +++- src/pages/searchCenter/pages/advancedSearch.vue | 6 +++--- src/pages/searchCenter/pages/standardSearch.vue | 8 ++++---- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index efa342053..54735c410 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -88,11 +88,11 @@ export default { path: '/domesticStandardsAndRegulations', menuId: '3e3657498664beaa0dc1de1ecb3ae0da' }, - { - title: '零部件编号申请', - path: '/partCodeApply', - menuId: 'ad9db496772c075f78495382b7581fe9' - }, + // { + // title: '零部件编号申请', + // path: '/partCodeApply', + // menuId: 'ad9db496772c075f78495382b7581fe9' + // }, // { // title: '标准法规工作组数据统计', // path: '/dataStatisComments', diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 06bb099c8..8f6ff8ccc 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -23,7 +23,9 @@ {{ node.label }} + :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"> + {{ node.label}} + {{ node.label.substring(0,15)+'...'}} - {{ node.label}} + + {{ node.label}} + {{ node.label.substring(0,15)+'...'}} {{ $t("m.standAll") }} - - {{ $t("m.lawsAll") }} - + + + {{ $t("m.enterpriseStandard") }} diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 219773ddf..0e4553666 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -388,10 +388,10 @@ label: '海外标准法规', // value没改 value: 'bussstand' }, - { - label: '国内外政策', - value: 'laws' - }, + // { + // label: '国内外政策', + // value: 'laws' + // }, { label: '企业标准', value: 'enterprise' From 7b048117f37308446ffa521885a3da5fe681ddc1 Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Wed, 8 Sep 2021 20:05:17 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8F=B7+=E7=B1=BB=E5=88=AB=20=E6=9A=82=E6=97=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreignStandardsAndRegulations/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index f21b9a182..0b5bda16c 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -164,7 +164,10 @@ label="标准号" > From 60e590d84bd2988687dee0202a0d819ffe5fc102 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 8 Sep 2021 20:34:46 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B8=85=E5=8D=95=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E6=A0=87=E5=87=86=E7=9A=84=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/addEdit.vue | 21 ++++++++ .../pages/otherAddEit.vue | 21 ++++++++ .../pages/projectAddEit.vue | 54 +++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 286380794..5a62053a6 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1149,6 +1149,27 @@ export default { addSarAccess() { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 5013827b8..b6b42a4eb 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -1097,6 +1097,27 @@ export default { addSarAccess () { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 8a5e45bd9..192ad0938 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -1097,6 +1097,27 @@ export default { addSarAccess() { //判断是否是清单类型 if (this.selectedAccInfoSearchList.length > 0) { + + //为空转换 + for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) { + //适用车型为空 + if (this.selectedAccInfoSearchList[i].typeApplicable === '[]'){ + this.selectedAccInfoSearchList[i].typeApplicable = null + } + //能源类型为空 + if (this.selectedAccInfoSearchList[i].nylx === '[]'){ + this.selectedAccInfoSearchList[i].nylx = null + } + //责任部门为空 + if (this.selectedAccInfoSearchList[i].zrbm === '[]'){ + this.selectedAccInfoSearchList[i].zrbm = null + } + //试用产品线为空 + if (this.selectedAccInfoSearchList[i].sycpx === '[]'){ + this.selectedAccInfoSearchList[i].sycpx = null + } + } + // 追加字段 this.selectedAccInfoSearchList.map(item => { let addList; @@ -1515,6 +1536,18 @@ export default { pageInfo() { StandardsInfoPage(this.sarAccessInfoSearch).then(res => { this.sarAccessInfoSearchList = res.data.list + + //为空转换 + for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { + //适用车型为空 + if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){ + this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null + } + //适用认证为空 + if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){ + this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null + } + } this.sarAccessInfoSearchList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber @@ -1995,6 +2028,27 @@ export default { _this: this }, res => { this.sarAccessInfoList = res.data.records + + //为空转换 + for (let i = 0; i < this.sarAccessInfoList.length; i++) { + //适用车型为空 + if (this.sarAccessInfoList[i].typeApplicable === '[]'){ + this.sarAccessInfoList[i].typeApplicable = null + } + //能源类型为空 + if (this.sarAccessInfoList[i].nylx === '[]'){ + this.sarAccessInfoList[i].nylx = null + } + //责任部门为空 + if (this.sarAccessInfoList[i].zrbm === '[]'){ + this.sarAccessInfoList[i].zrbm = null + } + //试用产品线为空 + if (this.sarAccessInfoList[i].sycpx === '[]'){ + this.sarAccessInfoList[i].sycpx = null + } + } + this.sarAccessInfoList.forEach(item => { if (item.standYear === null) { item.standNumber = item.standSortShow + ' ' + item.standNumber