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/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/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue index d30c6b433..2d5af9288 100644 --- a/src/pages/config/pages/postManage/index.vue +++ b/src/pages/config/pages/postManage/index.vue @@ -1,6 +1,30 @@ @@ -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 => { }) }) 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 }}

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)+'...'}} 0){ this.sarBussionessStandEO.VPPSBMBUSS = checkedData.map(item => item.code).join(",") - this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") this.sarBussionessStandEO.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") + this.sarBussionessSearch.VPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.sarBussionessSearch.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") }else { this.sarBussionessStandEO.VPPSBMBUSS = checkedData.code - this.sarBussionessSearch.VPPSBMBUSS = checkedData.code this.sarBussionessStandEO.VPPSCNBUSS = checkedData.chineseName + this.sarBussionessSearch.VPPSBMBUSS = checkedData.code + this.sarBussionessSearch.VPPSCNBUSS = checkedData.chineseName } } this.modalShowFlag2 = false @@ -3401,10 +3403,10 @@ export default { this.SarExportSearchEo = item } // 处理我的收藏和个性化标签传参 - if (this.selectSarMenu.id === 'wdsc') { + if (this.selectSarMenu.id === 'qbwdsc') { this.sarBussionessSearch.menuId = undefined this.sarBussionessSearch.labelMenuId = undefined - this.sarBussionessSearch.collectMenuId = 'wdsc' + this.sarBussionessSearch.collectMenuId = 'qbwdsc' } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') { this.sarBussionessSearch.menuId = undefined this.sarBussionessSearch.labelMenuId = this.selectSarMenu.id diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index f21b9a182..68a96826e 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -21,7 +21,9 @@ default-expand-all :expand-on-click-node="false"> - {{ node.label}} + + {{ node.label}} + {{ node.label.substring(0,15)+'...'}} diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index 8168842a6..55098a164 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -39,9 +39,9 @@ {{ $t("m.standAll") }} - - {{ $t("m.lawsAll") }} - + + + {{ $t("m.enterpriseStandard") }} @@ -1502,8 +1502,10 @@ export default { if(checkedData) { if(checkedData.length > 0){ this.standForm.VPPSBMBUSS = checkedData.map(item => item.code).join(",") + this.standForm.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",") }else { this.standForm.VPPSBMBUSS = checkedData.code + this.standForm.VPPSCNBUSS = checkedData.chineseName } } this.modalShowFlag2 = false 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'