diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 300b83067..b64980b85 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -382,11 +382,11 @@
@@ -1024,10 +1024,17 @@ export default {
map.set('3', '不采纳');
return map.get(data)
},
- choiceZRR1 (type, title, id) {
+ choiceZRR1 (type, title, id, e) {
+ if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
+ return;
+ }
this.$emit('formChoiceZRR1', type, title, id)
},
+ handleClearStandSystem () {
+ this.$emit('handleClearStandSystem')
+ },
+
choiceZRR2 (type, title, id, flag) {
this.$emit('formChoiceZRR2', type, title, id, flag)
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 93f98c7c8..246523891 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -361,11 +361,11 @@
@@ -991,10 +991,17 @@ export default {
map.set('3', '不采纳');
return map.get(data)
},
- choiceZRR1 (type, title, id) {
+ choiceZRR1 (type, title, id, e) {
+ if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
+ return;
+ }
this.$emit('formChoiceZRR1', type, title, id)
},
+ handleClearStandSystem () {
+ this.$emit('handleClearStandSystem')
+ },
+
choiceZRR2 (type, title, id, flag) {
this.$emit('formChoiceZRR2', type, title, id, flag)
},
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
index d55222f86..196e10c3a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
@@ -75,67 +75,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -189,10 +119,6 @@
/>
-
-
-
-
-
-
-->
@@ -669,85 +594,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
0) {
- this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
- this.form.menuId = checkedData.map(item => item.menuId).join(',')
- this.form.treeType = checkedData.map(item => item.treeType).join(',')
- } else {
- if (checkedData.parentId == null || checkedData.parentId === '') {
- this.$message.error('请选择二级及以下目录')
- return
- }
- this.form.TXLBBUSS = checkedData.menuName
- this.form.menuId = checkedData.id
- this.form.treeType = 'sarMs'
+ if(checkedData) {
+ if (checkedData.parentId == null || checkedData.parentId === '') {
+ this.$message.error('请选择二级及以下目录')
+ return
}
+ this.form.TXLBBUSS = checkedData.menuNames
+ this.form.menuId = checkedData.id
+ this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 175f1c637..63d58a9d3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -427,11 +427,11 @@
@@ -3150,11 +3150,19 @@ export default {
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
- choiceZRR1 (type, title, id) {
+ choiceZRR1 (type, title, id, e) {
+ if (e.target.className === 'el-input__icon el-icon-circle-close el-input__clear') {
+ return;
+ }
this.drawerTitle = title
this.modalShowFlag1 = true
this.key++
},
+ handleClearStandSystem () {
+ this.form.TXLBBUSS = ''
+ this.form.menuId = ''
+ this.form.treeType = ''
+ },
choiceZRR2 (type, title, id, flag) {
this.drawerTitle = title
this.modalShowFlag2 = true
@@ -3614,7 +3622,7 @@ export default {
popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData) {
if (checkedData.length > 0) {
- this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
+ this.form.TXLBBUSS = checkedData.map(item => item.menuNames).join(',')
this.form.menuId = checkedData.map(item => item.menuId).join(',')
this.form.treeType = checkedData.map(item => item.treeType).join(',')
} else {
@@ -3622,7 +3630,7 @@ export default {
this.$message.error('请选择二级及以下目录')
return
}
- this.form.TXLBBUSS = checkedData.menuName
+ this.form.TXLBBUSS = checkedData.menuNames
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index c6a2ff3ca..ce9eae7ca 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -44,6 +44,7 @@
@formChoiceZRR3="formChoiceZRR3"
@formChoiceZRR4="formChoiceZRR4"
@formChoiceZRR5="formChoiceZRR5"
+ @handleClearStandSystem="handleClearStandSystem"
/>
0) {
- this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(',')
- this.form.menuId = checkedData.map(item => item.menuId).join(',')
- this.form.treeType = checkedData.map(item => item.treeType).join(',')
- } else {
- if (checkedData.parentId == null || checkedData.parentId === '') {
- this.$message.error('请选择二级及以下目录')
- return
- }
- this.form.TXLBBUSS = checkedData.menuName
- this.form.menuId = checkedData.id
- this.form.treeType = 'sarMs'
+ if (checkedData.parentId == null || checkedData.parentId === '') {
+ this.$message.error('请选择二级及以下目录')
+ return
}
+ this.form.TXLBBUSS = checkedData.menuNames
+ this.form.menuId = checkedData.id
+ this.form.treeType = 'sarMs'
}
this.modalShowFlag1 = false
this.$forceUpdate()
@@ -2790,9 +2790,9 @@ export default {