Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -467,20 +467,6 @@ export default {
|
|||||||
/deep/ .el-table th {
|
/deep/ .el-table th {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.hover_container{
|
|
||||||
width: 50%;
|
|
||||||
color: #fff;
|
|
||||||
background-color: #8b8c89;
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
border-radius: 8px;
|
|
||||||
text-align: center;
|
|
||||||
line-height: 20px;
|
|
||||||
position: absolute;
|
|
||||||
left: 50px;
|
|
||||||
z-index: 99;
|
|
||||||
transform: translateY(-88%);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -171,12 +171,8 @@
|
|||||||
prop="technicalRequir"
|
prop="technicalRequir"
|
||||||
width="200"
|
width="200"
|
||||||
label="核心技术要求"
|
label="核心技术要求"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div class="el-input">
|
|
||||||
<input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
:disabled="acceptShow"
|
:disabled="acceptShow"
|
||||||
@@ -184,97 +180,80 @@
|
|||||||
width="150"
|
width="150"
|
||||||
v-if="form.itemsNum1"
|
v-if="form.itemsNum1"
|
||||||
label="基于上一版本差异"
|
label="基于上一版本差异"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div class="el-input">
|
|
||||||
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
v-if="sarType === 'FOREIGN' && form.itemsNum1"
|
||||||
prop="changePoint"
|
prop="changePoint"
|
||||||
width="150"
|
width="150"
|
||||||
label="相对于国行标差异点"
|
label="相对于国行标差异点"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div class="el-input">
|
|
||||||
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="complianceRequir"
|
prop="complianceRequir"
|
||||||
width="150"
|
width="150"
|
||||||
label="符合项状态"
|
label="符合项状态"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>
|
{{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="complianceState"
|
prop="complianceState"
|
||||||
width="200"
|
width="200"
|
||||||
label="合规性分析"
|
label="合规性分析"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div class="el-input">
|
|
||||||
<input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="180"
|
width="180"
|
||||||
|
show-overflow-tooltip
|
||||||
label="新车型实施日期"
|
label="新车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-date-picker
|
|
||||||
:disabled="acceptShow"
|
|
||||||
v-model.lazy="scope.row.newData"
|
|
||||||
type="date"
|
|
||||||
placeholder="选择新车型实施日期">
|
|
||||||
</el-date-picker>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="onlineData"
|
prop="onlineData"
|
||||||
width="180"
|
width="180"
|
||||||
|
show-overflow-tooltip
|
||||||
label="在产车型实施日期"
|
label="在产车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-date-picker
|
|
||||||
:disabled="acceptShow"
|
|
||||||
v-model.lazy="scope.row.onlineData"
|
|
||||||
type="date"
|
|
||||||
placeholder="选择新车型实施日期">
|
|
||||||
</el-date-picker>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="applyArctic"
|
prop="applyArctic"
|
||||||
width="200"
|
width="200"
|
||||||
label="适用车型"
|
label="适用车型"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-select multiple v-model.lazy="scope.row.applyArctic">
|
{{ scope.row.applyArctic.toString() }}
|
||||||
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
|
||||||
</el-select>
|
|
||||||
<!-- <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>-->
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="unitDeptName"
|
prop="unitDeptName"
|
||||||
label="责任部门"
|
label="责任部门"
|
||||||
width="200"
|
width="200"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="责任人"
|
label="责任人"
|
||||||
width="170"
|
width="170"
|
||||||
prop="zrUserIdName"
|
prop="zrUserIdName"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="操作"
|
||||||
|
width="100"
|
||||||
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="回执说明">
|
<el-collapse-item title="回执说明">
|
||||||
@@ -413,18 +392,26 @@
|
|||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
|
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
|
||||||
<el-date-picker
|
<!-- <el-date-picker-->
|
||||||
|
<!-- v-model="plForm.newData"-->
|
||||||
|
<!-- type="date"-->
|
||||||
|
<!-- placeholder="选择新车型实施日期">-->
|
||||||
|
<!-- </el-date-picker>-->
|
||||||
|
<custom-date-pick-group
|
||||||
|
:config="plForm"
|
||||||
v-model="plForm.newData"
|
v-model="plForm.newData"
|
||||||
type="date"
|
></custom-date-pick-group>
|
||||||
placeholder="选择新车型实施日期">
|
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
|
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
|
||||||
<el-date-picker
|
<!-- <el-date-picker-->
|
||||||
|
<!-- v-model="plForm.onlineData"-->
|
||||||
|
<!-- type="date"-->
|
||||||
|
<!-- placeholder="选择在产车实施日期">-->
|
||||||
|
<!-- </el-date-picker>-->
|
||||||
|
<custom-date-pick-group
|
||||||
|
:config="plForm"
|
||||||
v-model="plForm.onlineData"
|
v-model="plForm.onlineData"
|
||||||
type="date"
|
></custom-date-pick-group>
|
||||||
placeholder="选择在产车实施日期">
|
|
||||||
</el-date-picker>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||||
<el-select multiple v-model="plForm.applyArctic">
|
<el-select multiple v-model="plForm.applyArctic">
|
||||||
@@ -438,6 +425,73 @@
|
|||||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
<el-drawer
|
||||||
|
title="编辑"
|
||||||
|
:visible.sync="modalshowflag2"
|
||||||
|
:wrapperClosable="false"
|
||||||
|
size="800px">
|
||||||
|
<div class="demo-drawer-content">
|
||||||
|
<el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
|
||||||
|
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||||
|
<el-input
|
||||||
|
v-model="editForm.technicalRequir"
|
||||||
|
placeholder="请输入核心技术要求"
|
||||||
|
maxlength="500"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||||
|
<el-input
|
||||||
|
v-model="editForm.changePoint"
|
||||||
|
placeholder="请输入国内标准的差异点"
|
||||||
|
maxlength="500"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||||
|
<el-input
|
||||||
|
v-model="editForm.changePoint"
|
||||||
|
placeholder="请输入上一版本差异点"
|
||||||
|
maxlength="500"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
|
||||||
|
<el-select
|
||||||
|
v-model="editForm.complianceRequir"
|
||||||
|
placeholder="请选择符合性要求">
|
||||||
|
<el-option value="1" label="符合"></el-option>
|
||||||
|
<el-option value="2" label="不符合"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
|
||||||
|
<el-input
|
||||||
|
v-model="editForm.complianceState"
|
||||||
|
placeholder="请输入合规性分析"
|
||||||
|
maxlength="500"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
|
||||||
|
<custom-date-pick-group
|
||||||
|
:config="editForm"
|
||||||
|
v-model="editForm.newData"
|
||||||
|
></custom-date-pick-group>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
|
||||||
|
<custom-date-pick-group
|
||||||
|
:config="editForm"
|
||||||
|
v-model="editForm.onlineData"
|
||||||
|
></custom-date-pick-group>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||||
|
<el-select multiple v-model="editForm.applyArctic">
|
||||||
|
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
</div>
|
||||||
|
<div id="roleFormButton3" class="demo-drawer-footer">
|
||||||
|
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
|
||||||
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-drawer>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
title="查看条款内容"
|
title="查看条款内容"
|
||||||
:visible.sync="itermsConditionsFlag"
|
:visible.sync="itermsConditionsFlag"
|
||||||
@@ -452,6 +506,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
|
||||||
import ProcessHeader from '../../components/ProcessHeader'
|
import ProcessHeader from '../../components/ProcessHeader'
|
||||||
import ProcessFooter from '../../components/ProcessFooter'
|
import ProcessFooter from '../../components/ProcessFooter'
|
||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
@@ -462,6 +517,8 @@
|
|||||||
name: "bzjdStep3",
|
name: "bzjdStep3",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
modalshowflag2: false,
|
||||||
|
itemId: '',
|
||||||
drawerModal: false,
|
drawerModal: false,
|
||||||
//折叠的标志,true为折叠,false为不折叠
|
//折叠的标志,true为折叠,false为不折叠
|
||||||
foldFormFlag: false,
|
foldFormFlag: false,
|
||||||
@@ -488,6 +545,15 @@
|
|||||||
onlineData: '', // 在产车实施日期
|
onlineData: '', // 在产车实施日期
|
||||||
applyArctic: '', // 适用车型
|
applyArctic: '', // 适用车型
|
||||||
},
|
},
|
||||||
|
editForm: {
|
||||||
|
technicalRequir: '', // 核心技术要求
|
||||||
|
changePoint: '', // 国内标准的差异点
|
||||||
|
complianceRequir: '1', // 符合性要求
|
||||||
|
complianceState: '', // 合规性分析
|
||||||
|
newData: '', // 新车型实施日期
|
||||||
|
onlineData: '', // 在产车实施日期
|
||||||
|
applyArctic: '', // 适用车型
|
||||||
|
},
|
||||||
modalshowflag: false,
|
modalshowflag: false,
|
||||||
sarType: '',
|
sarType: '',
|
||||||
itemList: [],
|
itemList: [],
|
||||||
@@ -513,11 +579,42 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
CustomDatePickGroup,
|
||||||
ProcessHeader,
|
ProcessHeader,
|
||||||
ProcessFooter,
|
ProcessFooter,
|
||||||
ProcessTitle
|
ProcessTitle
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
itemEdit (row) {
|
||||||
|
this.itemId = row.id
|
||||||
|
this.modalshowflag2 = true
|
||||||
|
this.editForm = {
|
||||||
|
technicalRequir: row.technicalRequir, // 核心技术要求
|
||||||
|
changePoint: row.changePoint, // 国内标准的差异点
|
||||||
|
complianceRequir: row.complianceRequir || '1', // 符合性要求
|
||||||
|
complianceState: row.complianceState, // 合规性分析
|
||||||
|
newData: row.newData, // 新车型实施日期
|
||||||
|
onlineData: row.onlineData, // 在产车实施日期
|
||||||
|
applyArctic: row.applyArctic, // 适用车型
|
||||||
|
}
|
||||||
|
},
|
||||||
|
saveUserInfo2 () {
|
||||||
|
for( let a = 0; a < this.itemList.length; a++) {
|
||||||
|
if (this.itemList[a].id === this.itemId) {
|
||||||
|
this.itemList[a].technicalRequir = this.editForm.technicalRequir
|
||||||
|
this.itemList[a].changePoint = this.editForm.changePoint
|
||||||
|
this.itemList[a].complianceRequir = this.editForm.complianceRequir
|
||||||
|
this.itemList[a].complianceState = this.editForm.complianceState
|
||||||
|
this.itemList[a].newData = this.editForm.newData
|
||||||
|
this.itemList[a].onlineData = this.editForm.onlineData
|
||||||
|
this.itemList[a].applyArctic = this.editForm.applyArctic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.modalshowflag2 = false
|
||||||
|
},
|
||||||
|
cancleUserInfo2 () {
|
||||||
|
this.modalshowflag2 = false
|
||||||
|
},
|
||||||
handleTransfer() {
|
handleTransfer() {
|
||||||
this.drawerModal = true
|
this.drawerModal = true
|
||||||
},
|
},
|
||||||
@@ -570,7 +667,6 @@
|
|||||||
}, e => {})
|
}, e => {})
|
||||||
},
|
},
|
||||||
saveUserInfo () {
|
saveUserInfo () {
|
||||||
console.log(this.plForm.applyArctic);
|
|
||||||
for( let a = 0; a < this.itemList.length; a++) {
|
for( let a = 0; a < this.itemList.length; a++) {
|
||||||
for ( let b = 0; b < this.idList.length; b++) {
|
for ( let b = 0; b < this.idList.length; b++) {
|
||||||
if (this.itemList[a].id === this.idList[b]) {
|
if (this.itemList[a].id === this.idList[b]) {
|
||||||
@@ -755,7 +851,7 @@
|
|||||||
item.changePoint = item.changePoint || ''
|
item.changePoint = item.changePoint || ''
|
||||||
item.technicalRequir = item.technicalRequir || ''
|
item.technicalRequir = item.technicalRequir || ''
|
||||||
item.itemsTitle = item.itermsConditions
|
item.itemsTitle = item.itermsConditions
|
||||||
item.applyArctic = item.applyArctic || ''
|
item.applyArctic = item.applyArctic || []
|
||||||
})
|
})
|
||||||
this.itemList = itemList
|
this.itemList = itemList
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -203,27 +203,27 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
|
show-overflow-tooltip
|
||||||
width="150"
|
width="150"
|
||||||
label="新车型实施日期"
|
label="新车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="onlineData"
|
prop="onlineData"
|
||||||
|
show-overflow-tooltip
|
||||||
width="150"
|
width="150"
|
||||||
label="在产车型实施日期"
|
label="在产车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="applyArctic"
|
prop="applyArctic"
|
||||||
width="150"
|
width="150"
|
||||||
label="适用车型"
|
label="适用车型"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.applyArctic.toString() }}
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="unitDeptName"
|
prop="unitDeptName"
|
||||||
|
|||||||
@@ -202,28 +202,28 @@
|
|||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="150"
|
width="150"
|
||||||
label="新车型实施日期"
|
label="新车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
prop="onlineData"
|
prop="onlineData"
|
||||||
width="150"
|
width="150"
|
||||||
label="在产车型实施日期"
|
label="在产车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="applyArctic"
|
prop="applyArctic"
|
||||||
width="150"
|
width="150"
|
||||||
label="适用车型"
|
label="适用车型"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.applyArctic.toString() }}
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="unitDeptName"
|
prop="unitDeptName"
|
||||||
|
|||||||
@@ -205,26 +205,26 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="newData"
|
prop="newData"
|
||||||
width="150"
|
width="150"
|
||||||
|
show-overflow-tooltip
|
||||||
label="新车型实施日期"
|
label="新车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="onlineData"
|
prop="onlineData"
|
||||||
width="150"
|
width="150"
|
||||||
|
show-overflow-tooltip
|
||||||
label="在产车型实施日期"
|
label="在产车型实施日期"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
|
||||||
<div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}</div>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="applyArctic"
|
prop="applyArctic"
|
||||||
width="150"
|
width="150"
|
||||||
label="适用车型"
|
label="适用车型"
|
||||||
|
show-overflow-tooltip
|
||||||
align="center">
|
align="center">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ scope.row.applyArctic.toString() }}
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="unitDeptName"
|
prop="unitDeptName"
|
||||||
|
|||||||
@@ -134,18 +134,12 @@
|
|||||||
prop="XCXSSRQ"
|
prop="XCXSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="新车型实施日期">
|
label="新车型实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="ZCCSSRQ"
|
prop="ZCCSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="在产车实施日期">
|
label="在产车实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
@@ -645,18 +639,12 @@
|
|||||||
prop="XCXSSRQ"
|
prop="XCXSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="新车型实施日期">
|
label="新车型实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="ZCCSSRQ"
|
prop="ZCCSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="在产车实施日期">
|
label="在产车实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
@@ -1052,7 +1040,7 @@ export default {
|
|||||||
this.getStandData();
|
this.getStandData();
|
||||||
},
|
},
|
||||||
getStandData() {
|
getStandData() {
|
||||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
|
||||||
standType: this.standardSearch.standType,
|
standType: this.standardSearch.standType,
|
||||||
standNumber: this.standardSearch.standNumber,
|
standNumber: this.standardSearch.standNumber,
|
||||||
page: this.pageNo,
|
page: this.pageNo,
|
||||||
@@ -1062,9 +1050,9 @@ export default {
|
|||||||
}, res => {
|
}, res => {
|
||||||
this.standardData = res.data.list;
|
this.standardData = res.data.list;
|
||||||
this.standardData.forEach(item => {
|
this.standardData.forEach(item => {
|
||||||
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
|
this.$set(item, "ZCCSSRQ", item.zccssrq);
|
||||||
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
|
this.$set(item, "XCXSSRQ", item.xcxssrq);
|
||||||
});
|
})
|
||||||
this.totalNo = res.data.count;
|
this.totalNo = res.data.count;
|
||||||
}, e => {
|
}, e => {
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -134,18 +134,12 @@
|
|||||||
prop="XCXSSRQ"
|
prop="XCXSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="新车型实施日期">
|
label="新车型实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="ZCCSSRQ"
|
prop="ZCCSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="在产车实施日期">
|
label="在产车实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
@@ -615,18 +609,12 @@
|
|||||||
prop="XCXSSRQ"
|
prop="XCXSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="新车型实施日期">
|
label="新车型实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
prop="ZCCSSRQ"
|
prop="ZCCSSRQ"
|
||||||
align="center"
|
align="center"
|
||||||
label="在产车实施日期">
|
label="在产车实施日期">
|
||||||
<template slot-scope="scope">
|
|
||||||
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
@@ -984,7 +972,7 @@ export default {
|
|||||||
},
|
},
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData() {
|
getStandData() {
|
||||||
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
|
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
|
||||||
standType: this.standardSearch.standType,
|
standType: this.standardSearch.standType,
|
||||||
standNumber: this.standardSearch.standNumber,
|
standNumber: this.standardSearch.standNumber,
|
||||||
page: this.pageNo,
|
page: this.pageNo,
|
||||||
@@ -994,13 +982,8 @@ export default {
|
|||||||
}, res => {
|
}, res => {
|
||||||
this.standardData = res.data.list;
|
this.standardData = res.data.list;
|
||||||
this.standardData.forEach(item => {
|
this.standardData.forEach(item => {
|
||||||
if (item.attrInfoMap === null) {
|
this.$set(item, "ZCCSSRQ", item.zccssrq);
|
||||||
this.$set(item, "ZCCSSRQ", '');
|
this.$set(item, "XCXSSRQ", item.xcxssrq);
|
||||||
this.$set(item, "XCXSSRQ", '');
|
|
||||||
} else {
|
|
||||||
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
|
|
||||||
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
this.totalNo = res.data.count;
|
this.totalNo = res.data.count;
|
||||||
}, e => {
|
}, e => {
|
||||||
|
|||||||
@@ -953,13 +953,6 @@ export default {
|
|||||||
this.saveLoading = false;
|
this.saveLoading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleRemark(){
|
|
||||||
this.dataList.map(item => {
|
|
||||||
if(item.involve === 'noInvolve'){
|
|
||||||
comFlag
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//提交事件
|
//提交事件
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
let comFlag = 0
|
let comFlag = 0
|
||||||
@@ -971,6 +964,9 @@ export default {
|
|||||||
if(comFlag > 0){
|
if(comFlag > 0){
|
||||||
this.$message.warning('请填写不涉及的备注信息')
|
this.$message.warning('请填写不涉及的备注信息')
|
||||||
}else{
|
}else{
|
||||||
|
this.dataList.forEach(item => {
|
||||||
|
this.$set(item, 'standId', item.id)
|
||||||
|
})
|
||||||
this.isSubmit = true;
|
this.isSubmit = true;
|
||||||
this.qdform.currentPerson = this.$store.getters.userInfo.userName;
|
this.qdform.currentPerson = this.$store.getters.userInfo.userName;
|
||||||
this.qdform.commentText = this.commentText;
|
this.qdform.commentText = this.commentText;
|
||||||
|
|||||||
@@ -965,6 +965,9 @@ export default {
|
|||||||
if(comFlag > 0){
|
if(comFlag > 0){
|
||||||
this.$message.warning('请填写不涉及的备注信息')
|
this.$message.warning('请填写不涉及的备注信息')
|
||||||
}else{
|
}else{
|
||||||
|
this.dataList.forEach(item => {
|
||||||
|
this.$set(item, 'standId', item.id)
|
||||||
|
})
|
||||||
this.isSubmit = true;
|
this.isSubmit = true;
|
||||||
this.qdform.commentText = this.commentText;
|
this.qdform.commentText = this.commentText;
|
||||||
this.qdform.dataList = this.dataList
|
this.qdform.dataList = this.dataList
|
||||||
@@ -1151,6 +1154,8 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.handleSelectTableList.map(item => {
|
this.handleSelectTableList.map(item => {
|
||||||
|
this.$set(item, 'involve', '涉及')
|
||||||
|
this.$set(item, 'remarks', '')
|
||||||
let addIndex
|
let addIndex
|
||||||
addIndex = this.dataList.findIndex(items =>{
|
addIndex = this.dataList.findIndex(items =>{
|
||||||
return items.id === item.id
|
return items.id === item.id
|
||||||
@@ -1161,10 +1166,6 @@ export default {
|
|||||||
this.dataList.push(item)
|
this.dataList.push(item)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.dataList.forEach(item => {
|
|
||||||
this.$set(item, 'involve', 'involve')
|
|
||||||
this.$set(item, 'remarks', '')
|
|
||||||
})
|
|
||||||
this.standModel = false
|
this.standModel = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -442,13 +442,6 @@ export default {
|
|||||||
this.qdform.prcName = this.prcName;
|
this.qdform.prcName = this.prcName;
|
||||||
this.qdform["id"] = item.id;
|
this.qdform["id"] = item.id;
|
||||||
this.dataList = item.dataList
|
this.dataList = item.dataList
|
||||||
this.dataList.forEach(item => {
|
|
||||||
if(item.involve === 'involve'){
|
|
||||||
item.involve = '涉及'
|
|
||||||
}else if(item.involve === 'noInvolve'){
|
|
||||||
item.involve = '不涉及'
|
|
||||||
}
|
|
||||||
})
|
|
||||||
// this.projectId = item.projectId;
|
// this.projectId = item.projectId;
|
||||||
// //获取清单id 查询对应清单下的标准
|
// //获取清单id 查询对应清单下的标准
|
||||||
// this.detailedId = item.detailedListId;
|
// this.detailedId = item.detailedListId;
|
||||||
@@ -520,13 +513,6 @@ export default {
|
|||||||
this.saveLoading = false;
|
this.saveLoading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleRemark(){
|
|
||||||
this.dataList.map(item => {
|
|
||||||
if(item.involve === 'noInvolve'){
|
|
||||||
comFlag
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//驳回事件
|
//驳回事件
|
||||||
beforeBack() {
|
beforeBack() {
|
||||||
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
|
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
|
||||||
|
|||||||
Reference in New Issue
Block a user