FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin-1/dev_20240425_DRSP' into test_20240409_for39

Browse Source 
# Conflicts:
#	src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
#	src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
This commit is contained in:
wxyclub
2024-04-29 10:12:14 +08:00
parent 27af0d1dd4 0d609e2e07
commit ae230d0618
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+32 -1
View File
@@ -832,7 +832,7 @@
:disabled="disabledXX"
readonly="readonly"
placeholder="选择研究总院主管副院长"
@click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
@click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
/>
</div>
</el-form-item>
@@ -1083,6 +1083,15 @@
:nodeList="nodeList"
@checkedRole="checkedRole"
/>
<!--选择研究总院主管副院长-->
<Role-tree
v-if="!disabledXX"
:is-title="drawerTitle"
:is-visible.sync="modalShowFlagZHR"
:nodeList="nodeList"
@checkedRole="checkedRoleZHR"
/>
<!-- 选择标准的弹框 -->
<el-drawer
v-if="!disabledXX"
@@ -1758,6 +1767,7 @@ export default {
modalShowFlag: false, // drawer开关
showreceive: false,
modalShowRoleFlag: false, // drawer开关
modalShowFlagZHR: false, // drawer开关
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
modalShowFlag3: false, // drawer开关
@@ -2294,6 +2304,20 @@ export default {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRoleZHR (data) {
let idList = ''
let nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.roleForm.zhrUserId = idList
this.roleForm.zhrUserName = nameList
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
@@ -2759,6 +2783,13 @@ export default {
this.drawerTitle = title
this.modalShowFlag = true
},
choiceZHR (type, title, id) {
this.nodeList = []
this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
this.userType = type
this.drawerTitle = title
this.modalShowFlagZHR = true
},
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+32 -1
View File
@@ -995,7 +995,7 @@
:disabled="disabledXX"
readonly="readonly"
placeholder="选择研究总院主管副院长"
@click.native="choiceZRR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
@click.native="choiceZHR('zhrUserId', '选择研究总院主管副院长', roleForm.zhrUserId)"
/>
</div>
</el-form-item>
@@ -1247,6 +1247,15 @@
:nodeList="nodeList"
@checkedRole="checkedRole"
/>
<!--选择研究总院主管副院长-->
<Role-tree
v-if="!disabledXX"
:is-title="drawerTitle"
:is-visible.sync="modalShowFlagZHR"
:nodeList="nodeList"
@checkedRole="checkedRoleZHR"
/>
<!-- <el-drawer v-if="!disabledXX" -->
<!-- :title="drawerTitle"-->
<!-- :visible.sync="modalShowFlag"-->
@@ -2000,6 +2009,7 @@ export default {
key3: 4,
treeData: [], // 人员数据
modalShowFlag: false, // drawer开关
modalShowFlagZHR: false, // drawer开关
modalShowRoleFlag: false, // drawer开关
modalShowFlag1: false, // drawer开关
modalShowFlag2: false, // drawer开关
@@ -2560,6 +2570,20 @@ export default {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
},
checkedRoleZHR (data) {
let idList = ''
let nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.roleForm.zhrUserId = idList
this.roleForm.zhrUserName = nameList
},
checkedRole (data) {
if (this.type === 0) {
this.roleForm.deptUserId = data[0].id
@@ -3124,6 +3148,13 @@ export default {
this.drawerTitle = title
this.modalShowFlag = true
},
choiceZHR (type, title, id) {
this.nodeList = []
this.nodeList = JSON.parse(JSON.stringify(id.split(',')))
this.userType = type
this.drawerTitle = title
this.modalShowFlagZHR = true
},
choiceZRRS (row, type, index) {
this.type = type
if (type === 1) {