FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-29 22:15:48 +08:00
parent 46a81f5e20 89020e5e3b
commit c52aaaf3b5
128 changed files with 221 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+74 -5
View File
@@ -836,7 +836,7 @@ export default {
// applicationScope: '' //适用领域
},
fileInfoList: [], // 上传的附件
uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
uploadFileListPath: 'api/att/attFile/uploadNew', // 上传的地址
// 新增、编辑 基础信息验证条件
sarAccessEORules: {
type: [
@@ -948,7 +948,7 @@ export default {
exportName: '', // 导出名称
importExcelUrl: '/api/lawss/sarSarAccessInfo/importSarAccessInfo?accessId=', // 导入接口
// importExcelUrls: '/api/sarLawsDetailedList/sar-laws-detailed-list/importData', // 导入接口
importExcelUrls: 'api/att/attFile/upload', // 导入EXCEL文档
importExcelUrls: 'api/att/attFile/uploadNew', // 导入EXCEL文档
// 新增标准法规 验证
addEntryFormRules: {
code: [
@@ -1065,8 +1065,77 @@ export default {
}, res => {
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) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+1 -1
View File
@@ -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: "",
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -637,7 +637,7 @@ export default {
// applicationScope: '' //适用领域
},
fileInfoList: [], // 上传的附件
uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
uploadFileListPath: 'api/att/attFile/uploadNew', // 上传的地址
// 新增、编辑 基础信息验证条件
sarAccessEORules: {
type: [
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+1 -1
View File
@@ -685,7 +685,7 @@ export default {
// applicationScope: '' //适用领域
},
fileInfoList: [], // 上传的附件
uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
uploadFileListPath: 'api/att/attFile/uploadNew', // 上传的地址
// 新增、编辑 基础信息验证条件
sarAccessEORules: {
type: [
src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+1 -1
View File
@@ -220,7 +220,7 @@ export default {
submitLoading: false,
// 上传路径
actionPath: 'api/att/attFile/upload',
actionPath: 'api/att/attFile/uploadNew',
acceptShow: false,
annexDialog: false,
annexList: [],
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -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: {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+13 -4
View File
@@ -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);
},
src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
+1 -1
View File
@@ -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,
src/pages/regulatoryRepository/foreignRegulationsDatabase/js/foreignRegulationsDatabase.js
+1 -1
View File
@@ -62,7 +62,7 @@ export default {
delIds: [],
// 导出时的名字
exportNameGet: '',
uploadPath: 'api/att/attFile/upload',
uploadPath: 'api/att/attFile/uploadNew',
fileOptionType: '', // 标记点击上传文件是新增、编辑操作
setting: '',
MoveTest: '',
src/pages/regulatoryRepository/subsidiaryStandardLibrary/index.vue
+1 -1
View File
@@ -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: [], // 默认显示
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+1 -1
View File
@@ -891,7 +891,7 @@
fileIndex: '',
fileList: [],
fileMadel: false,
fileUrl: 'api/att/attFile/upload',
fileUrl: 'api/att/attFile/uploadNew',
fileType: '',
pIndex: '',
pType: '',
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+1 -1
View File
@@ -812,7 +812,7 @@
fileIndex: '',
fileList: [],
fileMadel: false,
fileUrl: 'api/att/attFile/upload',
fileUrl: 'api/att/attFile/uploadNew',
fileType: '',
pIndex: '',
pType: '',