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:
zhutianqi
2021-08-16 14:12:14 +08:00
parent 7c3d80a4dc 1cdcf8a44c
commit c1a63c5f1c
18 changed files with 183 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home1/components/release/index.vue
+16 -1
View File
@@ -2,7 +2,7 @@
<template>
<div class="release">
<ul>
<li v-for="item in standardReleaseList" :key="item.id" class="time-title">
<li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
<a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
<span class="time">{{item.issueTime }}</span>
</li>
@@ -19,6 +19,7 @@ export default {
return {
putTime: '',
standardReleaseList: [], //标准发布数据
updateTime:""
}
},
computed: {},
@@ -26,8 +27,22 @@ export default {
mounted() {
this.getDate()
this.getAdvice()
this.addDate()
},
methods: {
//获取当前年月日
addDate(){
const nowDate = new Date();
const date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
const newmonth = date.month>10?date.month:'0'+date.month
const day = date.date>10?date.date:'0'+date.date
this.updateTime = date.year + '-' + newmonth + '-' + day
console.log("当前时间"+this.updateTime)
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+1 -1
View File
@@ -1035,7 +1035,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+1 -1
View File
@@ -595,7 +595,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+1 -1
View File
@@ -1007,7 +1007,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+1 -1
View File
@@ -598,7 +598,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+6 -1
View File
@@ -122,6 +122,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
<el-button
type="primary"
@@ -1456,9 +1457,13 @@
{ type: 'number', message: '年标准年份必须为数字值'}
],
standName: [
{ required: true, message: '请输入标准名称', trigger: 'blur' },
{ required: true, message: '请输入标准中文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standEnName: [
{ required: true, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+2 -2
View File
@@ -394,7 +394,7 @@ export default {
this.deleteDataList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
@@ -430,7 +430,7 @@ export default {
this.selectedList.map(item => {
let addList;
addList = this.dataList.findIndex(items => {
return items.id == item.id
return items.id === item.id
})
if(addList > -1){
// this.$refs.accessTypeSelect.clearSelection()
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+1 -1
View File
@@ -631,7 +631,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item;
return items.productLine === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+1 -1
View File
@@ -605,7 +605,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.productLine = item;
return items.productLine === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+7 -2
View File
@@ -450,8 +450,13 @@ export default {
}, {
_this: this
}, res => {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
if(res.data === null){
this.ProjectDatas = ''
this.total = 0
}else{
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
}
});
},
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+64 -53
View File
@@ -44,7 +44,7 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发责任人</el-button>
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
</div>
</div>
<el-table
@@ -94,11 +94,16 @@
>
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope">
<div :class="{'fileClass': !scope.row.workPeople}">
{{ scope.row.workPeople ? scope.row.workPeople : "" }}
</div>
<template slot-scope="scope" v-if="scope.row.workPeople">
<el-input v-model="scope.row.workPeopleId" style="display: none;" />
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
<!-- {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
<!-- </div>-->
<!-- </template>-->
</el-table-column>
</el-table>
</div>
@@ -253,7 +258,8 @@ export default {
detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
pId: this.$route.query.prcId,
selectedId:'',
};
},
methods: {
@@ -316,7 +322,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -408,14 +413,27 @@ export default {
}, e => {
});
},
//批量分发按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
//批量分发按钮
choiceZRRS(row, type, index) {
this.selectedId=row.id
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
this.nodeList = [];
this.nodeList.push(id);
this.zrIndex = index;
this.zrType = type;
this.nodeList.push(row);
this.modalshowflag = true;
} else if (type === 2) {
// 批量
if (this.selectList.length > 0) {
this.zrType = type;
this.nodeList = [];
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
} else {
this.$message.warning("请选择要分发的数据");
}
}
},
//标准表格选择框改变
@@ -437,47 +455,40 @@ export default {
}
},
checkedRole(data) {
console.log(data[0].name);
// 选取负责人时的操作
let deposit = new Map();
let mis2 = new Map();
this.selectList.forEach(item => {
item.workPeople = data[0].name;
item.workPeopleId = data[0].id;
if (item.children) {
item.children.forEach(items => {
deposit.set(items.standId, items);
});
}
mis2.set(item.standId, item);
});
this.dataList.forEach((item, index) => {
if (mis2.get(item.standId)) {
if (item.children) {
item.children.forEach(i => {
i.workPeopleId = undefined;
i.workPeople = undefined;
});
} else {
const newItem = JSON.parse(JSON.stringify(item));
newItem.workPeopleId = data[0].id;
newItem.workPeople = data[0].name;
this.$set(this.dataList, index, newItem);
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.children){
item.children.forEach(items => {
if(items.id === this.selectedId){
items.workPeople = data[0].name
items.workPeopleId = data[0].id
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
})
}
} else {
if (item.children) {
item.children.forEach((items, childIndex) => {
if (deposit.get(items.standId)) {
const childItems = JSON.parse(JSON.stringify(items));
childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
childItems.workPeople = deposit.get(items.standId).workPeople;
this.$set(this.dataList[index].children, childIndex, childItems);
}
});
}
}
});
this.$refs.myTable.clearSelection();
})
this.dataList = JSON.parse(JSON.stringify(this.dataList))
} else if (this.type === 2) {
this.selectList.forEach(item =>{
this.dataList.map(items=>{
if(item.id==items.id){
items.workPeople = data[0].name
items.workPeopleId = data[0].id
}
if(items.children.length){
items.children.map(childrenItem=>{
if(childrenItem.id==item.id){
childrenItem.workPeople = data[0].name
childrenItem.workPeopleId = data[0].id
}
})
}
})
})
this.dataList = JSON.parse(JSON.stringify(this.dataList))
}
this.modalshowflag = false;
},
cancleUserInfo() {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+21 -11
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
@@ -1124,7 +1133,7 @@ export default {
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id
return items.id === item.id
})
if(addList > -1){
// this.$refs.accessTypeSelect.clearSelection()
@@ -1211,7 +1220,7 @@ export default {
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
return items.id === item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
@@ -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
+21 -12
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
@@ -1093,7 +1102,7 @@ export default {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id
return items.id === item.id
})
if(addList > -1){
// this.$refs.accessTypeSelect.clearSelection()
@@ -1183,7 +1192,7 @@ export default {
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
return items.id === item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
@@ -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
+27 -11
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
@@ -1064,7 +1074,7 @@ export default {
this.selectedAccInfoSearchList.map(item => {
let addList;
addList = this.sarAccessInfoList.findIndex(items => {
return items.id == item.id
return items.id === item.id
})
if(addList > -1){
// this.$refs.accessTypeSelect.clearSelection()
@@ -1154,7 +1164,7 @@ export default {
this.sarAccessInfoListArry.map(item => {
let index
index = this.sarAccessInfoList.findIndex(items => {
return items.id = item
return items.id === item
})
if (index > -1) {
this.sarAccessInfoList.splice(index, 1)
@@ -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 // 新增 标准性质
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -2
View File
@@ -1492,7 +1492,7 @@
<el-button
class="common-button-default"
icon="el-icon-close"
@click="clearAllSearch('sarStandardsSearch')">取消</el-button>
@click="clearAllSearch('sarStandardsSearch')">清空</el-button>
</div>
</el-drawer>
</div>
@@ -2824,7 +2824,7 @@ export default {
// 高级检索
selectMoreBtn () {
this.isAdvancedSearch = true
this.sarStandardsSearch = []
// this.sarStandardsSearch = []
},
treeCollapse () {
this.sideClose = !this.sideClose
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+2 -2
View File
@@ -622,8 +622,8 @@
</el-col>
<template v-if="index === 0" >
<el-form-item label="国家/地区" prop="standSort" label-width="150px" class="add-form-item">
<el-select v-model="sarStandardsInfoEO.country" filterable>
<el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-select v-model="sarStandardsInfoEO.country" filterable clearable>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+6 -1
View File
@@ -631,7 +631,7 @@ export default {
this.selectList.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.id = item;
return items.id === item;
});
if (index > -1) {
this.dataList.splice(index, 1);
@@ -743,6 +743,11 @@ export default {
}, {
_this: this
}, res => {
if(res.data === null){
this.standardData = ''
this.totalDo =''
this.standModel = true;
}
this.standardData = res.data.records
this.totalDo = res.data.total
this.standModel = true;
src/pages/regulatoryRepository/partCodeApply/index.vue
+3 -3
View File
@@ -14,8 +14,8 @@
</el-input>
</el-form-item>
<el-form-item label="零件分类号" class="search-item">
<el-input placeholder="根据零件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
<el-form-item label="零部件分类代号" class="search-item">
<el-input placeholder="根据零部件分类代号查询" clearable :maxlength="100" v-model="searchFormData.partCategoryCode">
</el-input>
</el-form-item>
@@ -254,7 +254,7 @@ export default {
.search-area {
/deep/ .el-input__inner {
width: 185px;
width: 200px;
}
}