commit
This commit is contained in:
@@ -159,8 +159,20 @@
|
|||||||
:visible.sync="modalshowflag2"
|
:visible.sync="modalshowflag2"
|
||||||
:wrapperClosable="false"
|
:wrapperClosable="false"
|
||||||
size="800px">
|
size="800px">
|
||||||
|
<el-form
|
||||||
|
ref="attributeEO"
|
||||||
|
class="label-input-form"
|
||||||
|
:inline="true"
|
||||||
|
>
|
||||||
|
<el-form-item class="form-item-disabled" style="margin: 10px;">
|
||||||
|
<el-input
|
||||||
|
v-model="filterText2"
|
||||||
|
placeholder="请输入姓名"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
<el-tree
|
<el-tree
|
||||||
v-if="modalshowflag2"
|
v-if="modalshowflag2 && open2"
|
||||||
style="height: 100%; overflow: auto;"
|
style="height: 100%; overflow: auto;"
|
||||||
node-key="id"
|
node-key="id"
|
||||||
class="filter-tree"
|
class="filter-tree"
|
||||||
@@ -169,23 +181,52 @@
|
|||||||
:default-checked-keys="nodeList2"
|
:default-checked-keys="nodeList2"
|
||||||
highlight-current
|
highlight-current
|
||||||
check-strictly
|
check-strictly
|
||||||
default-expand-all
|
|
||||||
:expand-on-click-node="false"
|
:expand-on-click-node="false"
|
||||||
show-checkbox
|
show-checkbox
|
||||||
|
ref="tree2"
|
||||||
|
:load="loadNode"
|
||||||
|
lazy>
|
||||||
|
</el-tree>
|
||||||
|
<el-tree
|
||||||
|
v-if="modalshowflag2 && !open2"
|
||||||
|
style="height: 100%; overflow: auto;"
|
||||||
|
node-key="id"
|
||||||
|
class="filter-tree"
|
||||||
|
:data="treeData2"
|
||||||
|
:props="defaultProps"
|
||||||
|
:default-checked-keys="nodeList2"
|
||||||
|
highlight-current
|
||||||
|
check-strictly
|
||||||
|
:expand-on-click-node="false"
|
||||||
|
default-expand-all
|
||||||
|
show-checkbox
|
||||||
ref="tree2">
|
ref="tree2">
|
||||||
</el-tree>
|
</el-tree>
|
||||||
<div id="roleFormButton2" class="demo-drawer-footer">
|
<div id="roleFormButton2" class="demo-drawer-footer">
|
||||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
|
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
|
||||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<el-drawer
|
<el-drawer
|
||||||
:title="drawerTitle"
|
:title="drawerTitle"
|
||||||
:visible.sync="modalshowflag"
|
:visible.sync="modalshowflag"
|
||||||
:wrapperClosable="false"
|
:wrapperClosable="false"
|
||||||
size="800px">
|
size="800px">
|
||||||
|
<el-form
|
||||||
|
ref="attributeEO"
|
||||||
|
class="label-input-form"
|
||||||
|
:inline="true"
|
||||||
|
>
|
||||||
|
<el-form-item class="form-item-disabled" style="margin: 10px;">
|
||||||
|
<el-input
|
||||||
|
v-model="filterText1"
|
||||||
|
placeholder="请输入姓名"
|
||||||
|
></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
<el-tree
|
<el-tree
|
||||||
v-if="modalshowflag"
|
v-if="modalshowflag && open1"
|
||||||
node-key="id"
|
node-key="id"
|
||||||
style="height: 100%; overflow: auto;"
|
style="height: 100%; overflow: auto;"
|
||||||
class="filter-tree"
|
class="filter-tree"
|
||||||
@@ -195,15 +236,33 @@
|
|||||||
highlight-current
|
highlight-current
|
||||||
check-strictly
|
check-strictly
|
||||||
@check="drawerCheck"
|
@check="drawerCheck"
|
||||||
default-expand-all
|
|
||||||
:expand-on-click-node="false"
|
:expand-on-click-node="false"
|
||||||
show-checkbox
|
show-checkbox
|
||||||
|
ref="tree"
|
||||||
|
:load="loadNode"
|
||||||
|
lazy>
|
||||||
|
</el-tree>
|
||||||
|
<el-tree
|
||||||
|
v-if="modalshowflag && !open1"
|
||||||
|
node-key="id"
|
||||||
|
style="height: 100%; overflow: auto;"
|
||||||
|
class="filter-tree"
|
||||||
|
:data="treeData1"
|
||||||
|
:props="defaultProps"
|
||||||
|
:default-checked-keys="nodeList"
|
||||||
|
highlight-current
|
||||||
|
check-strictly
|
||||||
|
@check="drawerCheck"
|
||||||
|
:expand-on-click-node="false"
|
||||||
|
default-expand-all
|
||||||
|
show-checkbox
|
||||||
ref="tree">
|
ref="tree">
|
||||||
</el-tree>
|
</el-tree>
|
||||||
<div id="roleFormButton" class="demo-drawer-footer">
|
<div id="roleFormButton" class="demo-drawer-footer">
|
||||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
|
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
|
||||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
<loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||||
<el-upload
|
<el-upload
|
||||||
@@ -236,6 +295,13 @@ export default {
|
|||||||
name: "bzdyStep1",
|
name: "bzdyStep1",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
treeLoading: false,
|
||||||
|
treeData2: [],
|
||||||
|
treeData1: [],
|
||||||
|
open1: true,
|
||||||
|
open2: true,
|
||||||
|
filterText1: '',
|
||||||
|
filterText2: '',
|
||||||
commentText: '',
|
commentText: '',
|
||||||
roleRow: {},
|
roleRow: {},
|
||||||
nodeList: [],
|
nodeList: [],
|
||||||
@@ -310,12 +376,56 @@ export default {
|
|||||||
ProcessFooter,
|
ProcessFooter,
|
||||||
ProcessTitle
|
ProcessTitle
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
filterText1 (val) {
|
||||||
|
if (val.length) {
|
||||||
|
this.open1 = false
|
||||||
|
this.treeLoading = true
|
||||||
|
this.$http.get('SarInstitution/institution/institutionAndUser', {
|
||||||
|
userName: val
|
||||||
|
}, {}, res => {
|
||||||
|
this.treeData1 = res.data
|
||||||
|
this.treeLoading = false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.open1 = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
filterText2 (val) {
|
||||||
|
if (val.length) {
|
||||||
|
this.open2 = false
|
||||||
|
this.treeLoading = true
|
||||||
|
this.$http.get('SarInstitution/institution/institutionAndUser', {
|
||||||
|
userName: val
|
||||||
|
}, {}, res => {
|
||||||
|
this.treeData2 = res.data
|
||||||
|
this.treeLoading = false
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
this.open2 = true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
loadNode(node, resolve) {
|
||||||
|
if (node.level === 0) {
|
||||||
|
return resolve(this.treeData);
|
||||||
|
}
|
||||||
|
this.getChildren(node, resolve)
|
||||||
|
},
|
||||||
|
getChildren (node, resolve) {
|
||||||
|
this.$http.get('SarInstitution/institution/getNext', {
|
||||||
|
institutionId: node.key
|
||||||
|
}, {}, res => {
|
||||||
|
resolve(res)
|
||||||
|
})
|
||||||
|
},
|
||||||
choiceZRRS () {
|
choiceZRRS () {
|
||||||
this.nodeList2 = []
|
this.nodeList2 = []
|
||||||
if ( this.roleForm.dockUserList.length > 0) {
|
if ( this.roleForm.dockUserList.length > 0) {
|
||||||
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
this.nodeList2 = this.roleForm.dockUserList.split(',')
|
||||||
}
|
}
|
||||||
|
this.filterText2 = ''
|
||||||
this.modalshowflag2 = true
|
this.modalshowflag2 = true
|
||||||
},
|
},
|
||||||
saveUserInfo2 () {
|
saveUserInfo2 () {
|
||||||
@@ -410,11 +520,14 @@ export default {
|
|||||||
this.nodeList.push(id)
|
this.nodeList.push(id)
|
||||||
this.type = type
|
this.type = type
|
||||||
this.drawerTitle = title
|
this.drawerTitle = title
|
||||||
|
this.filterText1 = ''
|
||||||
this.modalshowflag = true
|
this.modalshowflag = true
|
||||||
},
|
},
|
||||||
getTree () {
|
getTree () {
|
||||||
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
|
this.treeLoading = true
|
||||||
this.treeData = res.data
|
this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {}, res=> {
|
||||||
|
this.treeData = res
|
||||||
|
this.treeLoading = false
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleTabs(name) {
|
handleTabs(name) {
|
||||||
|
|||||||
Reference in New Issue
Block a user