Merge branch 'develop' into 'FOTON'
Develop See merge request LAWS/laws-system-front-FOTON!262
This commit is contained in:
@@ -103,10 +103,10 @@
|
|||||||
|
|
||||||
<!-- 会议编辑抽屉 -->
|
<!-- 会议编辑抽屉 -->
|
||||||
<el-drawer
|
<el-drawer
|
||||||
title="编辑人员信息"
|
title="编辑会议信息"
|
||||||
:visible.sync="meetFlag"
|
:visible.sync="meetFlag"
|
||||||
:before-close="falseDrawer"
|
:before-close="falseDrawer"
|
||||||
size="600px"
|
size="800px"
|
||||||
>
|
>
|
||||||
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
|
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
|
||||||
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
|
<el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
|
||||||
@@ -241,9 +241,9 @@
|
|||||||
|
|
||||||
<!-- 编辑框内的人员的table上的编辑 -->
|
<!-- 编辑框内的人员的table上的编辑 -->
|
||||||
<el-drawer
|
<el-drawer
|
||||||
title="编辑人员信息"
|
:title="dialogTitle"
|
||||||
:visible.sync="editFlag"
|
:visible.sync="editFlag"
|
||||||
size="500px"
|
size="600px"
|
||||||
:before-close="falseDrawerTab"
|
:before-close="falseDrawerTab"
|
||||||
custom-class="demo-drawer"
|
custom-class="demo-drawer"
|
||||||
>
|
>
|
||||||
@@ -339,6 +339,7 @@ export default {
|
|||||||
// 议题选中时储存数组
|
// 议题选中时储存数组
|
||||||
deleteTable: [],
|
deleteTable: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
|
dialogTitle: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -619,10 +620,19 @@ export default {
|
|||||||
fillFile: this.fillFile = []
|
fillFile: this.fillFile = []
|
||||||
}
|
}
|
||||||
this.editMeetForm.attend.push(list)
|
this.editMeetForm.attend.push(list)
|
||||||
|
this.dialogTitle = '新增人员信息'
|
||||||
|
this.add_partDialog(list)
|
||||||
},
|
},
|
||||||
|
|
||||||
|
add_partDialog(row) {
|
||||||
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
|
localStorage.setItem('obj', JSON.stringify(row))
|
||||||
|
this.editForm = row
|
||||||
|
this.editFlag = true
|
||||||
|
},
|
||||||
// 编辑按钮
|
// 编辑按钮
|
||||||
edit_partForm(row) {
|
edit_partForm(row) {
|
||||||
|
this.dialogTitle = '编辑人员信息'
|
||||||
// 用来储存取消时原来的数据,防止取消时修改
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
localStorage.setItem('obj', JSON.stringify(row))
|
localStorage.setItem('obj', JSON.stringify(row))
|
||||||
this.editForm = row
|
this.editForm = row
|
||||||
@@ -679,13 +689,26 @@ export default {
|
|||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
falseDrawerTab() {
|
falseDrawerTab() {
|
||||||
let Item = JSON.parse(localStorage.getItem('obj'))
|
if (this.dialogTitle = '新增人员信息') {
|
||||||
this.editForm.fillPeopleId = Item.fillPeopleId
|
let Items = JSON.parse(localStorage.getItem('objs'))
|
||||||
this.editForm.fillPeople = Item.fillPeople
|
this.editMeetForm.attend = Items.attend
|
||||||
this.editForm.fillUnit = Item.fillUnit
|
this.editMeetForm.content = Items.content
|
||||||
this.editForm.fillDept = Item.fillDept
|
this.editMeetForm.date = Items.date
|
||||||
this.editForm.fillTel = Item.fillTel
|
this.editMeetForm.files = Items.files
|
||||||
this.editForm.fillMail = Item.fillMail
|
this.editMeetForm.id = Items.id
|
||||||
|
this.editMeetForm.partPeople = Items.partPeople
|
||||||
|
this.editMeetForm.place = Items.place
|
||||||
|
this.editMeetForm.title = Items.title
|
||||||
|
this.editMeetForm.type = Items.type
|
||||||
|
} else {
|
||||||
|
let Item = JSON.parse(localStorage.getItem('obj'))
|
||||||
|
this.editForm.fillPeopleId = Item.fillPeopleId
|
||||||
|
this.editForm.fillPeople = Item.fillPeople
|
||||||
|
this.editForm.fillUnit = Item.fillUnit
|
||||||
|
this.editForm.fillDept = Item.fillDept
|
||||||
|
this.editForm.fillTel = Item.fillTel
|
||||||
|
this.editForm.fillMail = Item.fillMail
|
||||||
|
}
|
||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -295,7 +295,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-drawer
|
<el-drawer
|
||||||
title="编辑人员信息"
|
:title="isTitle"
|
||||||
:visible.sync="editFlag"
|
:visible.sync="editFlag"
|
||||||
size="500px"
|
size="500px"
|
||||||
>
|
>
|
||||||
@@ -478,6 +478,7 @@ export default {
|
|||||||
acceptShow: false,
|
acceptShow: false,
|
||||||
roleShowflag: false,
|
roleShowflag: false,
|
||||||
nodeList: [],
|
nodeList: [],
|
||||||
|
isTitle: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -539,6 +540,8 @@ export default {
|
|||||||
fillFile: this.fillFile = []
|
fillFile: this.fillFile = []
|
||||||
}
|
}
|
||||||
this.rh_pageData.myPartRole.push(list)
|
this.rh_pageData.myPartRole.push(list)
|
||||||
|
this.isTitle = '新增人员信息'
|
||||||
|
this.add_partDialog(list)
|
||||||
},
|
},
|
||||||
|
|
||||||
fillFile_up(row) {
|
fillFile_up(row) {
|
||||||
@@ -625,8 +628,17 @@ export default {
|
|||||||
handleClose() {
|
handleClose() {
|
||||||
this.upDialog = false
|
this.upDialog = false
|
||||||
},
|
},
|
||||||
|
add_partDialog(row) {
|
||||||
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
|
localStorage.setItem('obj', JSON.stringify(row))
|
||||||
|
this.fileListData = row
|
||||||
|
this.reData = this.fileListData.fillFile
|
||||||
|
this.editForm = row
|
||||||
|
this.editFlag = true
|
||||||
|
},
|
||||||
// 编辑按钮
|
// 编辑按钮
|
||||||
edit_partForm(row) {
|
edit_partForm(row) {
|
||||||
|
this.isTitle = '编辑人员信息'
|
||||||
// 用来储存取消时原来的数据,防止取消时修改
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
localStorage.setItem('obj', JSON.stringify(row))
|
localStorage.setItem('obj', JSON.stringify(row))
|
||||||
this.fileListData = row
|
this.fileListData = row
|
||||||
@@ -639,15 +651,19 @@ export default {
|
|||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
falseDrawer() {
|
falseDrawer() {
|
||||||
let Item = JSON.parse(localStorage.getItem('obj'))
|
if (this.isTitle === '新增人员信息') {
|
||||||
this.editForm.fillPeopleId = Item.fillPeopleId
|
this.getData()
|
||||||
this.editForm.fillPeople = Item.fillPeople
|
} else {
|
||||||
this.editForm.fillUnit = Item.fillUnit
|
let Item = JSON.parse(localStorage.getItem('obj'))
|
||||||
this.editForm.fillDept = Item.fillDept
|
this.editForm.fillPeopleId = Item.fillPeopleId
|
||||||
this.editForm.fillPost = Item.fillPost
|
this.editForm.fillPeople = Item.fillPeople
|
||||||
this.editForm.fillTel = Item.fillTel
|
this.editForm.fillUnit = Item.fillUnit
|
||||||
this.editForm.fillMail = Item.fillMail
|
this.editForm.fillDept = Item.fillDept
|
||||||
this.editForm.fillFile = Item.fillFile
|
this.editForm.fillPost = Item.fillPost
|
||||||
|
this.editForm.fillTel = Item.fillTel
|
||||||
|
this.editForm.fillMail = Item.fillMail
|
||||||
|
this.editForm.fillFile = Item.fillFile
|
||||||
|
}
|
||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
// 编辑框选人
|
// 编辑框选人
|
||||||
|
|||||||
@@ -257,7 +257,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<el-drawer
|
<el-drawer
|
||||||
title="编辑人员信息"
|
:title="isTitle"
|
||||||
:visible.sync="editFlag"
|
:visible.sync="editFlag"
|
||||||
size="500px"
|
size="500px"
|
||||||
custom-class="demo-drawer"
|
custom-class="demo-drawer"
|
||||||
@@ -356,7 +356,8 @@ export default {
|
|||||||
fillDept: '',
|
fillDept: '',
|
||||||
fillTel: '',
|
fillTel: '',
|
||||||
fillMail: '',
|
fillMail: '',
|
||||||
}
|
},
|
||||||
|
isTitle: ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -416,21 +417,35 @@ export default {
|
|||||||
fillMail: this.fillMail,
|
fillMail: this.fillMail,
|
||||||
}
|
}
|
||||||
this.ch_pageData.myPartRole.push(list)
|
this.ch_pageData.myPartRole.push(list)
|
||||||
|
this.isTitle = '新增人员信息'
|
||||||
|
this.add_partDialog(list)
|
||||||
},
|
},
|
||||||
// 编辑框确认按钮
|
// 编辑框确认按钮
|
||||||
OkDrawer() {
|
OkDrawer() {
|
||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
falseDrawer() {
|
falseDrawer() {
|
||||||
let Item = JSON.parse(localStorage.getItem('obj'))
|
if (this.isTitle = '新增人员信息') {
|
||||||
this.editForm.fillPeopleId = Item.fillPeopleId
|
this.getData()
|
||||||
this.editForm.fillPeople = Item.fillPeople
|
} else {
|
||||||
this.editForm.fillUnit = Item.fillUnit
|
let Item = JSON.parse(localStorage.getItem('obj'))
|
||||||
this.editForm.fillDept = Item.fillDept
|
this.editForm.fillPeopleId = Item.fillPeopleId
|
||||||
this.editForm.fillTel = Item.fillTel
|
this.editForm.fillPeople = Item.fillPeople
|
||||||
this.editForm.fillMail = Item.fillMail
|
this.editForm.fillUnit = Item.fillUnit
|
||||||
|
this.editForm.fillDept = Item.fillDept
|
||||||
|
this.editForm.fillTel = Item.fillTel
|
||||||
|
this.editForm.fillMail = Item.fillMail
|
||||||
|
}
|
||||||
this.editFlag = false
|
this.editFlag = false
|
||||||
},
|
},
|
||||||
|
|
||||||
|
add_partDialog(row) {
|
||||||
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
|
localStorage.setItem('obj', JSON.stringify(row))
|
||||||
|
this.fileListData = row
|
||||||
|
this.editForm = row
|
||||||
|
this.editFlag = true
|
||||||
|
},
|
||||||
/** 入会人员编辑 */
|
/** 入会人员编辑 */
|
||||||
edit_partForm(row) {
|
edit_partForm(row) {
|
||||||
// 用来储存取消时原来的数据,防止取消时修改
|
// 用来储存取消时原来的数据,防止取消时修改
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="''"
|
v-btn-permission="''"
|
||||||
/>
|
/>
|
||||||
@@ -360,7 +360,8 @@ export default {
|
|||||||
name: item.oldFileName,
|
name: item.oldFileName,
|
||||||
uid: item.uid,
|
uid: item.uid,
|
||||||
status: item.status,
|
status: item.status,
|
||||||
id: item.id
|
id: item.id,
|
||||||
|
fileSuffix: item.fileSuffix
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -274,75 +274,77 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<div class="table-height">
|
||||||
:data="standardData"
|
<el-table
|
||||||
v-loading="loading"
|
:data="standardData"
|
||||||
tooltip-effect="dark"
|
v-loading="loading"
|
||||||
style="width: 100%"
|
tooltip-effect="dark"
|
||||||
border
|
style="width: 100%"
|
||||||
ref="table"
|
border
|
||||||
class="table-height"
|
ref="table"
|
||||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
height="100%"
|
||||||
|
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="selectThree"
|
@selection-change="selectThree"
|
||||||
>
|
|
||||||
<el-table-column
|
|
||||||
type="selection"
|
|
||||||
width="55"
|
|
||||||
align="center">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
prop="code"
|
|
||||||
align="center"
|
|
||||||
label="标准号">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<a v-if="scope.row.standYear" class="table-jump"
|
|
||||||
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
|
|
||||||
scope.row.standNumber
|
|
||||||
}}-{{ scope.row.standYear }}</a>
|
|
||||||
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
|
|
||||||
scope.row.standSortShow }}
|
|
||||||
{{ scope.row.standNumber }}</a>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
prop="standName"
|
|
||||||
align="center"
|
|
||||||
label="标准名称"
|
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<el-table-column
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
type="selection"
|
||||||
</template>
|
width="55"
|
||||||
</el-table-column>
|
align="center">
|
||||||
<el-table-column
|
</el-table-column>
|
||||||
prop="issueTime"
|
<el-table-column
|
||||||
align="center"
|
prop="code"
|
||||||
label="发布日期">
|
align="center"
|
||||||
<template slot-scope="scope">
|
label="标准号">
|
||||||
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
|
<template slot-scope="scope">
|
||||||
</template>
|
<a v-if="scope.row.standYear" class="table-jump"
|
||||||
</el-table-column>
|
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
|
||||||
<el-table-column
|
scope.row.standNumber
|
||||||
prop="XCXSSRQ"
|
}}-{{ scope.row.standYear }}</a>
|
||||||
align="center"
|
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
|
||||||
label="新车型实施日期">
|
scope.row.standSortShow }}
|
||||||
</el-table-column>
|
{{ scope.row.standNumber }}</a>
|
||||||
<el-table-column
|
</template>
|
||||||
show-overflow-tooltip
|
</el-table-column>
|
||||||
prop="ZCCSSRQ"
|
<el-table-column
|
||||||
align="center"
|
prop="standName"
|
||||||
label="在产车实施日期">
|
align="center"
|
||||||
</el-table-column>
|
label="标准名称"
|
||||||
<el-table-column
|
>
|
||||||
show-overflow-tooltip
|
<template slot-scope="scope">
|
||||||
prop="textStatus"
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName}}</a>
|
||||||
align="center"
|
</template>
|
||||||
label="文本状态">
|
</el-table-column>
|
||||||
<template slot-scope="scope">
|
<el-table-column
|
||||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
prop="issueTime"
|
||||||
</template>
|
align="center"
|
||||||
</el-table-column>
|
label="发布日期">
|
||||||
</el-table>
|
<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"
|
||||||
|
align="center"
|
||||||
|
label="新车型实施日期">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
|
prop="ZCCSSRQ"
|
||||||
|
align="center"
|
||||||
|
label="在产车实施日期">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
show-overflow-tooltip
|
||||||
|
prop="textStatus"
|
||||||
|
align="center"
|
||||||
|
label="文本状态">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<pagination
|
<pagination
|
||||||
:page="pageNo"
|
:page="pageNo"
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
/>
|
/>
|
||||||
<i
|
<i
|
||||||
title="下载带水印"
|
title="下载带水印"
|
||||||
@click.stop="downloadFileByWater(item.id, item.name)"
|
@click.stop="downloadFileByWater(item.id, item.fileSuffix)"
|
||||||
class="icon-download2"
|
class="icon-download2"
|
||||||
v-btn-permission="''"
|
v-btn-permission="''"
|
||||||
/>
|
/>
|
||||||
@@ -429,7 +429,8 @@ export default {
|
|||||||
name: item.oldFileName,
|
name: item.oldFileName,
|
||||||
uid: item.uid,
|
uid: item.uid,
|
||||||
status: item.status,
|
status: item.status,
|
||||||
id: item.id
|
id: item.id,
|
||||||
|
fileSuffix: item.fileSuffix
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1836,9 +1836,11 @@ export default {
|
|||||||
/** val === '1' (国外) val === '0'( 国内 )*/
|
/** val === '1' (国外) val === '0'( 国内 )*/
|
||||||
// 国内英文名称不必填 国外必填 ,标准性质国内不体现
|
// 国内英文名称不必填 国外必填 ,标准性质国内不体现
|
||||||
if (val === '1') {
|
if (val === '1') {
|
||||||
|
this.rules.standName[0].required = false
|
||||||
this.rules.standEnName[0].required = true;
|
this.rules.standEnName[0].required = true;
|
||||||
this.rules.standNature[0].required = false
|
this.rules.standNature[0].required = false
|
||||||
} else {
|
} else {
|
||||||
|
this.rules.standName[0].required = true
|
||||||
this.rules.standNature[0].required = true
|
this.rules.standNature[0].required = true
|
||||||
this.rules.standEnName[0].required = false;
|
this.rules.standEnName[0].required = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<el-row :gutter="24">
|
<el-row :gutter="24">
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
<el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
|
||||||
<el-radio-group v-model="form.standInData">
|
<el-radio-group v-model="form.standInData" @change="standInChange">
|
||||||
<el-radio label="0">国内标准入库</el-radio>
|
<el-radio label="0">国内标准入库</el-radio>
|
||||||
<el-radio label="1">海外标准入库</el-radio>
|
<el-radio label="1">海外标准入库</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
@@ -1692,6 +1692,23 @@ export default {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
// 标准来源改变事件
|
||||||
|
standInChange(val) {
|
||||||
|
this.verifySarStandard = false
|
||||||
|
|
||||||
|
/** val === '1' (国外) val === '0'( 国内 )*/
|
||||||
|
// 国内英文名称不必填 国外必填 ,标准性质国内不体现
|
||||||
|
if (val === '1') {
|
||||||
|
this.rules.standName[0].required = false
|
||||||
|
this.rules.standNature[0].required = false
|
||||||
|
this.rules.standEnName[0].required = true;
|
||||||
|
} else {
|
||||||
|
this.rules.standName[0].required = true
|
||||||
|
this.rules.standNature[0].required = true
|
||||||
|
this.rules.standEnName[0].required = false;
|
||||||
|
}
|
||||||
|
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
|
||||||
|
},
|
||||||
getBusStandFileByAttId(attId) {
|
getBusStandFileByAttId(attId) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
getBusStandFileByAttId({
|
getBusStandFileByAttId({
|
||||||
|
|||||||
@@ -170,32 +170,32 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<!-- <el-col :span="12">-->
|
||||||
<el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
|
<!-- <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
<el-date-picker
|
<!-- <el-date-picker-->
|
||||||
disabled
|
<!-- disabled-->
|
||||||
v-model="form.ssrqgj"
|
<!-- v-model="form.ssrqgj"-->
|
||||||
type="date"
|
<!-- type="date"-->
|
||||||
placeholder="请选择实施日期(国际)">
|
<!-- placeholder="请选择实施日期(国际)">-->
|
||||||
</el-date-picker>
|
<!-- </el-date-picker>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
|
<!-- <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
<el-date-picker
|
<!-- <el-date-picker-->
|
||||||
disabled
|
<!-- disabled-->
|
||||||
v-model="form.xcxssrqgj"
|
<!-- v-model="form.xcxssrqgj"-->
|
||||||
type="date"
|
<!-- type="date"-->
|
||||||
placeholder="请选择新车型实施日期(国家)">
|
<!-- placeholder="请选择新车型实施日期(国家)">-->
|
||||||
</el-date-picker>
|
<!-- </el-date-picker>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
<el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
|
<!-- <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
|
||||||
<el-date-picker
|
<!-- <el-date-picker-->
|
||||||
disabled
|
<!-- disabled-->
|
||||||
v-model="form.zccssrqgj"
|
<!-- v-model="form.zccssrqgj"-->
|
||||||
type="date"
|
<!-- type="date"-->
|
||||||
placeholder="请选择在产车实施日期(国家)">
|
<!-- placeholder="请选择在产车实施日期(国家)">-->
|
||||||
</el-date-picker>
|
<!-- </el-date-picker>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
<ProcessTitle>
|
<ProcessTitle>
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
style="display: none;"
|
style="display: none;"
|
||||||
clearable
|
clearable
|
||||||
></el-input>
|
></el-input>
|
||||||
<el-input v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员" @click.native="choiceZRR(form.bzfgId)"></el-input>
|
<el-input disabled v-model="form.bzfgName" placeholder="请选择标准法规工程师分线管理员"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -467,8 +467,11 @@
|
|||||||
this.form.textType = data.textType || data.form.textType
|
this.form.textType = data.textType || data.form.textType
|
||||||
this.form.modelList = data.modelList || data.form.modelList
|
this.form.modelList = data.modelList || data.form.modelList
|
||||||
this.form.modelNameList = data.modelNameList || data.form.modelNameList
|
this.form.modelNameList = data.modelNameList || data.form.modelNameList
|
||||||
this.form.bzfgId = data.bzfgId || ''
|
console.log(data);
|
||||||
this.form.bzfgName = data.bzfgName || ''
|
this.form.bzfgId = data.startUser
|
||||||
|
this.form.bzfgName = data.startUserName
|
||||||
|
// this.form.bzfgId = data.bzfgId || ''
|
||||||
|
// this.form.bzfgName = data.bzfgName || ''
|
||||||
this.json = data
|
this.json = data
|
||||||
this.data = data.info || data.data
|
this.data = data.info || data.data
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
|
|||||||
@@ -459,7 +459,7 @@ export default {
|
|||||||
newText: '',
|
newText: '',
|
||||||
reason: '',
|
reason: '',
|
||||||
id: id,
|
id: id,
|
||||||
department: this.$store.getters.userInfo.upDeptName,
|
department: this.$store.getters.userInfo.institutionName,
|
||||||
responUserName: this.$store.getters.userInfo.userName,
|
responUserName: this.$store.getters.userInfo.userName,
|
||||||
responUser: this.$store.getters.userInfo.userId
|
responUser: this.$store.getters.userInfo.userId
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -226,6 +226,8 @@
|
|||||||
background
|
background
|
||||||
:page-sizes="[20, 40, 60]"
|
:page-sizes="[20, 40, 60]"
|
||||||
:total="total"
|
:total="total"
|
||||||
|
:page-size="pageSize"
|
||||||
|
@size-change="handleSizeChange"
|
||||||
@current-change="handleCurrentChange"
|
@current-change="handleCurrentChange"
|
||||||
>
|
>
|
||||||
</el-pagination>
|
</el-pagination>
|
||||||
@@ -753,6 +755,9 @@ export default {
|
|||||||
handleCurrentChange(currentPage) {
|
handleCurrentChange(currentPage) {
|
||||||
this.currentPage = currentPage;
|
this.currentPage = currentPage;
|
||||||
},
|
},
|
||||||
|
handleSizeChange(size) {
|
||||||
|
this.pageSize = size;
|
||||||
|
},
|
||||||
//保存事件
|
//保存事件
|
||||||
handleSave() {
|
handleSave() {
|
||||||
this.saveLoading = true;
|
this.saveLoading = true;
|
||||||
|
|||||||
@@ -305,21 +305,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
<el-form-item label="乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
|
||||||
<el-input v-model="standForm.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', standForm.cycvppsbm)"></el-input>
|
<el-input v-model="standForm.cycvppsbm" placeholder="请输入乘用车VPPS编码" clearable></el-input>
|
||||||
<tree-select-new
|
|
||||||
width = "800"
|
|
||||||
:key="key1"
|
|
||||||
:lazy=true
|
|
||||||
:multiple=true
|
|
||||||
:check-strictly= true
|
|
||||||
:modalShowFlag="modalShowFlag2"
|
|
||||||
:drawerTitle="drawerTitle"
|
|
||||||
:show-checkBox="showCheckBox"
|
|
||||||
:url="url"
|
|
||||||
:urlChild="urlChild"
|
|
||||||
@popoverHideCancel = "modalShowFlag2 = false"
|
|
||||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
|
|
||||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
@@ -332,21 +318,7 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
<el-form-item label="卡车VPPS编码" prop="kccvppsbm">
|
||||||
<el-input v-model="standForm.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', standForm.kccvppsbm)"></el-input>
|
<el-input v-model="standForm.kccvppsbm" placeholder="请输入卡车VPPS编码" clearable></el-input>
|
||||||
<tree-select-new
|
|
||||||
width = "800"
|
|
||||||
:key="key2"
|
|
||||||
:lazy=true
|
|
||||||
:multiple=true
|
|
||||||
:check-strictly= true
|
|
||||||
:modalShowFlag="modalShowFlag3"
|
|
||||||
:drawerTitle="drawerTitle"
|
|
||||||
:show-checkBox="showCheckBox"
|
|
||||||
:url="url"
|
|
||||||
@popoverHideCancel = "modalShowFlag3 = false"
|
|
||||||
:urlChild="urlChild"
|
|
||||||
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
|
|
||||||
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|||||||
Reference in New Issue
Block a user