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:
yangzijiao
2021-07-26 17:04:28 +08:00
parent a4c3a759db 171ed52ab3
commit a620c827f1
10 changed files with 92 additions and 26 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/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
+19
View File
@@ -1480,6 +1480,18 @@ export default {
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 => {
})
@@ -2007,6 +2019,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
+2 -2
View File
@@ -151,7 +151,7 @@
size="small"
>
<el-option
v-for="item in energyKindOptions"
v-for="item in categoryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
@@ -414,7 +414,7 @@ export default {
// 适用车型
applyArcticOptions: [],
// 能源类型
energyKindOptions: [],
categoryOptions: [],
// 责任部门
zrbmOptions: [],
// 适用产品线
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+20
View File
@@ -944,6 +944,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1288,6 +1289,18 @@ export default {
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 => {
@@ -1818,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
+20
View File
@@ -942,6 +942,7 @@ export default {
},
// 点击清空查询条件 按钮事件
clearSearchLaws () {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.advanceSearchVOStr = ''
this.sarAccessInfoSearch.applyArctic = '' // 能源种类
this.sarAccessInfoSearch.keywords = '' // 关键字
@@ -1818,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') {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+11 -4
View File
@@ -585,16 +585,23 @@ export default {
ids+=',\''+this.selectList[i].standId+'\''
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
this.$message.success('导出信息成功')
}
} else if (this.saveExportType === 'all') {
console.log(this.selectList);
let ids = ''
if (this.selectList.length === 0) {
ids='\''+this.dataList[0].standId+'\''
for(let i=1;i<this.dataList.length;i++){
ids+=',\''+this.dataList[i].standId+'\''
}
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
this.$message.success('导出信息成功')
}
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+2 -2
View File
@@ -116,7 +116,7 @@
prop="standId"
fixed="left"
width="180"
label="标准编号">
label="标准号">
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
@@ -229,7 +229,7 @@
style="width: 100%;"
:model="historySeeForm"
>
<el-form-item class="add-form-item" label="标准编号:">
<el-form-item class="add-form-item" label="标准号:">
<div class="seeItem">{{historySeeForm.standId}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="标准名称:">