From 22d2d0a62e1079d0d60216c307a8c958cc98dd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 17 Feb 2022 18:35:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 62 ++++++++++++++++++-
.../pages/creatProcess/bzrk/step2.vue | 14 ++++-
.../pages/creatProcess/bzrk/step3.vue | 14 ++++-
.../pages/creatProcess/bzrk/step4.vue | 51 ++++++++++++++-
.../pages/creatProcess/bzrk/step5.vue | 19 +++++-
5 files changed, 150 insertions(+), 10 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 043a35eef..ebbbcd779 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -629,6 +629,23 @@
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel">
+
+
+
+
@@ -743,7 +760,7 @@
clearable
>
-
+
+
+
+
+
@@ -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: '', // 代替标准号
@@ -2459,6 +2493,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
@@ -2989,9 +3032,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
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 001546aa4..c9dc34bae 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -407,9 +407,12 @@
-
+
+
+
+
@@ -486,13 +489,20 @@
clearable
>
-
+
+
+
+
{{ form.wssmr }}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 4571b8626..d7d84b0f6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -370,9 +370,12 @@
-
+
+
+
+
@@ -449,13 +452,20 @@
clearable
>
-
+
+
+
+
{{form.wssmr}}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f5042d653..caca4b13c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -860,7 +860,7 @@
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel">
-
+
+
+
+
+
@@ -990,7 +1006,7 @@
clearable
>
-
+
+
+
+
+
@@ -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,
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 036269fef..f27f578df 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -322,7 +322,7 @@
clearable
>
-
+
+
+
+
@@ -406,13 +414,20 @@
clearable
>
-
+
+
+
+