海外日期 文本状态展示 去掉属性管理创建日期的排序

This commit is contained in:
宋伟佳
2022-01-07 16:10:50 +08:00
parent f1f353d308
commit b5a03548c7
2 changed files with 12 additions and 21 deletions
@@ -103,7 +103,7 @@
<!-- <div v-if="scope.row.enable === '1'">未启用</div>--> <!-- <div v-if="scope.row.enable === '1'">未启用</div>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="creationTime" label="创建时间" sortable> <el-table-column prop="creationTime" label="创建时间" >
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- fixed="right"--> <!-- fixed="right"-->
@@ -269,12 +269,12 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' scope.row.SSRQ
}}</span> }}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' scope.row.SSRQ
}}</span> }}</span>
<span v-else style="color: #333333">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0, 10) : '-' }}</span> <span v-else style="color: #333333">{{ scope.row.SSRQ }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -285,13 +285,13 @@
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' scope.row.XCXSSRQ
}}</span> }}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' scope.row.XCXSSRQ
}}</span> }}</span>
<span v-else style="color: #333333">{{ <span v-else style="color: #333333">{{
scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' scope.row.XCXSSRQ
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -302,13 +302,13 @@
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{
scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' scope.row.ZCCSSRQ
}}</span> }}</span>
<span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{ <span v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF">{{
scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' scope.row.ZCCSSRQ
}}</span> }}</span>
<span v-else style="color: #333333">{{ <span v-else style="color: #333333">{{
scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' scope.row.ZCCSSRQ
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -2591,7 +2591,6 @@ export default {
this.modalShowFlag3 = false this.modalShowFlag3 = false
}, },
popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
console.log(checkedData)
if (checkedData && checkedData.length != 0) { if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) { if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
@@ -2613,7 +2612,6 @@ export default {
}) })
}, },
choiceZRRS (type, title, id) { choiceZRRS (type, title, id) {
console.log('2077',title)
this.nodeList = [] this.nodeList = []
this.nodeList.push(id) this.nodeList.push(id)
this.userType = type this.userType = type
@@ -2621,7 +2619,6 @@ export default {
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
}, },
checkedRole2 (data) { checkedRole2 (data) {
console.log('1712',this.drawerTitle)
let idList = '' let idList = ''
let nameList = '' let nameList = ''
data.forEach( item => { data.forEach( item => {
@@ -2874,7 +2871,6 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
console.log('2717', displayLocation)
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
@@ -2929,7 +2925,6 @@ export default {
}) })
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
console.log('2771',this.dynamicFormField)
this.loading = false this.loading = false
}) })
}) })
@@ -3366,7 +3361,6 @@ export default {
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
formFieldList.forEach((field) => { formFieldList.forEach((field) => {
displayLocation.forEach((location) => { displayLocation.forEach((location) => {
console.log(location)
let value = dynamicFormField[field.attrField] let value = dynamicFormField[field.attrField]
if (value && typeof value === 'number') { if (value && typeof value === 'number') {
value = this.$dateFormat(value, 'yyyy-MM-dd') value = this.$dateFormat(value, 'yyyy-MM-dd')
@@ -3810,11 +3804,8 @@ export default {
// // 自定义属性字段高级搜索处理 // // 自定义属性字段高级搜索处理
//advanceSearchVOStr //advanceSearchVOStr
const advanceSearchVOList = []; const advanceSearchVOList = [];
console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) { for (let key in this.advanceSearchMapping) {
console.log('key',key)
const value = this.advanceSearchMapping[key]; const value = this.advanceSearchMapping[key];
console.log('value',value)
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){ if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
advanceSearchVOList.push({ advanceSearchVOList.push({
connect: "and", connect: "and",
@@ -5103,10 +5094,10 @@ export default {
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
}, res => { }, res => {
this.setMap(res.data.WBZTCLASS)
this.allSelectOptions = res.data || {} this.allSelectOptions = res.data || {}
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系 this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
@@ -5127,11 +5118,11 @@ export default {
this.nylxOptions.options = res.data.NYLXCLASS;//能源类型 this.nylxOptions.options = res.data.NYLXCLASS;//能源类型
this.syrzOptions.options = res.data.SYRZCLASS;//适用认证 this.syrzOptions.options = res.data.SYRZCLASS;//适用认证
this.gkglbmOptions = res.data.GKGLBM;//归口管理部门 this.gkglbmOptions = res.data.GKGLBM;//归口管理部门
this.standStateOptions = res.data.WBZTCLASS // 文本状态
// 模块结构单元变型号 // 模块结构单元变型号
this.dybxhOptions.options = res.data.DYBXH this.dybxhOptions.options = res.data.DYBXH
this.getGzzOption() this.getGzzOption()
this.setMap(this.standStateOptions)
}, e => { }, e => {
}) })
this.getDomesticStandardTable() this.getDomesticStandardTable()