diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index a90e71c3b..5bf1d07fc 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -26,6 +26,7 @@
+
{{ node.label }}
+
+ :lazy="false"
+ :key="treeKey">
{{ node.label }}
@@ -113,7 +116,7 @@
props: {
checkBox: { // 单选/多选
type: Boolean,
- default: false,
+ default: false,//默认false多选
},
isTitle: { // 标题
type: String
@@ -135,16 +138,17 @@
},
data () {
return {
- defaultKey: [],
+ treeKey:1,
+ defaultKey: [],//默认展开的节点的 key 的数组
visible: false,
selectList: [],
- nodeList2: [],
+ nodeList2: [],//默认勾选的节点的 key 的数组
delList: [],
roleList: [],
filterText: '',
- defaultProps: {
- children: 'children',
- label: 'name',
+ defaultProps: {//配置选项
+ children: 'children',//指定子树为节点对象的某个属性值
+ label: 'name',//指定节点标签为节点对象的某个属性值
},
treeData1: [],
treeData: [],
@@ -198,8 +202,9 @@
)
},
searchChange(){
+ // 查询
if (this.filterText.length) {
- this.open1 = false
+ this.open1 = false // 显示第二个tree
this.treeLoading = true
this.defaultKey = []
this.$http.get('SarInstitution/institution/getNextTwo', {
@@ -211,8 +216,7 @@
})
this.treeLoading = false
})
-
-
+ // this.treeKey++
// this.$http.get('SarInstitution/institution/institutionAndUser', {
@@ -265,6 +269,7 @@
}
},
checkChange (row, type, c) {
+ //节点选中状态发生变化时的回调(传递给 data 属性的数组中该节点所对应的对象、节点本身是否被选中、节点的子树中是否有被选中的节点)
if (this.checkBox) {
} else {
if (type) {
@@ -328,7 +333,8 @@
}
this.open1 = true
},
- drawerCheck (data) {
+ drawerCheck (data) {//当复选框被点击的时候触发
+ //共两个参数,依次为:传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象,包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
if (this.checkBox) { // 单选
// 单选判断
let getlist = this.$refs.tree.getCheckedNodes()
@@ -363,6 +369,7 @@
}
},
loadNode(node, resolve) {
+ //加载子树数据的方法,仅当 lazy 属性为true 时生效
if (node.level === 0) {
return resolve(this.treeData);
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 588cae0bd..0d663e0b2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -263,6 +263,8 @@
show-transfer
@transfer="handleTransfer"
submitBTNText="同意"
+ showOver2
+ @over2="handleSubmitNo"
>
-->
-
+
+
+
+
+
+
+
@@ -878,6 +884,25 @@ export default {
})
})
},
+ cutChinese(str){
+ // 截取中文 张兰英(zhanglanying),陈春梅(chenchunmei) => 张兰英,陈春梅
+ let result = '', flag = false
+ if(str){
+ for(let i = 0 ; i < str.length ; i++){
+ if(str[i]==='('){
+ flag = true
+ i++
+ }
+ if(str[i]===')'){
+ flag = false
+ if(i===str.length-1) break
+ i++
+ }
+ if(!flag) result+= str[i]
+ }
+ }
+ return result
+ }
},
mounted () {
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 9f812fcdf..7766de283 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -1482,6 +1482,7 @@
zrDeptIdName:this.$store.getters.userInfo.institutionName,
children:[],
};
+ if(!this.form.modelData) this.form.modelData=[]
this.form.modelData.push(list);
this.$message.success("新增成功")
this.showForm.modelNum = ""