diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js index 4cdab4b68..5f97e183f 100644 --- a/src/api/unqualProcess.js +++ b/src/api/unqualProcess.js @@ -21,7 +21,7 @@ export function roleTreeData(data) { // 上传文件 export function uploadFileText(data) { return axios({ - url: "api/att/attFile/upload", + url: "api/att/attFile/uploadNew", method: "get", params: data }); diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue index ff8417f28..ff7bece28 100644 --- a/src/components/CustomFormComponents/File.vue +++ b/src/components/CustomFormComponents/File.vue @@ -84,7 +84,7 @@ export default { data() { return { showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', defaultFileList: [], // 默认显示 showFileList: [], importModalshowflagtemp: false diff --git a/src/components/PutQuestionButton/index.vue b/src/components/PutQuestionButton/index.vue index 040f76794..13342f677 100644 --- a/src/components/PutQuestionButton/index.vue +++ b/src/components/PutQuestionButton/index.vue @@ -56,7 +56,7 @@ export default { }, data () { return { - uploadFileUrl: 'api/att/attFile/upload', + uploadFileUrl: 'api/att/attFile/uploadNew', newDialogVisible: false, submitLoading: false, newDialogForm: { diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue index 8d9f0facf..ffefb4bd5 100644 --- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue +++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationPage/index.vue @@ -329,8 +329,8 @@ export default { }], showMsgMode: false, showMode: false, - uploadFilePath: 'api/att/attFile/upload', - uploadFileListPath: 'api/att/attFile/upload', + uploadFilePath: 'api/att/attFile/uploadNew', + uploadFileListPath: 'api/att/attFile/uploadNew', // 附件信息集合 fileInfoList: [], PicFile: {}, diff --git a/src/pages/config/pages/dynamicInformations/index.vue b/src/pages/config/pages/dynamicInformations/index.vue index f53396ea8..26473503c 100644 --- a/src/pages/config/pages/dynamicInformations/index.vue +++ b/src/pages/config/pages/dynamicInformations/index.vue @@ -241,7 +241,7 @@ export default { idList: '', id: '', showUploadlist1: true, - importExcelUrl: 'api/att/attFile/upload', + importExcelUrl: 'api/att/attFile/uploadNew', defaultFileList1: [], showUploadlist2: true, defaultFileList2: [], diff --git a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue index d9b660f83..9a6622e1a 100644 --- a/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue +++ b/src/pages/config/pages/enterpriseStandardNumberManagement/index.vue @@ -128,7 +128,7 @@ idList: '', id: '', showUploadlist1: true, - importExcelUrl: 'api/att/attFile/upload', + importExcelUrl: 'api/att/attFile/uploadNew', defaultFileList1: [], showUploadlist2: true, defaultFileList2: [], diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue index 015617ede..bb7f7d552 100644 --- a/src/pages/config/pages/linkManage/linkType/firstLink.vue +++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue @@ -202,7 +202,7 @@ export default { sortData: [], imageUrl: '', - uploadUrl: 'api/att/attFile/upload', + uploadUrl: 'api/att/attFile/uploadNew', subLoading: false } }, diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue index 5e1b18ca3..0937be992 100644 --- a/src/pages/config/pages/linkManage/linkType/secondLink.vue +++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue @@ -202,7 +202,7 @@ export default { sortData: [], imageUrl: '', - uploadUrl: 'api/att/attFile/upload', + uploadUrl: 'api/att/attFile/uploadNew', verifyImg: '', subLoading: false } diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index e323821fc..64aca8617 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -1560,7 +1560,7 @@ export default { }, importModalshowflag: false, showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 - importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 + importExcelUrl: 'api/att/attFile/uploadNew', // 导入EXCEL文档 exportModelFlag: false, exportName: {}, standardForm: {}, diff --git a/src/pages/details/otherBussStandardExternalDetails/index.vue b/src/pages/details/otherBussStandardExternalDetails/index.vue index eb8a223a6..e8fcfaf17 100644 --- a/src/pages/details/otherBussStandardExternalDetails/index.vue +++ b/src/pages/details/otherBussStandardExternalDetails/index.vue @@ -1559,7 +1559,7 @@ export default { }, importModalshowflag: false, showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 - importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 + importExcelUrl: 'api/att/attFile/uploadNew', // 导入EXCEL文档 exportModelFlag: false, exportName: {}, standardForm: {}, diff --git a/src/pages/details/otherLawsDetails/js/otherLawsDetails.js b/src/pages/details/otherLawsDetails/js/otherLawsDetails.js index 4cebe508a..063343391 100644 --- a/src/pages/details/otherLawsDetails/js/otherLawsDetails.js +++ b/src/pages/details/otherLawsDetails/js/otherLawsDetails.js @@ -15,7 +15,7 @@ export default { data () { return { AddKnowSubLoading: false, - importExcelUrl1: 'api/att/attFile/upload', // 导入EXCEL文档 + importExcelUrl1: 'api/att/attFile/uploadNew', // 导入EXCEL文档 defaultFileList: [], knowSee: [], AddKnowledgDialogItem: false, diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue index b83f9b801..5298d9ff3 100644 --- a/src/pages/details/otherLawsStandDetails/index.vue +++ b/src/pages/details/otherLawsStandDetails/index.vue @@ -1104,7 +1104,7 @@ export default { }, importModalshowflag: false, showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 - importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档 + importExcelUrl: 'api/att/attFile/uploadNew', // 导入EXCEL文档 exportModelFlag: false, exportName: {}, standardForm: {}, diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index b2f14711a..baa7a102e 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -667,7 +667,7 @@ class="modular-content-p-val" :title="child.value || '-'" > - {{ child.value || '-' }} + {{ !child.value || child.value === 'null' || child.value === '[]' ? '-' : child.value }}

{ if(res.ok){ if(res.data.length){ - this.sarAccessInfoList = res.data - this.$message.success('文件上传成功') + res.data.forEach(item => { + // 适用认证转换 + if (item.syrz !== null) { + let k = (item.syrz || "").split(","); + for (let i in this.applyAuthOptions) { + for (let m = 0; m < k.length; m++) { + if (this.applyAuthOptions[i].value === k[m]) { + k[m] = this.applyAuthOptions[i].label; + } + item.syrz = k.join(","); + } + } + } + // 能源类型转换 + if (item.nylx !== null) { + let k = (item.nylx || "").split(","); + for (let i in this.categoryOptions) { + for (let m = 0; m < k.length; m++) { + if (this.categoryOptions[i].value === k[m]) { + k[m] = this.categoryOptions[i].label; + } + item.nylx = k.join(","); + } + } + } + // 适用产品线转换 + if (item.sycpx !== null) { + let k = (item.sycpx || "").split(',') + for (let i in this.sycpxOptions) { + for (let m = 0; m < k.length; m++) { + if (this.sycpxOptions[i].value === k[m]) { + k[m] = this.sycpxOptions[i].label + } + item.sycpx = k.join(',') + } + } + } + // 适用车型转换 + if (item.sycx !== null) { + let k = (item.sycx || "").split(","); + for (let i in this.energyKindOptions) { + for (let m = 0; m < k.length; m++) { + if (this.energyKindOptions[i].value === k[m]) { + k[m] = this.energyKindOptions[i].label; + } + item.sycx = k.join(","); + } + } + } + }) + let repeatIndex = 0; + if(this.sarAccessInfoList.length){ + res.data.map(item =>{ + let addIndex; + addIndex = this.sarAccessInfoList.findIndex(items => { + return items.id === item.id + }) + if(addIndex > -1){ + repeatIndex++ + }else{ + this.sarAccessInfoList.push(item) + } + }) + }else{ + this.sarAccessInfoList = res.data + } + if(repeatIndex > 0){ + this.$message.warning('请勿上传重复标准，重复标准未添加') + }else{ + this.$message.success('导入文件成功') + } }else{ this.$message.warning('请勿上传为空的文件') } @@ -1787,7 +1856,7 @@ export default { } } } - // s适用产品线转换 + // 适用产品线转换 if (item.sycpx !== null) { let k = (item.sycpx || "").split(',') for (let i in this.sycpxOptions) { diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue index dd221e1d9..eb149c751 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue @@ -554,7 +554,7 @@ export default { exportModelFlag: false, exportName: "", standType: "INLAND", - uploadPath: "api/att/attFile/upload", + uploadPath: "api/att/attFile/uploadNew", defaultFileList: [], // 默认显示, loading: false, accessSarType: "", diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 2ce66d552..6d536f308 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -637,7 +637,7 @@ export default { // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 - uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 + uploadFileListPath: 'api/att/attFile/uploadNew', // 上传的地址 // 新增、编辑 基础信息验证条件 sarAccessEORules: { type: [ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue index 4120a122d..3e1d9b48b 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue @@ -685,7 +685,7 @@ export default { // applicationScope: '' //适用领域 }, fileInfoList: [], // 上传的附件 - uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 + uploadFileListPath: 'api/att/attFile/uploadNew', // 上传的地址 // 新增、编辑 基础信息验证条件 sarAccessEORules: { type: [ diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue index 091195b29..61082bb7e 100644 --- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue +++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue @@ -220,7 +220,7 @@ export default { submitLoading: false, // 上传路径 - actionPath: 'api/att/attFile/upload', + actionPath: 'api/att/attFile/uploadNew', acceptShow: false, annexDialog: false, annexList: [], diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d1226e56c..adc18ca69 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2694,7 +2694,7 @@ export default { exportModelFlag: false, exportName: '', standType: 'INLAND', - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', selectedList: [], // 标准中选中的数据 modalshowflag: false, standItemEO: { diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index e4a63f07e..357fe70c4 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3697,10 +3697,10 @@ export default { nameList += item.name }) if(data && data.length > 0){ - this.sarBussionessSearch.QCDW = data[0].institutionName - this.sarBussionessSearch.QCDWId = data[0].institutionId - this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId) - this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName) + // this.sarBussionessSearch.QCDW = data[0].institutionName + // this.sarBussionessSearch.QCDWId = data[0].institutionId + // this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId) + // this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName) } if (this.drawerTitle === '查询起草人') { this.sarBussionessSearch['QCRBUSS'] = nameList @@ -5132,6 +5132,15 @@ export default { } }, watch: { + 'sarBussionessStandEO.QCDW'(val) { + let arr = val.split(',') + arr.forEach((item, index) => { + if (item === undefined || item === 'undefined') { + arr.splice(index, 1) + } + }) + return arr.toString() + }, filterText(val) { this.$refs.tree.filter(val); }, diff --git a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue index dcfe613d5..a108226ed 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue @@ -664,7 +664,7 @@ export default { threeOptions: [], isAdvancedSearch: false, // 高级检索窗口是否打开 showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表 - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', defaultFileList: [], // 默认显示 importModalshowflagtemp: false, importModalshowflag: false, diff --git a/src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js b/src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js index 49966aa3f..0c686b0eb 100644 --- a/src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js +++ b/src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js @@ -62,7 +62,7 @@ export default { delIds: [], // 导出时的名字 exportNameGet: '', - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', fileOptionType: '', // 标记点击上传文件是新增、编辑操作 setting: '', MoveTest: '', diff --git a/src/pages/regulatoryRepository/subsidiaryStandardLibrary/index.vue b/src/pages/regulatoryRepository/subsidiaryStandardLibrary/index.vue index 4adac153d..2669a9dbb 100644 --- a/src/pages/regulatoryRepository/subsidiaryStandardLibrary/index.vue +++ b/src/pages/regulatoryRepository/subsidiaryStandardLibrary/index.vue @@ -849,7 +849,7 @@ export default { configTotal: 0, configRows: 10, saveExportType: '', - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', currentFileList: '', // 当前操作的是哪个FormItem的上传 currentFile: '', // 当前操作的是哪个FormItem的上传 defaultFileList: [], // 默认显示 diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index c00bbfabe..31b023427 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -891,7 +891,7 @@ fileIndex: '', fileList: [], fileMadel: false, - fileUrl: 'api/att/attFile/upload', + fileUrl: 'api/att/attFile/uploadNew', fileType: '', pIndex: '', pType: '', diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue index 2655501f5..d62918707 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue @@ -812,7 +812,7 @@ fileIndex: '', fileList: [], fileMadel: false, - fileUrl: 'api/att/attFile/upload', + fileUrl: 'api/att/attFile/uploadNew', fileType: '', pIndex: '', pType: '', diff --git a/src/pages/skillReq/SkillReqAdd/addDrawer.vue b/src/pages/skillReq/SkillReqAdd/addDrawer.vue index fdf67e3e4..d8df8cfd2 100644 --- a/src/pages/skillReq/SkillReqAdd/addDrawer.vue +++ b/src/pages/skillReq/SkillReqAdd/addDrawer.vue @@ -416,7 +416,7 @@ export default { openUpload: false, formdisableflag: false, defaultFileList: [], // 默认显示 - uploadPath: 'api/att/attFile/upload', + uploadPath: 'api/att/attFile/uploadNew', addForm: { id: '', rowIndex: '', diff --git a/src/pages/standardComparisonLibrary/view.vue b/src/pages/standardComparisonLibrary/view.vue index ce3a689c6..44b40a945 100644 --- a/src/pages/standardComparisonLibrary/view.vue +++ b/src/pages/standardComparisonLibrary/view.vue @@ -419,7 +419,7 @@