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
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>