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:
yuezhihang
2021-12-05 21:46:27 +08:00
parent 62bab81cb2 af41c9909b
commit 334a317f6f
5 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+24 -3
View File
@@ -160,17 +160,17 @@
</el-table-column>
<el-table-column prop="ssrq" label="实施日期" width="120" align="center">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0,10) : '' }}</span>
<span>{{ scope.row.ssrq }}</span>
</template>
</el-table-column>
<el-table-column prop="xcxssrq" label="新车型实施日期" width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0,10) : '' }}</span>
<span>{{ scope.row.xcxssrq }}</span>
</template>
</el-table-column>
<el-table-column prop="zccssrq" label="在产车实施日期" width="150" align="center">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0,10) : '' }}</span>
<span>{{ scope.row.zccssrq }}</span>
</template>
</el-table-column>
<el-table-column prop="applyType" label="适用车型" align="center">
@@ -440,6 +440,7 @@ export default {
_this: this,
}, res => {
console.log('608',res)
// console.log('608',res.data.records[0].zccssrq.replace(' 00:00:00',''))
// 适用车型转换
for (let a = 0; a < res.data.records.length; a++) {
if (res.data.records[a].applyType !== null) {
@@ -454,6 +455,26 @@ export default {
}
}
}
for (let i = 0; i < res.data.records.length; i++) {
let putTimeReplaceTimes = res.data.records[i].putTime.length/19
let ssrqReplaceTimes = res.data.records[i].ssrq.length/19
let xcxssrqReplaceTimes = res.data.records[i].xcxssrq.length/19
let zccssrqReplaceTimes = res.data.records[i].zccssrq.length/19
for (let j = 0; j < putTimeReplaceTimes; j++) {
res.data.records[i].putTime = res.data.records[i].putTime.replace(' 00:00:00','')
}
for (let j = 0; j < ssrqReplaceTimes; j++) {
res.data.records[i].ssrq = res.data.records[i].ssrq.replace(' 00:00:00','')
}
for (let j = 0; j < xcxssrqReplaceTimes; j++) {
res.data.records[i].xcxssrq = res.data.records[i].xcxssrq.replace(' 00:00:00','')
}
for (let j = 0; j < zccssrqReplaceTimes; j++) {
res.data.records[i].zccssrq = res.data.records[i].zccssrq.replace(' 00:00:00','')
}
}
this.warningTableDatas = res.data.records
this.pageConfig.page = res.data.current
if ((this.warningTableDatas.length === 0 || this.warningTableDatas === []) && this.pageConfig.page !== 1) {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
-16
View File
@@ -114,7 +114,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
@@ -132,7 +131,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
@@ -197,7 +195,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -346,7 +343,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -356,7 +352,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -369,7 +364,6 @@
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -379,7 +373,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -389,7 +382,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -446,7 +438,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -463,7 +454,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -480,7 +470,6 @@
</el-table-column>
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -497,7 +486,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -514,7 +502,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -573,7 +560,6 @@
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -585,7 +571,6 @@
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -596,7 +581,6 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
sortable
prop="standStatusShow"
label="文本状态"
width="110"
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
-16
View File
@@ -106,7 +106,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
@@ -124,7 +123,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
@@ -217,7 +215,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -367,7 +364,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -377,7 +373,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -390,7 +385,6 @@
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -400,7 +394,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -410,7 +403,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -467,7 +459,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -484,7 +475,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -501,7 +491,6 @@
</el-table-column>
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -518,7 +507,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -535,7 +523,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -594,7 +581,6 @@
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -606,7 +592,6 @@
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -617,7 +602,6 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
sortable
prop="standStatusShow"
label="文本状态"
width="110"
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
-16
View File
@@ -106,7 +106,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
@@ -124,7 +123,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
@@ -201,7 +199,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -351,7 +348,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -361,7 +357,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -374,7 +369,6 @@
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -384,7 +378,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -394,7 +387,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -451,7 +443,6 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable="custom"
width="120"
label="发布日期">
<template slot-scope="scope">
@@ -468,7 +459,6 @@
</el-table-column>
<el-table-column
prop="ssrq"
sortable="custom"
width="120"
label="实施日期">
<template slot-scope="scope">
@@ -485,7 +475,6 @@
</el-table-column>
<el-table-column
prop="xcxssrq"
sortable="custom"
width="150"
label="新车型实施日期">
<template slot-scope="scope">
@@ -502,7 +491,6 @@
</el-table-column>
<el-table-column
prop="zccssrq"
sortable="custom"
width="150"
label="在产车实施日期">
<template slot-scope="scope">
@@ -519,7 +507,6 @@
</el-table-column>
<el-table-column
prop="textStatus"
sortable="custom"
width="110"
label="文本状态">
<!-- <template slot="header" slot-scope="scope">-->
@@ -578,7 +565,6 @@
<el-table-column
prop="issueTime"
label="发布日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -590,7 +576,6 @@
<el-table-column
prop="putTime"
label="实施日期"
sortable
width="120"
>
<template slot-scope="scope">
@@ -601,7 +586,6 @@
</el-table-column>
<el-table-column
show-overflow-tooltip
sortable
prop="standStatusShow"
label="文本状态"
width="110"
src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
-3
View File
@@ -100,7 +100,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? scope.row.ssrq.substring(0, 10) : '-' }}</span>
@@ -118,7 +117,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
@@ -195,7 +193,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>