Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
+17
-2
@@ -86,6 +86,12 @@
|
||||
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"
|
||||
@@ -132,7 +138,7 @@
|
||||
label="更新时间"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss') : scope.row.updateTime }}</div>
|
||||
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -170,6 +176,7 @@ export default {
|
||||
name: "listOfCountries",
|
||||
data() {
|
||||
return {
|
||||
countryAreaMap: {},
|
||||
searching: false,
|
||||
total: 0,
|
||||
page: 1,
|
||||
@@ -345,9 +352,16 @@ export default {
|
||||
this.$router.push({
|
||||
name: "ListOfStandardsAndRegulationsDetails",
|
||||
query: {
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
}
|
||||
});
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.countryAreaMap, item.value, item.label)
|
||||
})
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -358,6 +372,7 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.countryOptions = res.data.COUNTRY;
|
||||
this.setMap(this.countryOptions)
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
|
||||
@@ -352,7 +352,8 @@ export default {
|
||||
this.$router.push({
|
||||
name: "OtherAddEit",
|
||||
query: {
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -355,7 +355,8 @@ export default {
|
||||
this.$router.push({
|
||||
name: "ProjectAddEit",
|
||||
query: {
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -70,6 +70,7 @@
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
@@ -225,23 +226,35 @@
|
||||
prop="issueTime"
|
||||
sortable
|
||||
label="发布日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
prop="xcxssrqgj"
|
||||
sortable
|
||||
label="新车型实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zccssrqgj"
|
||||
sortable
|
||||
label="在产车实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
width="120px"
|
||||
label="文本状态">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table
|
||||
@@ -336,25 +349,31 @@
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="standEnName"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="英文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="typeApplicable"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="适用车型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="nylx"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="能源类型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ nylxMap[scope.row.nylx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="putTime"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -362,55 +381,74 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zccssrqgj"
|
||||
sortable
|
||||
width="210px"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="XCXSSRQ"
|
||||
prop="xcxssrqgj"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
label="新车型实施日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zrbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="责任部门">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="sycpx"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="适用产品线">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="cycvppsbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="cycvppscn"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppsbm"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppscn"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column>
|
||||
<el-table-column width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
@@ -421,6 +459,7 @@
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
type="danger"
|
||||
style="margin-left: 0px"
|
||||
size="small" @click="moveDown(scope.$index, scope.row)"
|
||||
v-if="!disabledFlag"
|
||||
>下移</el-button>
|
||||
@@ -526,12 +565,19 @@ export default {
|
||||
// }
|
||||
// }
|
||||
return {
|
||||
textStatusMap: {},
|
||||
typeApplicableMap: {},
|
||||
nylxMap: {},
|
||||
zrbmMap: {},
|
||||
sycpxMap: {},
|
||||
zrbmOptions: [],
|
||||
selectSearch : [],
|
||||
// 新增、编辑 基础信息字段
|
||||
sarAccessEO: {
|
||||
id: '',
|
||||
sortKey: 1,
|
||||
countryArea: '',
|
||||
fileIds: '',
|
||||
detailedListName: '',
|
||||
energyKind: '',
|
||||
type: '',
|
||||
@@ -552,9 +598,6 @@ export default {
|
||||
detailedListName: [
|
||||
{required: true, message: '清单名称不能为空', trigger: 'blur'},
|
||||
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
|
||||
],
|
||||
remark: [
|
||||
{required: true,type: 'string', max: 500, message: '表单名称不能超过500个字符', trigger: 'blur'}
|
||||
]
|
||||
},
|
||||
disabledFlag: false,
|
||||
@@ -846,7 +889,6 @@ export default {
|
||||
uploadBackSuccess (res, file, fileList) {
|
||||
if (res.ok) {
|
||||
this.fileInfoList = fileList
|
||||
console.log(this.fileInfoList)
|
||||
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
|
||||
this.$message.success('上传成功')
|
||||
} else {
|
||||
@@ -854,6 +896,14 @@ export default {
|
||||
fileList.pop()
|
||||
}
|
||||
},
|
||||
|
||||
// 点击上传的文件进行下载
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
// 相关附件 上传之前钩子
|
||||
beforeUpload (file) {
|
||||
var filename = file.name
|
||||
@@ -1186,8 +1236,7 @@ export default {
|
||||
this.fileInfoList.map(item => {
|
||||
relateFile.push(item.id)
|
||||
})
|
||||
sarAccessEO.relateFile = relateFile.join(',')
|
||||
console.log(sarAccessEO.relateFile)
|
||||
sarAccessEO.fileIds = relateFile.join(',')
|
||||
}
|
||||
if (!sarAccessEO.id) {
|
||||
// 新增
|
||||
@@ -1201,12 +1250,8 @@ export default {
|
||||
this.$message.success('新增成功')
|
||||
this.isNext = true
|
||||
this.$router.push({
|
||||
name: 'AccessStandardsAndRegulations',
|
||||
query: {
|
||||
relateFile: sarAccessEO.relateFile
|
||||
}
|
||||
name: 'AccessStandardsAndRegulations'
|
||||
})
|
||||
console.log(sarAccessEO)
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
@@ -1237,6 +1282,19 @@ export default {
|
||||
_this: this
|
||||
}, res =>{
|
||||
this.sarAccessInfoSearchList = res.data.list
|
||||
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)
|
||||
})
|
||||
console.log(this.sarAccessInfoSearchList)
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
@@ -1604,7 +1662,7 @@ export default {
|
||||
// 请求上传的文件信息
|
||||
getFileInfo () {
|
||||
this.$http.get('att/attFile/getMultiFileInfos', {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.$route.query.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -1694,8 +1752,19 @@ export default {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarAccessInfoList = res.data
|
||||
console.log(res.data)
|
||||
}, e => {
|
||||
})
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
this.$set(this.typeApplicableMap, item.value, item.label)
|
||||
this.$set(this.nylxMap, item.value, item.label)
|
||||
this.$set(this.zrbmMap, item.value, item.label)
|
||||
this.$set(this.sycpxMap, item.value, item.label)
|
||||
})
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
@@ -1732,6 +1801,15 @@ export default {
|
||||
this.ROLELIST = res.data.ROLELIST
|
||||
this.GXHBQOptions = res.data.GXHBQXX
|
||||
this.askNatureOptions = res.data.ACCESSTYPE
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
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 => {
|
||||
})
|
||||
|
||||
@@ -11,7 +11,10 @@
|
||||
<div v-show="heightShow" class="transition-box">
|
||||
<p class="transition-box-p">
|
||||
<label class="transition-box-label">国家/地区:</label>
|
||||
<span class="transition-box-span">{{ sarAccessEO.countryArea }}</span>
|
||||
<span class="transition-box-span" v-if="sarAccessEO.countryArea.indexOf(',') >= 0">
|
||||
<span>{{ sarAccessEO.countryArea }}</span>
|
||||
</span>
|
||||
<span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
|
||||
</p>
|
||||
<p class="transition-box-p">
|
||||
<label class="transition-box-label">清单说明:</label>
|
||||
@@ -21,7 +24,7 @@
|
||||
<label class="transition-box-label">附件:</label>
|
||||
<div class="file-box" v-if="fileInfoList.length > 0">
|
||||
<p v-for="item in fileInfoList"
|
||||
:key="item.id">
|
||||
:key="item.id"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(item.id)"
|
||||
@@ -124,31 +127,35 @@
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="中文名称"
|
||||
align="center"
|
||||
fixed="left"
|
||||
width="180px"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="standEnName"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="英文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="typeApplicable"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="适用车型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="nylx"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="能源类型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ nylxMap[scope.row.nylx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="putTime"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -156,14 +163,14 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zccssrqgj"
|
||||
sortable
|
||||
width="210px"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="xcxssrq"
|
||||
prop="xcxssrqgj"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -171,35 +178,48 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zrbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="责任部门">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="sycpx"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="适用产品线">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="cycvppsbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="cycvppscn"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppsbm"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppscn"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
@@ -256,6 +276,12 @@ export default {
|
||||
name: "AccessStandardDetails",
|
||||
data() {
|
||||
return {
|
||||
textStatusMap: {},
|
||||
typeApplicableMap: {},
|
||||
nylxMap: {},
|
||||
zrbmMap: {},
|
||||
sycpxMap: {},
|
||||
countryAreaMap: {},
|
||||
standinfoList: [],
|
||||
standardFormTotal: 0,
|
||||
relateDialog: false,
|
||||
@@ -452,9 +478,8 @@ export default {
|
||||
},
|
||||
// 请求上传的文件信息
|
||||
getFileInfo() {
|
||||
console.log(this.sarAccessEO)
|
||||
this.$http.get("att/attFile/getMultiFileInfos", {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.sarAccessEO.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -474,7 +499,7 @@ export default {
|
||||
},
|
||||
// 附件下载事件
|
||||
fileDownLoad(attId) {
|
||||
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
@@ -560,6 +585,17 @@ export default {
|
||||
doLayout() {
|
||||
this.$refs.adminTable && this.$refs.adminTable.doLayout();
|
||||
this.$refs.skillTable && this.$refs.skillTable.doLayout();
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
this.$set(this.typeApplicableMap, item.value, item.label)
|
||||
this.$set(this.nylxMap, item.value, item.label)
|
||||
this.$set(this.zrbmMap, item.value, item.label)
|
||||
this.$set(this.sycpxMap, item.value, item.label)
|
||||
this.$set(this.countryAreaMap, item.value, item.label)
|
||||
})
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -589,6 +625,16 @@ export default {
|
||||
this.ROLELIST = res.data.ROLELIST;
|
||||
this.GXHBQOptions = res.data.GXHBQXX;
|
||||
this.askNatureOptions = res.data.ACCESSTYPE;
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
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.setMap(this.drawerCountryOptions)
|
||||
this.getGzzOption();
|
||||
}, e => {
|
||||
});
|
||||
|
||||
+71
-15
@@ -55,6 +55,7 @@
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
@@ -227,6 +228,9 @@
|
||||
prop="textStatus"
|
||||
width="120px"
|
||||
label="文本状态">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table
|
||||
@@ -321,25 +325,31 @@
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="standEnName"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="英文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="typeApplicable"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="适用车型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="nylx"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="能源类型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ nylxMap[scope.row.nylx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="putTime"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -347,14 +357,14 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zccssrqgj"
|
||||
sortable
|
||||
width="210px"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="XCXSSRQ"
|
||||
prop="xcxssrqgj"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -362,35 +372,48 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zrbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="责任部门">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="sycpx"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="适用产品线">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="cycvppsbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="cycvppscn"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppsbm"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppscn"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
@@ -511,11 +534,17 @@ export default {
|
||||
// }
|
||||
// }
|
||||
return {
|
||||
textStatusMap: {},
|
||||
typeApplicableMap: {},
|
||||
nylxMap: {},
|
||||
zrbmMap: {},
|
||||
sycpxMap: {},
|
||||
selectSearch : [],
|
||||
// 新增、编辑 基础信息字段
|
||||
sarAccessEO: {
|
||||
id: '',
|
||||
sortKey: 4,
|
||||
fileIds: '',
|
||||
detailedList: '',
|
||||
detailedListName: '',
|
||||
energyKind: '',
|
||||
@@ -1167,7 +1196,7 @@ export default {
|
||||
this.fileInfoList.map(item => {
|
||||
relateFile.push(item.id)
|
||||
})
|
||||
sarAccessEO.relateFile = relateFile.join(',')
|
||||
sarAccessEO.fileIds = relateFile.join(',')
|
||||
}
|
||||
if (!sarAccessEO.id) {
|
||||
// 新增
|
||||
@@ -1584,7 +1613,7 @@ export default {
|
||||
// 请求上传的文件信息
|
||||
getFileInfo () {
|
||||
this.$http.get('att/attFile/getMultiFileInfos', {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.$route.query.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -1678,7 +1707,24 @@ export default {
|
||||
}, e => {
|
||||
|
||||
})
|
||||
}
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
this.$set(this.typeApplicableMap, item.value, item.label)
|
||||
this.$set(this.nylxMap, item.value, item.label)
|
||||
this.$set(this.zrbmMap, item.value, item.label)
|
||||
this.$set(this.sycpxMap, item.value, item.label)
|
||||
})
|
||||
},
|
||||
// 点击上传的文件进行下载
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
// 监听 清单类型
|
||||
@@ -1714,6 +1760,15 @@ export default {
|
||||
this.ROLELIST = res.data.ROLELIST
|
||||
this.GXHBQOptions = res.data.GXHBQXX
|
||||
this.askNatureOptions = res.data.ACCESSTYPE
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
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 => {
|
||||
})
|
||||
@@ -1723,9 +1778,10 @@ export default {
|
||||
const accessRow = this.getAccessStandardRegRow
|
||||
this.$nextTick(() => {
|
||||
this.sarAccessEO.type = accessRow.type
|
||||
this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
|
||||
//this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
|
||||
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
|
||||
this.sarAccessEO.detailedListName = accessRow.detailedListName
|
||||
this.sarAccessEO.detailedList = accessRow.detailedList
|
||||
this.sarAccessEO.id = accessRow.id
|
||||
this.sarAccessEO.remark = accessRow.remark || ''
|
||||
this.sarAccessEO.relateFile = accessRow.relateFile
|
||||
|
||||
+74
-20
@@ -55,6 +55,7 @@
|
||||
:on-remove="delFileInfo"
|
||||
:on-success="uploadBackSuccess"
|
||||
:before-upload="beforeUpload"
|
||||
:on-preview="handleOnPreview"
|
||||
>
|
||||
<el-button class="common-button-default" size="mini">
|
||||
点击上传
|
||||
@@ -227,6 +228,9 @@
|
||||
prop="textStatus"
|
||||
width="120px"
|
||||
label="文本状态">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-table
|
||||
@@ -321,25 +325,31 @@
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="standEnName"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="英文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="typeApplicable"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="适用车型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="nylx"
|
||||
align="center"
|
||||
width="180px"
|
||||
label="能源类型">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ nylxMap[scope.row.nylx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="issueTime"
|
||||
prop="putTime"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -347,14 +357,14 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zccssrqgj"
|
||||
sortable
|
||||
width="210px"
|
||||
align="center"
|
||||
label="在产车实施日期">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="XCXSSRQ"
|
||||
prop="xcxssrqgj"
|
||||
sortable
|
||||
align="center"
|
||||
width="210px"
|
||||
@@ -362,40 +372,53 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="zccssrq"
|
||||
prop="zrbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="责任部门">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="sycpx"
|
||||
width="180px"
|
||||
align="center"
|
||||
label="适用产品线">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="cycvppsbm"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="cycvppscn"
|
||||
width="210px"
|
||||
align="center"
|
||||
label="乘用车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppsbm"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS编码">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
show-overflow-tooltip
|
||||
prop="textStatus"
|
||||
prop="kccvppscn"
|
||||
align="center"
|
||||
width="210px"
|
||||
label="卡车VPPS中文名称">
|
||||
</el-table-column>
|
||||
<el-table-column>
|
||||
<el-table-column width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
@@ -406,6 +429,7 @@
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
type="danger"
|
||||
style="margin-left: 0px"
|
||||
size="small" @click="moveDown(scope.$index, scope.row)"
|
||||
v-if="!disabledFlag"
|
||||
>下移</el-button>
|
||||
@@ -511,11 +535,17 @@ export default {
|
||||
// }
|
||||
// }
|
||||
return {
|
||||
textStatusMap: {},
|
||||
typeApplicableMap: {},
|
||||
nylxMap: {},
|
||||
zrbmMap: {},
|
||||
sycpxMap: {},
|
||||
selectSearch : [],
|
||||
// 新增、编辑 基础信息字段
|
||||
sarAccessEO: {
|
||||
id: '',
|
||||
sortKey: 2,
|
||||
fileIds: '',
|
||||
projectName: '',
|
||||
detailedListName: '',
|
||||
energyKind: '',
|
||||
@@ -1151,7 +1181,6 @@ export default {
|
||||
},
|
||||
// 提交按钮 事件
|
||||
saveSarAccess () {
|
||||
alert()
|
||||
this.$refs['sarAccessForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
let rowlist = []
|
||||
@@ -1169,7 +1198,7 @@ export default {
|
||||
this.fileInfoList.map(item => {
|
||||
relateFile.push(item.id)
|
||||
})
|
||||
sarAccessEO.relateFile = relateFile.join(',')
|
||||
sarAccessEO.fileIds = relateFile.join(',')
|
||||
}
|
||||
if (!sarAccessEO.id) {
|
||||
// 新增
|
||||
@@ -1215,8 +1244,6 @@ export default {
|
||||
_this: this
|
||||
}, res =>{
|
||||
this.sarAccessInfoSearchList = res.data.list
|
||||
this.$nextTick(() => {
|
||||
})
|
||||
}, e => {
|
||||
|
||||
})
|
||||
@@ -1586,7 +1613,7 @@ export default {
|
||||
// 请求上传的文件信息
|
||||
getFileInfo () {
|
||||
this.$http.get('att/attFile/getMultiFileInfos', {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.$route.query.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -1680,7 +1707,24 @@ export default {
|
||||
}, e => {
|
||||
|
||||
})
|
||||
}
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
this.$set(this.typeApplicableMap, item.value, item.label)
|
||||
this.$set(this.nylxMap, item.value, item.label)
|
||||
this.$set(this.zrbmMap, item.value, item.label)
|
||||
this.$set(this.sycpxMap, item.value, item.label)
|
||||
})
|
||||
},
|
||||
// 点击上传的文件进行下载
|
||||
handleOnPreview(file) {
|
||||
let attId = file.id
|
||||
if (attId != null && attId !== "") {
|
||||
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
|
||||
}
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
// 监听 清单类型
|
||||
@@ -1697,7 +1741,7 @@ export default {
|
||||
},
|
||||
mounted () {
|
||||
this.zqaId =this.$route.query.id;
|
||||
// this.getData()
|
||||
//this.getData()
|
||||
this.getDept()
|
||||
// 从数据库中查询各下拉框数据
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
@@ -1716,6 +1760,15 @@ export default {
|
||||
this.ROLELIST = res.data.ROLELIST
|
||||
this.GXHBQOptions = res.data.GXHBQXX
|
||||
this.askNatureOptions = res.data.ACCESSTYPE
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
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 => {
|
||||
})
|
||||
@@ -1725,9 +1778,10 @@ export default {
|
||||
const accessRow = this.getAccessStandardRegRow
|
||||
this.$nextTick(() => {
|
||||
this.sarAccessEO.type = accessRow.type
|
||||
this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
|
||||
//this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
|
||||
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
|
||||
this.sarAccessEO.detailedListName = accessRow.detailedListName
|
||||
this.sarAccessEO.projectName = accessRow.projectName
|
||||
this.sarAccessEO.id = accessRow.id
|
||||
this.sarAccessEO.remark = accessRow.remark || ''
|
||||
this.sarAccessEO.relateFile = accessRow.relateFile
|
||||
|
||||
@@ -357,7 +357,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
|
||||
prop="textStatus" label-width="150px" class="add-form-item">
|
||||
<template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
|
||||
<template slot="label">文本状态</template>
|
||||
<el-select v-model="sarStandardsInfoEO.textStatus"
|
||||
placeholder="请选择文本状态"
|
||||
clearable>
|
||||
@@ -1006,6 +1006,11 @@
|
||||
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 标准英文名称-->
|
||||
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
|
||||
<el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 标准类别-->
|
||||
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
|
||||
<search-select
|
||||
@@ -1027,20 +1032,161 @@
|
||||
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 标准年份-->
|
||||
<el-form-item :label="$t('m.standardYear')" class="serch-form-item">
|
||||
<el-date-picker
|
||||
v-model="sarStandardsSearch.standYear"
|
||||
type="date"
|
||||
placeholder="根据标准年份查找">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- 标准发布日期-->
|
||||
<el-form-item label="标准发布日期" class="serch-form-item">
|
||||
<el-date-picker
|
||||
v-model="sarStandardsSearch.issueTime"
|
||||
type="date"
|
||||
placeholder="根据标准发布日期查找">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- 标准性质-->
|
||||
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
|
||||
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 是否纳入标准清单-->
|
||||
<el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
|
||||
<el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
|
||||
<el-option value="yes" label="是"></el-option>
|
||||
<el-option value="no" label="否"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 实施日期-->
|
||||
<el-form-item label="实施日期">
|
||||
<el-date-picker
|
||||
v-model="sarStandardsSearch.putTime"
|
||||
type="date"
|
||||
placeholder="根据实施日期查找">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- 新车型实施日期-->
|
||||
<el-form-item title="新车型实施日期" label="新车型实施日期">
|
||||
<el-date-picker
|
||||
v-model="sarStandardsSearch.XCXTime"
|
||||
type="date"
|
||||
placeholder="根据新车型实施日期查找">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- 在产车实施日期-->
|
||||
<el-form-item title="在产车实施日期" label="在产车实施日期">
|
||||
<el-date-picker
|
||||
v-model="sarStandardsSearch.ZCCTime"
|
||||
type="date"
|
||||
placeholder="根据在产车实施日期查找">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<!-- 归口管理部门-->
|
||||
<el-form-item label="归口管理部门">
|
||||
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 起草单位-->
|
||||
<el-form-item label="起草单位">
|
||||
<el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 我司参与深度-->
|
||||
<el-form-item label="我司参与深度">
|
||||
<el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<!-- 能源类型-->
|
||||
<el-form-item label="能源类型">
|
||||
<el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 适用车型-->
|
||||
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
|
||||
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
|
||||
<el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 适用产品线(新增字段)-->
|
||||
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
|
||||
<el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
|
||||
<el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 适用认证-->
|
||||
<el-form-item label="适用认证">
|
||||
<el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 责任部门-->
|
||||
<el-form-item label="责任部门">
|
||||
<el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 责任工程师-->
|
||||
<el-form-item label="责任工程师">
|
||||
<el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- 关联模块-VPPS编码-->
|
||||
<el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
|
||||
<el-input v-model="sarStandardsSearch.svpps" clearable
|
||||
placeholder="根据关联模块-VPPS编码查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 代替标准号-->
|
||||
<el-form-item label="代替标准号">
|
||||
<el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 关联模块-中文名称-->
|
||||
<el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
|
||||
<el-input v-model="sarStandardsSearch.standNumber" clearable
|
||||
placeholder="根据关联模块-中文名称"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 采标编号-->
|
||||
<el-form-item label="采标编号" prop="nameShow">
|
||||
<el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 采标程度-->
|
||||
<el-form-item label="采标程度" prop="standNumber">
|
||||
<el-input v-model="sarStandardsSearch.standNumber" clearable
|
||||
placeholder="根据采标程度查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 引用标准-->
|
||||
<el-form-item label="引用标准">
|
||||
<el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 被引用标准-->
|
||||
<el-form-item label="被引用标准">
|
||||
<el-input v-model="sarStandardsSearch.citedStand" clearable
|
||||
placeholder="根据被引用标准查找"
|
||||
@keyup.enter.native="btnSearch"></el-input>
|
||||
</el-form-item>
|
||||
<!-- 关联模块(新增字段)-->
|
||||
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
|
||||
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
|
||||
@@ -1253,6 +1399,12 @@ export default {
|
||||
categoryOptions: [], // 所属类别下拉框
|
||||
categoryConfigOptions: [], // 所属类别下拉框
|
||||
assemClassOptions: [], // 总成分类下拉框
|
||||
qcdwOptions: [], // 起草单位
|
||||
nylxOptions: [], // 能源类型
|
||||
sycpxOptions: [], // 适用产品线
|
||||
syzrOptions: [], // 适用认证
|
||||
zrbmOptions: [], // 责任部门
|
||||
zrgcsOptions: [], // 责任工程师
|
||||
standAttributeList: [],
|
||||
sarStandardsSearch: {
|
||||
page: 1,
|
||||
@@ -1261,19 +1413,33 @@ export default {
|
||||
validFlag: '0',
|
||||
menuId: '',
|
||||
country: '',
|
||||
standNumber: '',
|
||||
standName: '',
|
||||
standState: '',
|
||||
standNature: '',
|
||||
issueTime: '',
|
||||
// applyArctic: '',
|
||||
replaceStandNum: '',
|
||||
// replaceStandNumCope: '',
|
||||
// replaceStandNumList: [],
|
||||
replacedStandNum: '',
|
||||
standNumber: '', // 标准编号
|
||||
standName: '', // 标准名称
|
||||
standState: '', // 标准状态
|
||||
issueTime: '', // 标准发布日期
|
||||
svpps: '', // 关联模块-VPPS编码
|
||||
replaceStandNum: '', // 代替标准号
|
||||
replacedStandNum: '', // 被代替标准号
|
||||
citeStand: '', // 引用标准
|
||||
citedStand: '', // 被引用标准
|
||||
synopsis: '', // 内容摘要
|
||||
// category: '', // 所属类别
|
||||
standSort: '' // 标准类别
|
||||
applyArctic: '', // 适用车型
|
||||
sycpx: '', // 适用产品线
|
||||
syzr: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
dutyEngineer: '', // 责任工程师
|
||||
standSort: '', // 标准类别
|
||||
standYear: '', // 标准年份
|
||||
standEnName: '', // 标准英文名称
|
||||
standNature: '', // 标准性质
|
||||
putTime: '', // 实施日期
|
||||
isRelateAccess: '', // 是否纳入标准清单
|
||||
nameShow: '', // 我司参与深度
|
||||
qcdw: '', // 起草单位
|
||||
nameShow: '', // 归口管理部门
|
||||
ZCCTime: '', // 在产车实施日期
|
||||
XCXTime: '', // 新车型实施日期
|
||||
energyKind: '', // 能源类型
|
||||
}, // 分页查询过程中用到的对象
|
||||
// 树形结构
|
||||
// tree function
|
||||
@@ -2114,7 +2280,6 @@ export default {
|
||||
this.selectChildMenu(data)
|
||||
this.productModal = true
|
||||
// 取消所有的选中效果
|
||||
this.handleSelectAll(false)
|
||||
this.productTitle = '编辑信息'
|
||||
// const newChild = { id: this.id++, label: 'testtest', children: [] };
|
||||
// if (!data.children) {
|
||||
@@ -2128,7 +2293,6 @@ export default {
|
||||
this.selectChildMenu(data)
|
||||
this.productModal = true
|
||||
// 取消所有的选中效果
|
||||
this.handleSelectAll(false)
|
||||
this.productTitle = '新增下级菜单信息'
|
||||
this.productModelAdd.dicTypeCode = ''
|
||||
// const newChild = { id: this.id++, label: 'testtest', children: [] };
|
||||
@@ -2148,7 +2312,7 @@ export default {
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$http.delete("sarResource/ts-resource", {
|
||||
menuId: data.id
|
||||
resourceId: data.id
|
||||
}, res => {
|
||||
}, e => {
|
||||
if(e.ok){
|
||||
@@ -4077,7 +4241,7 @@ export default {
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
this.standStateOptions = res.data.WBZTCLASS // 文本状态
|
||||
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
|
||||
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
|
||||
this.applyArcticOptions = res.data.SYCXCLASS // 适用车型
|
||||
this.categoryOptions = res.data.NYLXCLASS // 能源类型
|
||||
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
|
||||
this.cysdOptions = res.data.WSCYSD // 我司参与深度
|
||||
@@ -4085,6 +4249,12 @@ export default {
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.txlbOptions = res.data.TXLBCLASS // 体系类别
|
||||
this.qcdwOptions = res.data.QCDW // 起草单位
|
||||
this.nylxOptions = res.data.NYLXCLASS // 能源类型
|
||||
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.syzrOptions = res.data.SYRZCLASS // 适用认证
|
||||
this.getGzzOption()
|
||||
this.setMap(this.standStateOptions)
|
||||
console.log(this.standStateOptions, '文本状态')
|
||||
@@ -4234,6 +4404,9 @@ export default {
|
||||
text-align: center;
|
||||
margin-top: 6px;
|
||||
background: #F9F9F9;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis
|
||||
}
|
||||
/deep/.el-input__inner {
|
||||
height: 30px;
|
||||
@@ -4242,5 +4415,8 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.el-date-editor.el-input, .el-date-editor.el-input__inner{
|
||||
width: 190px
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@@ -231,7 +231,7 @@
|
||||
取消收藏
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
|
||||
<el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>
|
||||
<!-- <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
|
||||
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">删除</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
@@ -3960,6 +3960,7 @@ export default {
|
||||
this.assemClassOptions = res.data.ASSEMCLASSIFY // 总成分类
|
||||
this.categoryConfigOptions = res.data.CATEGORY
|
||||
this.standAttributeList = res.data.RULETYPE
|
||||
this.qcdwOptions = res.data.QCDW
|
||||
this.getGzzOption()
|
||||
this.setMap(this.standStateOptions)
|
||||
}, e => {
|
||||
|
||||
+43
-6
@@ -142,80 +142,116 @@
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productLineId"
|
||||
label="产品线">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="standNumber"
|
||||
label="项目编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productName"
|
||||
label="项目名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="standNumber"
|
||||
label="标准编号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="standName"
|
||||
label="标准名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="standardItem"
|
||||
label="标准章条">
|
||||
label="条款号">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="standardInfo"
|
||||
label="标准主要内容">
|
||||
label="条款名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="productType"
|
||||
align="center"
|
||||
prop="productType"
|
||||
label="在研产品">
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="researchImplementationTime"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="researchCompliance"
|
||||
label="合规">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="researchNonCompliance"
|
||||
width="150px"
|
||||
align="center"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="researchNonCompliance"
|
||||
label="不合规项目">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="researchCountermeasures"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="researchCompletionTime"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
align="center"
|
||||
prop="center"
|
||||
label="在产产品">
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productionImplementationTime"
|
||||
label="实施时间">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productionCompliance"
|
||||
label="合规(具体情况)">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
width="150px"
|
||||
align="center"
|
||||
label="不合规">
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productionCountermeasures"
|
||||
label="应对措施">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="150px"
|
||||
align="center"
|
||||
prop="productionCompletionTime"
|
||||
label="完成时间">
|
||||
</el-table-column>
|
||||
@@ -293,6 +329,7 @@ export default {
|
||||
this.sarProject.country = ''
|
||||
this.sarProject.standCode=''
|
||||
this.sarProject.standName = ''
|
||||
this.sarProject.standNumber=''
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
|
||||
+1
@@ -264,6 +264,7 @@ name: "technologyInvolveProject",
|
||||
this.sarProject.country = ''
|
||||
this.sarProject.standCode=''
|
||||
this.sarProject.standName = ''
|
||||
this.sarProject.standNumber=''
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
|
||||
@@ -167,17 +167,17 @@
|
||||
label="责任部门">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="dutyEngineer"
|
||||
prop="dutyEngineerName"
|
||||
width="150"
|
||||
label="责任工程师">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="authEngineer"
|
||||
prop="authEngineerName"
|
||||
width="150"
|
||||
label="认证工程师">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="qaEngineer"
|
||||
prop="qaEngineerName"
|
||||
width="150"
|
||||
label="质量工程师">
|
||||
</el-table-column>
|
||||
|
||||
Reference in New Issue
Block a user