Merge branch 'develop' into FOTON
# Conflicts: # src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
This commit is contained in:
super_liu
@@ -1332,18 +1332,27 @@
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
|
||||
@popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
|
||||
<tree-select-module
|
||||
width="500"
|
||||
:lazy=true
|
||||
:multiple=true
|
||||
:check-strictly=true
|
||||
:modalShowFlag="modalShowFlag5"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:type="modelType"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
|
||||
@popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
|
||||
<tree-select-new
|
||||
:multiple=false
|
||||
:lazy=false
|
||||
:modalShowFlag="modalShowFlag6"
|
||||
drawerTitle="标准体系"
|
||||
width="500"
|
||||
:lazy=true
|
||||
:multiple=true
|
||||
:check-strictly=true
|
||||
:modalShowFlag="modalShowFlag5"
|
||||
:drawerTitle="drawerTitle"
|
||||
:url="url"
|
||||
:type="modelType"
|
||||
:urlChild="urlChild"
|
||||
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
|
||||
:nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
|
||||
@popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
|
||||
:data="standSystemOptions"
|
||||
:defaultProps="defaultProps"
|
||||
:nodeKey="nodeKey" @popoverHide="TpopoverHide" @popoverHideCancel="TpopoverHideCancel"></tree-select-new>
|
||||
<!-- 导入失败-->
|
||||
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
|
||||
<p slot="title" style="color:#f60">
|
||||
@@ -1615,13 +1624,20 @@
|
||||
</el-form-item>
|
||||
<!-- 体系类别-->
|
||||
<el-form-item label="标准体系" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
|
||||
<el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
|
||||
:key="index"
|
||||
:label="opt.label">{{ opt.label }}
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-input v-model="advanceSearchMapping.TXLB" style="display: none;"></el-input>
|
||||
<el-input v-model="advanceSearchMapping.TXLBName" placeholder="根据标准体系查找"
|
||||
clearable
|
||||
:maxlength="500"
|
||||
@click.native="BZTXhandle"
|
||||
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
|
||||
|
||||
<!-- <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable-->
|
||||
<!-- @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
|
||||
<!-- <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"-->
|
||||
<!-- :key="index"-->
|
||||
<!-- :label="opt.label">{{ opt.label }}-->
|
||||
<!-- </el-option>-->
|
||||
<!-- </el-select>-->
|
||||
</el-form-item>
|
||||
<!-- 备案日期 -->
|
||||
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
|
||||
@@ -2166,6 +2182,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
modalShowFlag6: false,
|
||||
QCDWValue: [],
|
||||
QCDWmodal: false,
|
||||
QCDWList: [],
|
||||
@@ -2399,8 +2416,6 @@ export default {
|
||||
textStatus: '',//文本状态
|
||||
synopsis: '', // 内容摘要
|
||||
CLLX: '' // 适用车型
|
||||
|
||||
|
||||
}, // 分页查询过程中用到的对象
|
||||
|
||||
//高级搜索映射
|
||||
@@ -2421,7 +2436,8 @@ export default {
|
||||
, CBCD: ''//采标程度
|
||||
, YYBJ: ''//引用标准
|
||||
, BYYBJ: ''//被引用标准
|
||||
, TXLB: '',//体系类别
|
||||
, TXLB: ''//体系类别
|
||||
, TXLBName: '',
|
||||
DYBXH: '',// 模块结构单元变形号
|
||||
DYMC: '',//模块结构单元名称
|
||||
BARQ: '' //备案日期
|
||||
@@ -2911,6 +2927,17 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
BZTXhandle () {
|
||||
this.modalShowFlag6 = true
|
||||
},
|
||||
TpopoverHide (checkedIds, checkedData) {
|
||||
this.advanceSearchMapping.TXLB = checkedData.menuName
|
||||
this.advanceSearchMapping.TXLBName = checkedData.menuName
|
||||
this.modalShowFlag6 = false
|
||||
},
|
||||
TpopoverHideCancel () {
|
||||
this.modalShowFlag6 = false
|
||||
},
|
||||
QCDWOK() {
|
||||
let arr1 = []
|
||||
if (this.sarStandardsInfoEO['QCDW']) {
|
||||
@@ -4511,6 +4538,7 @@ export default {
|
||||
// // 自定义属性字段高级搜索处理
|
||||
//advanceSearchVOStr
|
||||
const advanceSearchVOList = [];
|
||||
|
||||
for (let key in this.advanceSearchMapping) {
|
||||
const value = this.advanceSearchMapping[key];
|
||||
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
|
||||
@@ -4534,6 +4562,7 @@ export default {
|
||||
type: 'equals',
|
||||
value: value
|
||||
});
|
||||
} else if (value !== null && value !== '' && (key === 'TXLBName')) {
|
||||
} else if (value !== null && value !== '') {
|
||||
advanceSearchVOList.push({
|
||||
connect: "and",
|
||||
@@ -4542,7 +4571,6 @@ export default {
|
||||
value: value
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
|
||||
this.SarExportSearchEo = formData
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="draftTime"
|
||||
width="200"
|
||||
width="170"
|
||||
align="center"
|
||||
label="计划标准初稿完成时间">
|
||||
<template slot-scope="scope">
|
||||
@@ -151,7 +151,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="200"
|
||||
width="170"
|
||||
prop="releaseTime"
|
||||
align="center"
|
||||
label="计划标准发布时间">
|
||||
@@ -160,6 +160,7 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
width="180"
|
||||
align="center"
|
||||
prop="unitName"
|
||||
label="起草责任单位">
|
||||
|
||||
Reference in New Issue
Block a user