Commit 92ad7a3a authored by zhengke's avatar zhengke

修改

parent 519fe34d
...@@ -465,15 +465,15 @@ ...@@ -465,15 +465,15 @@
</el-input> </el-input>
</p> </p>
<el-tree class='ApprovalProcessBg' :data="roleList" ref="treeRole" show-checkbox <el-tree class='ApprovalProcessBg' :data="roleList" ref="treeRole" show-checkbox
:filter-node-method="filterNode1" :props="defaultProps1" @check-change="checkedRole" :filter-node-method="filterNode1" :props="defaultProps1" :check-on-click-node="true" :check-strictly="true" @check-change="checkedRole"
:default-checked-keys="defaultCheckedArr" node-key="PostId"> :default-checked-keys="defaultCheckedArr" node-key="PostId">
</el-tree> </el-tree>
</div> </div>
<div class="fl"> <div class="fl">
<p style="margin: 0 0 20px 0;">{{$t('fnc.yixuangangwei')}}</p> <p style="margin: 0 0 20px 0;">{{$t('fnc.yixuangangwei')}}</p>
<div class="Approval_yxList"> <div class="Approval_yxList">
<li v-for="item in showRole">{{item.DepartmentName}} <li v-for="(item,index) in showRole">{{item.DepartmentName}}
<i @click="deleteRole()" class="el-icon-circle-close showMemberIcon"></i> <i @click="deleteRole(index)" class="el-icon-circle-close showMemberIcon"></i>
</li> </li>
</div> </div>
</div> </div>
...@@ -528,6 +528,9 @@ ...@@ -528,6 +528,9 @@
import { import {
getSchoolPage getSchoolPage
} from '../../api/school/index' } from '../../api/school/index'
import {
getPostPage,
} from '../../api/system/post'
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
...@@ -710,6 +713,15 @@ ...@@ -710,6 +713,15 @@
rowsPerPage: 12, rowsPerPage: 12,
SName: "", SName: "",
Status: '-1' Status: '-1'
},
//岗位msg
jobMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
PostName: "", //岗位名称
PostId: 0, //岗位编号
Status: "-1",
} }
} }
}, },
...@@ -1029,8 +1041,6 @@ ...@@ -1029,8 +1041,6 @@
this.$message.error(this.$t('tips.qxzspiren')) this.$message.error(this.$t('tips.qxzspiren'))
return return
} }
console.log(this.myAuditList,'myAuditList');
console.log(this.myAuditUserList,'myAuditUserList');
if (this.myAuditUserList.length != 0) { if (this.myAuditUserList.length != 0) {
this.addMsg.Workflow_Condition.AuditUserList = this.myAuditUserList this.addMsg.Workflow_Condition.AuditUserList = this.myAuditUserList
...@@ -1046,9 +1056,8 @@ ...@@ -1046,9 +1056,8 @@
this.$message.error(this.$t('tips.qxzliucehng')) this.$message.error(this.$t('tips.qxzliucehng'))
return return
} }
// this.loading = true; this.loading = true;
this.addMsg.Workflow_Condition.AuditList; this.addMsg.Workflow_Condition.AuditList;
console.log(this.addMsg,'this.addMsg');
this.apipost('FinancialFlowTemplate_post_Set', this.addMsg, res => { this.apipost('FinancialFlowTemplate_post_Set', this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false; this.loading = false;
...@@ -1166,40 +1175,37 @@ ...@@ -1166,40 +1175,37 @@
}, },
checkedRole(data, checked) { // 岗位选择+ checkedRole(data, checked) { // 岗位选择+
if (data.DepartmentId == 0) return if(checked){
if (checked) {
this.roleSetCheckedKeys.push(data.PostId)
this.$refs.treeRole.setCheckedKeys([data.PostId]); this.$refs.treeRole.setCheckedKeys([data.PostId]);
this.showRole = [];
this.showRole.push({
DepartmentName: data.PostName,
Id: data.PostId
})
console.log(this.showRole,'showRolessssss');
} else {
if (this.roleSetCheckedKeys.length == 1) {
this.roleSetCheckedKeys.push(data.PostId)
} else {
this.roleSetCheckedKeys = this.roleSetCheckedKeys.slice(this.roleSetCheckedKeys.length - 1)
} }
let res = this.$refs.treeRole.getCheckedNodes(true, true);
this.showRole=[];
res.forEach((x,index)=>{
var obj={
DepartmentName:x.PostName,
Id:x.PostId
} }
this.showRole.push(obj)
})
}, },
deleteRole() { // 删除已选岗位 deleteRole(index) { // 删除已选岗位
this.showRole = [] this.showRole.splice(index,1);
this.roleSetCheckedKeys.splice(this.roleSetCheckedKeys.findIndex(item => item), 1) var arr=[];
this.$refs.treeRole.setCheckedKeys(this.roleSetCheckedKeys); this.showRole.forEach(x=>{
arr.push(x.Id);
})
if(this.$refs.treeRole){
this.$refs.treeRole.setCheckedKeys(arr);
}
}, },
getRole() { // 选择岗位 getRole() { // 选择岗位
this.apipost('admin_get_PostGetList', { getPostPage(this.jobMsg).then(res => {
RB_Group_Id: this.getPostMsg.RB_Group_Id if(res.Code==1){
}, res => { this.roleList = res.Data.PageData;
let data = res.data.data; }
data.forEach(x => { }).catch(() => {
x.Disabled = false;
}) })
this.roleList = data;
}, err => {})
}, },
saveUpdateNode() { saveUpdateNode() {
let AuditList = {}; let AuditList = {};
...@@ -1394,7 +1400,6 @@ ...@@ -1394,7 +1400,6 @@
this.directors = obj.RoleOrInitiator this.directors = obj.RoleOrInitiator
} }
if (obj.AuditType == 2) { if (obj.AuditType == 2) {
console.log(obj,'objjj');
this.showMember = []; this.showMember = [];
this.memberSetCheckedKeys = []; this.memberSetCheckedKeys = [];
this.AuditWay = obj.AuditWay; this.AuditWay = obj.AuditWay;
...@@ -1409,7 +1414,6 @@ ...@@ -1409,7 +1414,6 @@
this.$refs.tree.setCheckedKeys(arr); this.$refs.tree.setCheckedKeys(arr);
} }
}) })
console.log(this.showMember,'this.showMember');
} }
if (obj.AuditType == 3) { if (obj.AuditType == 3) {
this.AuditWay = obj.AuditWay; this.AuditWay = obj.AuditWay;
...@@ -1439,7 +1443,6 @@ ...@@ -1439,7 +1443,6 @@
handleNodeChange(data, checked) { handleNodeChange(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
let res = this.$refs.tree.getCheckedNodes(true, true); let res = this.$refs.tree.getCheckedNodes(true, true);
console.log(res,'选中');
this.showMember=[]; this.showMember=[];
res.forEach(x=>{ res.forEach(x=>{
var obj={ var obj={
...@@ -1460,7 +1463,6 @@ ...@@ -1460,7 +1463,6 @@
} }
}, },
getMember() { // 获取指定成员列表 getMember() { // 获取指定成员列表
console.log(this.showMember,'this.showMember');
this.outerVisible = true; this.outerVisible = true;
this.dialogTitle = this.$t('fnc.xzrenyuan'); this.dialogTitle = this.$t('fnc.xzrenyuan');
queryEmployee({}).then(res => { queryEmployee({}).then(res => {
...@@ -1536,7 +1538,6 @@ ...@@ -1536,7 +1538,6 @@
return return
} }
this.myAuditList.push(AuditList); this.myAuditList.push(AuditList);
console.log(this.myAuditList,'this.myAuditList');
} }
if (type == 3) { if (type == 3) {
AuditList.AuditType = type; AuditList.AuditType = type;
...@@ -1552,7 +1553,7 @@ ...@@ -1552,7 +1553,7 @@
return return
} else { } else {
AuditList.RoleOrInitiator = this.showRole[0].Id; AuditList.RoleOrInitiator = this.showRole[0].Id;
AuditList.Name = this.showRole[0].DepartmentName; AuditList.RoleOrInitiatorName = this.showRole[0].DepartmentName;
AuditList.AuditDescription = this.AuditDescription; AuditList.AuditDescription = this.AuditDescription;
} }
this.myAuditList.push(AuditList); this.myAuditList.push(AuditList);
...@@ -1706,7 +1707,6 @@ ...@@ -1706,7 +1707,6 @@
this.GetNodeValue = 0; this.GetNodeValue = 0;
}, },
goUrl(path) { goUrl(path) {
console.log(path,'path');
this.$router.push({ this.$router.push({
path: '/financial/'+path, path: '/financial/'+path,
query: { query: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment