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:
yanyizhou
2021-08-16 13:51:29 +08:00
parent ab1d7b132a 795c722ebc
commit 3908822fd0
4 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
-4
View File
@@ -994,8 +994,6 @@ export default {
},
// 点击批量删除事件
deleteList() {
console.log(this.selectList);
console.log(this.dataList);
if (this.selectList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
@@ -1011,10 +1009,8 @@ export default {
index = this.dataList.findIndex(items => {
return items.id === item;
});
console.log(index);
if (index > -1) {
this.dataList.splice(index, 1);
console.log(this.dataList);
}
exits.push(item);
});
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+19 -9
View File
@@ -177,6 +177,7 @@
prop="code"
show-overflow-tooltip
fixed="left"
align="center"
width="180px"
label="标准号">
<template slot-scope="scope">
@@ -185,6 +186,7 @@
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
>
<template slot-scope="scope">
@@ -194,6 +196,7 @@
<el-table-column
prop="issueTime"
sortable
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -202,6 +205,7 @@
<el-table-column
prop="xcxssrqgj"
sortable
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -211,6 +215,7 @@
show-overflow-tooltip
prop="zccssrqgj"
sortable
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -220,6 +225,7 @@
show-overflow-tooltip
prop="textStatus"
width="120px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -268,6 +274,7 @@
show-overflow-tooltip
width="180px"
fixed="left"
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
@@ -276,6 +283,7 @@
<el-table-column
prop="standName"
label="标准名称"
align="center"
width="260px"
>
<template slot-scope="scope">
@@ -380,7 +388,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="240" align="center" label="操作">
<el-table-column width="240" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -633,6 +641,7 @@ export default {
zrbmOptions: [], // 责任部门
categoryOptions: [], // 能源类型
energyKindOptions: [], // 能源种类list
CycxOptions: [],
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
/** ******************************/
@@ -892,7 +901,7 @@ export default {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.energyKindOptions = res.data.ENERGYTYPES
this.CycxOptions = res.data.CLLX
// this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1227,10 +1236,10 @@ export default {
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
/* let sarAccessInfoListArryId = []
for(let i=0; i<this.selectData.length; i++){
}*/
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
}
},
// 点击取消按钮 返回事件
backCancal () {
@@ -1485,10 +1494,10 @@ export default {
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let i in this.CycxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
if (this.CycxOptions[i].value === k[m]) {
k[m] = this.CycxOptions[i].label
}
item.typeApplicable = k.join(',')
}
@@ -2031,6 +2040,7 @@ export default {
this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
this.CycxOptions = res.data.CLLX
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list
this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+19 -10
View File
@@ -163,6 +163,7 @@
show-overflow-tooltip
fixed="left"
width="180px"
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -170,6 +171,7 @@
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
>
<template slot-scope="scope">
@@ -178,6 +180,7 @@
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
sortable
label="发布日期">
<template slot-scope="scope">
@@ -187,6 +190,7 @@
<el-table-column
prop="xcxssrqgj"
sortable
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -195,6 +199,7 @@
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
align="center"
sortable
label="在产车实施日期">
<template slot-scope="scope">
@@ -204,6 +209,7 @@
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
width="120px"
label="文本状态">
<template slot-scope="scope">
@@ -251,6 +257,7 @@
prop="standNumber"
show-overflow-tooltip
width="180px"
align="center"
fixed="left"
label="标准号">
<template slot-scope="scope">
@@ -259,6 +266,7 @@
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
width="260px"
>
@@ -364,7 +372,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="240" align="center" label="操作">
<el-table-column width="240" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -613,6 +621,7 @@ export default {
zrbmOptions: [], // 责任部门
categoryOptions: [], // 能源类型
energyKindOptions: [], // 能源种类list
CycxOptions: [],
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
/** ******************************/
@@ -873,7 +882,7 @@ export default {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.energyKindOptions = res.data.ENERGYTYPES
this.CycxOptions = res.data.CLLX
// this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1199,7 +1208,10 @@ export default {
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
}
},
// 点击取消按钮 返回事件
backCancal () {
@@ -1453,10 +1465,10 @@ export default {
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let i in this.CycxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
if (this.CycxOptions[i].value === k[m]) {
k[m] = this.CycxOptions[i].label
}
item.typeApplicable = k.join(',')
}
@@ -2010,6 +2022,7 @@ export default {
this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
this.CycxOptions = res.data.CLLX // 能源种类list
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list
this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -2024,10 +2037,6 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption()
}, e => {
})
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+25 -9
View File
@@ -18,7 +18,7 @@
size="small"
>
<el-option
v-for="item in energyKindOptions"
v-for="item in CycxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
@@ -134,7 +134,7 @@
size="small"
>
<el-option
v-for="item in energyKindOptions"
v-for="item in CycxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
@@ -200,6 +200,7 @@
prop="standNumber"
show-overflow-tooltip
fixed="left"
align="center"
width="180px"
label="标准号">
<template slot-scope="scope">
@@ -208,6 +209,7 @@
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
>
<template slot-scope="scope">
@@ -216,17 +218,20 @@
</el-table-column>
<el-table-column
prop="typeApplicable"
align="center"
label="适用车型"
>
</el-table-column>
<el-table-column
prop="syrz"
align="center"
label="适用认证"
>
</el-table-column>
<el-table-column
prop="issueTime"
sortable
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
@@ -235,6 +240,7 @@
<el-table-column
prop="xcxssrqgj"
sortable
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -244,6 +250,7 @@
show-overflow-tooltip
prop="zccssrqgj"
sortable
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
@@ -253,6 +260,7 @@
show-overflow-tooltip
prop="textStatus"
width="120px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
@@ -276,7 +284,6 @@
<el-button
class="common-button-default delete-button"
size="mini" @click="deleteSelectSarAccessInfo"
v-if="!disabledFlag"
v-btn-permission="''"
><i class="iconfont">&#xe61b;</i>删除</el-button>
</div>
@@ -300,6 +307,7 @@
show-overflow-tooltip
width="180px"
fixed="left"
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
@@ -308,6 +316,7 @@
<el-table-column
prop="standName"
label="标准名称"
align="center"
width="260px"
>
<template slot-scope="scope">
@@ -412,7 +421,7 @@
width="210px"
label="卡车VPPS中文名称">
</el-table-column>
<el-table-column width="240" align="center" label="操作">
<el-table-column width="240" align="center" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
class="common-button-default"
@@ -660,6 +669,7 @@ export default {
zrbmOptions: [], // 责任部门
categoryOptions: [], // 能源类型
energyKindOptions: [], // 能源种类list
CycxOptions: [],
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
syrzOptions: [],
@@ -926,7 +936,7 @@ export default {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.energyKindOptions = res.data.ENERGYTYPES
this.CycxOptions = res.data.CLLX
// this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
@@ -1170,7 +1180,10 @@ export default {
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
}
},
// 点击取消按钮 返回事件
backCancal () {
@@ -1294,10 +1307,10 @@ export default {
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let i in this.CycxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
if (this.CycxOptions[i].value === k[m]) {
k[m] = this.CycxOptions[i].label
}
item.typeApplicable = k.join(',')
}
@@ -1376,6 +1389,7 @@ export default {
}, e => {
})
},
// 查询按钮
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
@@ -1402,6 +1416,7 @@ export default {
}, e => {
})
},
// 高级查询-查询按钮
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
@@ -1917,6 +1932,7 @@ export default {
this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
this.CycxOptions = res.data.CLLX || [] // 能源种类list
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list
this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质