diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index a9d365639..951b77249 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -14,11 +14,16 @@
>
+
+
+ 查询
+
+
+ :lazy="true">
{{ node.label }}
@@ -54,13 +60,14 @@
:props="defaultProps"
@check-change="checkChange2"
:default-checked-keys="nodeList2"
- highlight-current
- check-strictly
- @check="drawerCheck"
- :expand-on-click-node="true"
+ :default-expanded-keys="defaultKey"
default-expand-all
+ highlight-current
+ :check-strictly="true"
+ @check="drawerCheck"
show-checkbox
- ref="tree">
+ ref="tree"
+ :lazy="false">
{{ node.label }}
@@ -128,6 +135,7 @@
},
data () {
return {
+ defaultKey: [],
visible: false,
selectList: [],
nodeList2: [],
@@ -137,11 +145,6 @@
defaultProps: {
children: 'children',
label: 'name',
- isLeaf: (data, node) => {
- if (!node.disabled) {
- return true
- }
- }
},
treeData1: [],
treeData: [],
@@ -193,6 +196,39 @@
}
)
},
+ searchChange(){
+ if (this.filterText.length) {
+ this.open1 = false
+ this.treeLoading = true
+ this.defaultKey = []
+ this.$http.get('SarInstitution/institution/getNextTwo', {
+ userName: this.filterText
+ }, {}, res => {
+ this.treeData1 = res
+ this.treeData1.forEach(item => {
+ this.defaultKey.push(item.id)
+ })
+ this.treeLoading = false
+ })
+
+
+
+
+ // this.$http.get('SarInstitution/institution/institutionAndUser', {
+ // userName: this.filterText
+ // }, {}, res => {
+ // this.treeData1 = res.data
+ // this.treeData1.forEach(item => {
+ // this.defaultKey.push(item.id)
+ // })
+ // console.log(1);
+ // this.getChildren()
+ // this.treeLoading = false
+ // })
+ } else {
+ this.open1 = true
+ }
+ },
changeInput:debounce(function (val) {
if (val.length) {
this.open1 = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index bbd89128c..e9e454b42 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -887,13 +887,13 @@
-
-
+
+
+
+
+
+
+
@@ -901,22 +901,22 @@
-
- {{ '手动查找' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index de3bbd85d..5a8797813 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -597,25 +597,25 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
- {{ '手动查找' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
if(ev.key === 'freshClueNum'){
let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
- form.department = this.$store.getters.userInfo.institutionName
+ form.department = this.$store.getters.userInfo.institutionNameDepartment
form.responUserName = this.$store.getters.userInfo.userName
form.responUser = this.$store.getters.userInfo.userId
this.data.push(form)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 5dc012984..902ef7e52 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -500,7 +500,7 @@ export default {
newText: '',
reason: '',
id: id,
- department: this.$store.getters.userInfo.institutionName,
+ department: this.$store.getters.userInfo.institutionNameDepartment,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
@@ -528,7 +528,7 @@ export default {
// newText: '',
// reason: '',
// id: id,
- // department: this.$store.getters.userInfo.institutionName,
+ // department: this.$store.getters.userInfo.institutionNameDepartment,
// responUserName: this.$store.getters.userInfo.userName,
// responUser: this.$store.getters.userInfo.userId
// }
@@ -738,7 +738,7 @@ export default {
window.addEventListener("storage", ev => {
if(ev.key === 'freshClueNum'){
let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
- form.department = this.$store.getters.userInfo.institutionName
+ form.department = this.$store.getters.userInfo.institutionNameDepartment
form.responUserName = this.$store.getters.userInfo.userName
form.responUser = this.$store.getters.userInfo.userId
this.data.push(form)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index d2c3f09f5..0d480d08c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -126,6 +126,7 @@
>
@@ -569,6 +570,22 @@ export default {
});
});
},
+ typeList(row){
+ this.decomposeOptions = []
+ this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+ standId: row.standId
+ }, {}, res => {
+ this.decomposeOptions.push(
+ {
+ value: 'BDR',
+ label: '不带入'
+ }
+ )
+ res.data.forEach(item => {
+ this.decomposeOptions.push(item)
+ })
+ });
+ },
fileTypeChange(type){
this.fileType = type
let ids = [];
@@ -948,21 +965,21 @@ export default {
}, e => {
});
//查找分解单来源数据
- this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
- _this: this
- }, res => {
- this.decomposeOptions.push(
- {
- attrField: 'BDR',
- attrName: '不带入'
- }
- )
- res.data.forEach(item => {
- if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
- this.decomposeOptions.push(item)
- }
- })
- })
+ // this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
+ // _this: this
+ // }, res => {
+ // this.decomposeOptions.push(
+ // {
+ // attrField: 'BDR',
+ // attrName: '不带入'
+ // }
+ // )
+ // res.data.forEach(item => {
+ // if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
+ // this.decomposeOptions.push(item)
+ // }
+ // })
+ // })
}
};
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 16c57b4e2..5b67f5e8f 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -383,7 +383,7 @@
- -
-
+
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
index 07f7421fa..ef4c24ce9 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
@@ -3,7 +3,7 @@
标准征求意见流程
- 工程研究总院院长批准
+ 批准