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:
liuhuaizhi
2021-07-26 17:04:02 +08:00
parent de0f4a2bc3 932a286b2a
commit 171ed52ab3
12 changed files with 243 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForStandards.vue
+5 -2
View File
@@ -59,7 +59,7 @@
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRowFirst">
@click="getReplaceLawsNumRowFirst(true)">
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -217,7 +217,10 @@ export default {
this.getReplaceLawsNumRow()
},
// 代替政策号 请求数据
getReplaceLawsNumRowFirst () {
getReplaceLawsNumRowFirst (val) {
if (val) {
this.replaceLawsNumForm.page = '1'
}
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
src/components/CustomFormComponents/InputForStandardsForForeign.vue
+6 -3
View File
@@ -53,7 +53,7 @@
type="primary"
class="common-button-primary"
round
@click="getReplaceLawsNumRow">
@click="getReplaceLawsNumRow(true)">
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -126,7 +126,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div>
</el-dialog>
@@ -227,7 +227,10 @@ export default {
this.getReplaceLawsNumRow()
},
// 代替政策号 请求数据
getReplaceLawsNumRow () {
getReplaceLawsNumRow (val) {
if (val) {
this.replaceLawsNumForm.page = '1'
}
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+17 -5
View File
@@ -835,7 +835,7 @@
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
@@ -1076,9 +1076,12 @@
align="center">
</el-table-column>
<el-table-column
prop="standStateShow"
label="标准状态"
prop="textStatus"
label="文本状态"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
@@ -1142,6 +1145,7 @@
},
data () {
return {
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
loadSarStandard: false,
verifySarStandard: false,
@@ -1440,6 +1444,13 @@
},
},
methods: {
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
console.log(this.textStatusMap, '文本状态的值')
},
clearFormData(data){
this.form = {
// 基础信息
@@ -1888,11 +1899,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
return false
}
// 判断文件上传大小
@@ -2129,6 +2140,7 @@
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别
this.setMap(this.standStateOptions)
})
this.busVsFunc()
this.modelFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+21 -1
View File
@@ -928,7 +928,27 @@
this.active = name
},
handleSave() {
this.$message.success('保存成功')
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+21 -1
View File
@@ -921,7 +921,27 @@ export default {
this.active = name
},
handleSave() {
this.$message.success('保存成功')
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -3
View File
@@ -896,7 +896,7 @@
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
@@ -1463,11 +1463,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PDF/PPT/PPTX/DOC/DOCX或XLS文件')
return false
}
// 判断文件上传大小
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
-6
View File
@@ -86,12 +86,6 @@
prop="countryArea"
label="国家/地区"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.countryArea !== null && scope.row.countryArea.indexOf(',') > 0">
<span>{{ scope.row.countryArea }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.countryArea] }}</span>
</template>
</el-table-column>
<el-table-column
prop="detailedListName"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+42 -13
View File
@@ -237,13 +237,13 @@
>
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -370,12 +370,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -1357,15 +1358,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1467,6 +1470,25 @@ export default {
selectLawsStands () {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
})
@@ -1994,6 +2016,13 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
}, e => {
})
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+35 -11
View File
@@ -117,10 +117,10 @@
</el-button>
</el-form>
<div v-if="!showSelectBox">
<el-form :model="standardForm" class="label-input-form" label-width="108px" inline>
<el-form-item label="英文名称" class="search-item">
<el-form :model="standardFormList" class="label-input-form" label-width="108px" inline>
<el-form-item label="中文名称" class="search-item">
<el-input
v-model="standardForm.standName"
v-model="standardFormList.standName"
placeholder="请输入"
:maxlength="100"
size="small"
@@ -129,7 +129,7 @@
<el-form-item label="适用车型" class="labelBox" label-width="61px">
<el-select
class="showBox"
v-model="standardForm.typeApplicable"
v-model="standardFormList.typeApplicable"
placeholder="请选择"
filterable
size="small"
@@ -145,13 +145,13 @@
<el-form-item label="能源类型" >
<el-select
class="showBox"
v-model="standardForm.nylx"
v-model="standardFormList.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
@@ -161,7 +161,7 @@
<el-form-item label="责任部门" >
<el-select
class="showBox"
v-model="standardForm.zrbm"
v-model="standardFormList.zrbm"
placeholder="请选择"
filterable
size="small"
@@ -177,7 +177,7 @@
<el-form-item label="适用产品线" >
<el-select
class="showBox"
v-model="standardForm.sycpx"
v-model="standardFormList.sycpx"
placeholder="请选择"
filterable
size="small"
@@ -409,7 +409,7 @@ export default {
// 适用车型
applyArcticOptions: [],
// 能源类型
energyKindOptions: [],
categoryOptions: [],
// 责任部门
zrbmOptions: [],
// 适用产品线
@@ -428,6 +428,13 @@ export default {
page: 1,
Size: this.$store.getters.userInfo.configContent
},
standardFormList: {
standNumber: '',
standName: '',
responseUnit: '',
page: 1,
Size: this.$store.getters.userInfo.configContent
},
page: 1,
// pageSize: this.$store.getters.userInfo.configContent,
total: 0,
@@ -493,6 +500,7 @@ export default {
// 根据准入id查询标准法规详情
selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId,
}, {
@@ -507,8 +515,24 @@ export default {
back() {
this.$router.push({
name: "AccessStandardsAndRegulations"
});
name: 'AccessStandardsAndRegulations',
})
/* if (this.sarAccessEO.sortKey === '1') {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '国家/地区清单'
})
} else if(this.sarAccessEO.sortKey === '2') {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '项目类清单'
})
} else {
this.$router.push({
name: 'AccessStandardsAndRegulations',
menuName: '其他清单'
})
}*/
// this.$router.push(this.$store.state.detailMap)
// this.$store.commit('setDetailMap', '')
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+43 -13
View File
@@ -211,13 +211,13 @@
>
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -338,12 +338,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -943,6 +944,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1187,15 +1189,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1278,6 +1282,25 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1808,6 +1831,13 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+43 -13
View File
@@ -215,13 +215,13 @@
>
</el-table-column>
<el-table-column
prop="code"
prop="standNumber"
show-overflow-tooltip
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -342,12 +342,13 @@
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
show-overflow-tooltip
width="180px"
fixed="left"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -941,6 +942,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1185,15 +1187,17 @@ export default {
roundButton: true,
type: 'warning'
}).then(() => {
// i 全部对象数组的下标
// s 选中对象数组的下标
for (var s in this.sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
this.sarAccessInfoList.splice(i, 1)
}
let exits = []
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
}
}
exits.push(item)
})
this.sarAccessInfoListArry = []
this.$refs.entryTable.clearSelection()
}).catch(() => {})
@@ -1276,6 +1280,13 @@ export default {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.drawerTotal = res.data.list.length
}, e => {
@@ -1808,6 +1819,25 @@ export default {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.sarAccessInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
}, e => {
})
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+7 -7
View File
@@ -1573,9 +1573,9 @@ export default {
{type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
],
standYear: [
// {required: true, message: '标准年份/系列不能为空', trigger: 'change'},
{validator: this.verify.testItemCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
{required: true, message: '标准年份不能为空', trigger: 'change'},
{validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
@@ -1583,7 +1583,7 @@ export default {
],
standEnName: [
{required: true, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// {validator: this.verify.valiateEnName, trigger: 'blur'}
],
// standState: [
@@ -2005,7 +2005,7 @@ export default {
item.collectBtn = !item.collectBtn
item.cancelCollectBtn = !item.cancelCollectBtn
item.collectId = res.data.id
this.$message.success(res.message)
// this.$message.success(res.message)
} else {
this.$message.warning(res.message)
}
@@ -2074,7 +2074,7 @@ export default {
Object.keys(item.attrInfoMap || {}).forEach((key) => {
item.attrInfoMap[key] = item.attrInfoMap[key] === null ? '' : item.attrInfoMap[key]
if (item.attrInfoMap[key] || item.attrInfoMap[key] === '') {
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key])
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
}
})
const dynamicFormField = this.sarStandardsInfoEO
@@ -2756,7 +2756,7 @@ export default {
const value = nowstandinfo[item.attrField]
// 时间格式处理
if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss')
nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
}
// 数组处理
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {