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:
super_liu
2022-02-18 10:00:54 +08:00
parent 053c9d0064 157e35192f
commit 03a26c05cd
10 changed files with 372 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/onlyOffice/editor.html
+3 -3
View File
@@ -44,8 +44,8 @@
var fileSuffix = GetQueryValue('fileType')
// 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
var documentType = ''
var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX'];
var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX'];
var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX'];
arr_data_ppt.find(function(value) {
@@ -110,7 +110,7 @@
"documentType": documentType, // 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
"editorConfig": {
// 此处配置回调地址
"callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"mode":"edit",
"lang":"zh-CN",
// "customization": {
public/static/onlyOffice/onlinePreview.html
+3 -3
View File
@@ -41,8 +41,8 @@
var fileSuffix = GetQueryValue('fileType')
// 文档类word-text、表格类excel-spreadsheet、ppt类-presentation
var documentType = ''
var arr_data_ppt = ['pdf', 'PDF', 'pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['pdf', 'PDF', 'doc','DOC', 'docx','DOCX'];
var arr_data_ppt = ['pptx', 'PPTX','pptx', 'PPTX', 'ppt', 'PPT'];
var arr_data_word = ['doc','DOC','doc','DOC', 'docx','DOCX'];
var arr_data_xls = ['xls', 'XLS', 'xlsx', 'XLSX','.xls', '.XLS', '.xlsx', '.XLSX'];
arr_data_ppt.find(function(value) {
@@ -107,7 +107,7 @@
"documentType": documentType,
"editorConfig": {
// 此处配置回调地址
"callbackUrl": `http://10.100.5.116:4202/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"callbackUrl": `https://srms.foton.com.cn/api/att/attFile/recieveFile?fileNm=${fileName}&standNo=${filePath}`,
"mode":"edit",
"lang":"zh-CN",
// "customization": {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+82 -21
View File
@@ -629,6 +629,23 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
<tree-select-module
width="800"
:key="key4"
:lazy=true
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag5"
:drawerTitle="drawerTitle"
:url="url"
:type="'CAR'"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -743,7 +760,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-if="form.dybxh === ''"
v-model="form.dymc = ''"
@@ -757,6 +774,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
<el-input
v-if="form.dybxhcar === ''"
v-model="form.dymccar = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="form.dymccar"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceWSSMR('wssmr', '选择我司署名人', form.wssmrId)">
</el-input>
@@ -1477,6 +1508,7 @@ export default {
key1: 2,
key2: 3,
key3: 4,
key4: 5,
treeData: [], // 人员数据
modalShowFlag: false, // drawer开关
modalShowRoleFlag: false, // drawer开关
@@ -1484,6 +1516,7 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowFlag5: false, // drawer开关
modalShowRoleFlag5: false,
modalShowTree: false, // 归档位置drawer开关
url: '',
@@ -1571,7 +1604,8 @@ export default {
cycvppscn: '', // 关联模块--乘用车vpps中文名称
kccvppsbm: '', // 关联模块--卡车VPPS编码
kccvppscn: '', // 关联模块--卡车vpps中文名称
dybxh: '', // 模块结构单元变型号
dybxh: '', // 模块结构单元变型号卡车
dybxhcar: '', // 模块结构单元变型号乘用车
dymc: '', // 模块结构单元名称
// 关联信息
dtbjh: '', // 代替标准号
@@ -2280,25 +2314,27 @@ export default {
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
standId: bringData.id,
}, {}, reson => {
if (reson.ok) {
let treeList = ''
let treeListId = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (treeList.length > 0) {
treeList += ','
treeListId += ','
}
treeList += item.menuName
treeListId += item.menuId
})
this.form.treeListName = treeList
this.form.treeListId = treeListId
}
})
if(bringData.standNumber){
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
standId: bringData.id,
}, {}, reson => {
if (reson.ok) {
let treeList = ''
let treeListId = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (treeList.length > 0) {
treeList += ','
treeListId += ','
}
treeList += item.menuName
treeListId += item.menuId
})
this.form.treeListName = treeList
this.form.treeListId = treeListId
}
})
}
}
})
},
@@ -2459,6 +2495,15 @@ export default {
this.urlChild = "sarModelTree/childByList"
this.key3++
},
choiceZRR5(type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
this.key4++
},
choiceTree(type, title, id) {
this.drawerTitle = title
@@ -2942,6 +2987,7 @@ export default {
},
treeHideCancel() {
this.treeListOptions = []
this.modalShowTree = false
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2989,9 +3035,24 @@ export default {
}
},
popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.dybxhcar = checkedData.map(item => item.model).join(",")
this.form.dymccar = checkedData.map(item => item.name).join(",")
} else {
this.form.dybxhcar = checkedData.model
this.form.dymccar = checkedData.name
}
this.modalShowFlag5 = false
}
},
popoverHideModelCancel() {
this.modalShowFlag4 = false
},
popoverHideModelCancel2() {
this.modalShowFlag5 = false
},
closeDrawer() {
this.ListModel = false
},
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+12 -2
View File
@@ -407,9 +407,12 @@
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.kccvppsbm" disabled></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxhcar" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -486,13 +489,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymccar"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<span>{{ form.wssmr }}</span>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+12 -2
View File
@@ -370,9 +370,12 @@
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.kccvppsbm" disabled></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxhcar" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -449,13 +452,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymccar"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<span style="color: rgb(118 122 120)">{{form.wssmr}}</span>
<!-- <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+49 -2
View File
@@ -860,7 +860,7 @@
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
<tree-select-module
width="800"
@@ -876,6 +876,22 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxhcar" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR5('dybxhcar', '模块结构单元', form.dybxhcar)"></el-input>
<tree-select-module
width="800"
:key="key4"
:lazy=true
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag5"
:drawerTitle="drawerTitle"
:url="url"
:type="'CAR'"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" filterable clearable v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -990,7 +1006,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-if="form.dybxh === ''"
v-model="form.dymc = ''"
@@ -1004,6 +1020,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
<el-input
v-if="form.dybxhcar === ''"
v-model="form.dymccar = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="form.dymccar"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择我司署名人', form.wssmr)">
</el-input>
@@ -1544,6 +1574,7 @@ export default {
key1: 2,
key2: 3,
key3: 4,
key4: 5,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
@@ -1553,6 +1584,7 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowFlag5: false, // drawer开关
modalShowTree: false, // 归档位置drawer开关
url: '',
urlChild: '',
@@ -2469,9 +2501,24 @@ export default {
}
},
popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.form.dybxhcar = checkedData.map(item => item.model).join(",")
this.form.dymccar = checkedData.map(item => item.name).join(",")
} else {
this.form.dybxhcar = checkedData.model
this.form.dymccar = checkedData.name
}
this.modalShowFlag5 = false
}
},
popoverHideModelCancel() {
this.modalShowFlag4 = false
},
popoverHideModelCancel2() {
this.modalShowFlag5 = false
},
processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+17 -2
View File
@@ -322,7 +322,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.dybxh"
@@ -330,6 +330,14 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.dybxhcar"
placeholder="请选择模块结构单元变型号"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select disabled :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -406,13 +414,20 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-form-item label="模块结构单元名称(卡车)" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称(乘用车)" prop="dymccar" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymccar"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-input v-model="form.wssmr">
</el-input>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+90 -14
View File
@@ -584,18 +584,7 @@
@click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
clearable
@click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
prop="cycvppscn" class="add-form-item">
@@ -630,8 +619,20 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(卡车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
clearable
@click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="dymc" class="add-form-item">
<el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
v-model="sarStandardsInfoEO.DYMC = ''"
@@ -646,6 +647,34 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXHCAR'">
<el-form-item
prop="DYBXHCAR"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(乘用车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
clearable
@click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="sarStandardsInfoEO.DYMCCAR"
disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
<custom-input
:config="field"
@@ -1287,10 +1316,24 @@
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:type="modelType"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
: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>
<!-- 导入失败-->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -2148,8 +2191,10 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowFlag5: false,
url: '',
urlChild: '',
modelType: 'TRUCK',
drawerTitle: '', //drawer标题
nodeKey: 'id',
nodeKeyCode: 'code',
@@ -2252,6 +2297,7 @@ export default {
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCheckedKeys4: [],
defaultCodeProps: {
children: 'children',
label: 'code'
@@ -2438,6 +2484,8 @@ export default {
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
DYBXHCAR: '',
DYMCCAR: '',
CYSD: '',
CLLX: '',
NYLX: '',
@@ -2577,6 +2625,8 @@ export default {
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
DYBXHCAR: '',
DYMCCAR: '',
CYSD: '',
CLLX: '',
NYLX: '',
@@ -3053,7 +3103,17 @@ export default {
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/list"
this.modelType = type
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
},
choiceZRR5(type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
this.modelType = type
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
},
popoverHideQuery(ids, attrField) {
@@ -3122,6 +3182,22 @@ export default {
popoverHideModelCancel() {
this.modalShowFlag4 = false
},
popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
} else {
this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
this.sarStandardsInfoEO.DYMCCAR = checkedData.name
}
this.modalShowFlag5 = false
}
this.$forceUpdate()
},
popoverCarHideModelCancel() {
this.modalShowFlag5 = false
},
busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+96 -20
View File
@@ -659,14 +659,14 @@
</el-select>
</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 in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</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 in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>-->
<!-- 责任工程师-->
<template>
<el-form-item
@@ -1083,16 +1083,6 @@
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'CYCVPPSCN'">
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
<el-input
@@ -1111,8 +1101,20 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXH'">
<el-form-item
prop="DYBXH"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(卡车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
clearable
@click.native="choiceZRR4('TRUCK', '模块结构单元(卡车)', sarStandardsInfoEO.dybxh)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMC'">
<el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
<el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMC" class="add-form-item">
<el-input
v-model="sarStandardsInfoEO.DYMC"
disabled
@@ -1120,6 +1122,34 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYBXHCAR'">
<el-form-item
prop="DYBXHCAR"
label-width="150px"
class="add-form-item"
>
<template slot="label">模块结构单元变型号(乘用车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
clearable
@click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
<el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''"
disabled
clearable
></el-input>
<el-input
v-else
v-model="sarStandardsInfoEO.DYMCCAR"
disabled
clearable
></el-input>
</el-form-item>
</template>
<template v-else>
<custom-input
:config="field"
@@ -1676,11 +1706,26 @@
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:type="modelType"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
: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>
<!-- 导入失败 -->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
<p slot="title" style="color:#f60">
@@ -1816,14 +1861,17 @@ export default {
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
modalShowFlag4: false, // drawer开关
modalShowFlag5: false,
url: '',
urlChild: '',
modelType: 'TRUCK',
drawerTitle: '', //drawer标题
nodeKey: 'id',
defaultCheckedKeys: [],
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
defaultCheckedKeys4: [],
defaultCodeProps: {
children: 'children',
label: 'code'
@@ -2168,6 +2216,8 @@ export default {
KCCVPPSCN: '',
DYBXH: '',
DYMC: '',
DYBXHCAR: '',
DYMCCAR: '',
CYSD: '',
CLLX: '',
NYLX: '',
@@ -2593,7 +2643,17 @@ export default {
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/list"
this.modelType = type
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
},
choiceZRR5(type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
this.modelType = type
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
},
popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2642,6 +2702,22 @@ export default {
}, popoverHideModelCancel() {
this.modalShowFlag4 = false
},
popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
} else {
this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
this.sarStandardsInfoEO.DYMCCAR = checkedData.name
}
this.modalShowFlag5 = false
}
this.$forceUpdate()
},
popoverCarHideModelCancel() {
this.modalShowFlag5 = false
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
src/pages/searchCenter/pages/standardSearch.vue
+8 -8
View File
@@ -401,10 +401,10 @@
label: '海外标准法规', // value没改
value: 'bussstand'
},
// {
// label: '国内外政策',
// value: 'laws'
// },
{
label: '国内外政策',
value: 'laws'
},
{
label: '企业标准',
value: 'enterprise'
@@ -433,10 +433,10 @@
label: '海外标准法规', // value没改
value: 'bussstand'
},
// {
// label: '国内外政策',
// value: 'laws'
// },
{
label: '国内外政策',
value: 'laws'
},
{
label: '企业标准',
value: 'enterprise'