Skip to content

C
confucius
Commit 26c187f3 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent ba9045f4
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 107 deletions
src/pages/financial/accountingWork.vue
View file @ 26c187f3
...@@ -443,7 +443,6 @@ ...@@ -443,7 +443,6 @@
}); });
}, },
remoteMethod(query) { remoteMethod(query) {
console.log('搜索');
let msg = { let msg = {
EmployeeName:query EmployeeName:query
} }
...@@ -454,20 +453,6 @@ ...@@ -454,20 +453,6 @@
}).catch(() => { }).catch(() => {
}) })
// if (query !== '' || this.addShow) {
// this.loading2 = true;
// this.apipost("admin_Get_Chat_All_SelectEmpName", {
// EmName: query
// }, res => {
// if (res.data.resultCode == 1) {
// this.searchList = res.data.data;
// this.loading2 = false;
// }
// }, err => {});
// } else {
// this.searchList = [];
// this.loading2 = false;
// }
}, },
getList() { getList() {
this.loading = true; this.loading = true;
......
src/pages/financial/addFinancialProcess.vue
View file @ 26c187f3
...@@ -239,10 +239,10 @@ ...@@ -239,10 +239,10 @@
<div class="approval_layer_info" v-if="approvalType==2"> <div class="approval_layer_info" v-if="approvalType==2">
<div class="normalMember"> <div class="normalMember">
<ul> <ul>
<li v-for="item in showMember">{{item.DepartmentName}}</li> <li v-for="item in showMember">{{item.EmployeeName}}</li>
</ul> </ul>
</div> </div>
<input type="button" class="normalBtn" @click="getMember(),mySetCheckedKeys(-1)" <input type="button" class="normalBtn" @click="getMember()"
:value="$t('fnc.tjchengyuan')" /> :value="$t('fnc.tjchengyuan')" />
<div style="margin: 10px 0;" v-if="showMember.length>1"> <div style="margin: 10px 0;" v-if="showMember.length>1">
<el-radio-group v-model="AuditWay"> <el-radio-group v-model="AuditWay">
...@@ -442,14 +442,14 @@ ...@@ -442,14 +442,14 @@
</el-input> </el-input>
</p> </p>
<el-tree class='ApprovalProcessBg' :data="memberList" show-checkbox :filter-node-method="filterNode" ref="tree" <el-tree class='ApprovalProcessBg' :data="memberList" show-checkbox :filter-node-method="filterNode" ref="tree"
:props="defaultProps" :render-after-expand="false" node-key="DepartmentId" @check-change="handleNodeChange"> :props="defaultProps" :render-after-expand="false" node-key="Id" :check-on-click-node="true" @check-change="handleNodeChange">
</el-tree> </el-tree>
</div> </div>
<div class="fl"> <div class="fl">
<p style="margin: 0 0 20px 0;">{{$t('fnc.yixuan')}}：</p> <p style="margin: 0 0 20px 0;">{{$t('fnc.yixuan')}}：</p>
<div class="Approval_yxList"> <div class="Approval_yxList">
<li v-for="item in showMember">{{item.DepartmentName}} <li v-for="(item,index) in showMember">{{item.EmployeeName}}
<i @click="mySetCheckedKeys(item.DepartmentId)" class="el-icon-circle-close showMemberIcon"></i> <i @click="mySetCheckedKeys(item.Id,index)" class="el-icon-circle-close showMemberIcon"></i>
</li> </li>
</div> </div>
</div> </div>
...@@ -531,6 +531,10 @@ ...@@ -531,6 +531,10 @@
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'
import {
queryEmployee
} from '../../api/users/user'
export default { export default {
components: { components: {
Treeselect Treeselect
...@@ -656,7 +660,7 @@ ...@@ -656,7 +660,7 @@
defaultCheckedArr: [], defaultCheckedArr: [],
defaultProps: { defaultProps: {
children: 'ChildList', children: 'ChildList',
label: 'DepartmentName', label: 'EmployeeName',
}, },
defaultProps1: { defaultProps1: {
// children: 'ChildList', // children: 'ChildList',
...@@ -983,6 +987,7 @@ ...@@ -983,6 +987,7 @@
} else { } else {
this.addMsg.list = this.accListMsg this.addMsg.list = this.accListMsg
} }
this.addMsg.FinancialInstitutions=[];
if (this.BranchIdS.length != 0) { //适用公司 if (this.BranchIdS.length != 0) { //适用公司
this.BranchIdS.forEach(x => { this.BranchIdS.forEach(x => {
if (x == -1) { if (x == -1) {
...@@ -1162,15 +1167,23 @@ ...@@ -1162,15 +1167,23 @@
} }
}, },
addAuditUser() { // 抄送人 addAuditUser() { // 抄送人
let _arr = this.sysUserKeys.concat(this.memberSetCheckedUserKeys) // let _arr = this.sysUserKeys.concat(this.memberSetCheckedUserKeys)
this.dialogTitle = this.$t('fnc.xzrenyuan'); // this.dialogTitle = this.$t('fnc.xzrenyuan');
this.outerVisible2 = true; // this.outerVisible2 = true;
let _this = this; // let _this = this;
this.apipost('WorkFlow_get_GetTempLateDepartMentEmployee', {}, res => { // this.apipost('WorkFlow_get_GetTempLateDepartMentEmployee', {}, res => {
if (res.data.resultCode == 1) { // if (res.data.resultCode == 1) {
this.userList = res.data.data // this.userList = res.data.data
// }
// }, err => {})
queryEmployee(msg).then(res => {
if(res.Code==1){
this.searchList = res.Data;
} }
}, err => {}) }).catch(() => {
})
}, },
checkedRole(data, checked) { // 岗位选择+ checkedRole(data, checked) { // 岗位选择+
if (data.DepartmentId == 0) return if (data.DepartmentId == 0) return
...@@ -1439,62 +1452,42 @@ ...@@ -1439,62 +1452,42 @@
}, },
handleNodeChange(data, checked) { handleNodeChange(data, checked) {
data.IsCheck = checked; data.IsCheck = checked;
if (data.Type == 2 && data.IsCheck) { //是员工且选中 var obj={
let isExsit = false EmployeeName:data.EmployeeName,
this.showMember.forEach(x => { Id:data.Id
if (x.DepartmentId == data.DepartmentId) { }
isExsit = true let res = this.$refs.tree.getCheckedNodes(true, true);
return false this.showMember = res;
} },
}) mySetCheckedKeys(id,index) {
if (!isExsit) { var arr=[];
this.showMember.push({ this.showMember.splice(index,1);
DepartmentName: data.DepartmentName, this.showMember.forEach(x=>{
DepartmentId: data.DepartmentId arr.push(x.Id);
}) })
if (data.DepartmentId != 0) if(this.$refs.tree){
this.memberSetCheckedKeys.push(data.DepartmentId) this.$refs.tree.setCheckedKeys(arr);
}
} else if (data.Type == 2 && !data.IsCheck) {
if (this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId) != -1) {
this.showMember.splice(this.showMember.findIndex(item => item.DepartmentId === data.DepartmentId), 1)
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
if (this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
}
}
}
if (data.Type != 2 && data.IsCheck) {
if (this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) == -1) {
if (data.DepartmentId != 0)
this.memberSetCheckedKeys.push(data.DepartmentId)
}
} else if (data.Type == 2 && !data.IsCheck) {
if (this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.DepartmentId), 1)
if (this.showMember.findIndex(item => item.DepartmentId === data.ParentId) != -1) {
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === data.ParentId), 1)
}
}
} }
}, },
mySetCheckedKeys(id) {
if (this.memberSetCheckedKeys.length == 0)
return
if (id == -1) {
this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys)
return
}
this.showMember.splice(this.showMember.findIndex(item => item.DepartmentId === id), 1)
this.memberSetCheckedKeys.splice(this.memberSetCheckedKeys.findIndex(item => item === id), 1)
this.$refs.tree.setCheckedKeys(this.memberSetCheckedKeys);
},
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');
this.apipost('WorkFlow_get_GetTempLateDepartMentEmployee', {}, res => { queryEmployee({}).then(res => {
this.memberList = res.data.data if(res.Code==1){
}, err => {}) this.memberList = res.Data;
}
}).catch(() => {
})
// console.log(this.showMember,'this.showMember');
var arr=[];
this.showMember.forEach(x=>{
arr.push(x.Id);
})
if(this.$refs.tree){
this.$refs.tree.setCheckedKeys(arr);
}
}, },
deleteItem(sort) { // 删除已添加审批人 deleteItem(sort) { // 删除已添加审批人
this.myAuditList.splice(this.myAuditList.findIndex(item => item.Sort === sort), 1) this.myAuditList.splice(this.myAuditList.findIndex(item => item.Sort === sort), 1)
...@@ -1503,7 +1496,7 @@ ...@@ -1503,7 +1496,7 @@
let AuditList = {}; let AuditList = {};
let type = this.approvalType let type = this.approvalType
if (this.AuditDescription == '') { if (this.AuditDescription == '') {
return this.$message.error(this.$t('tips.qtxjdmiaoshu')) return this.$message.error('请填写节点描述！')
} }
if (type == 1) { if (type == 1) {
AuditList.AuditType = type; AuditList.AuditType = type;
...@@ -1532,8 +1525,8 @@ ...@@ -1532,8 +1525,8 @@
let Auu = []; let Auu = [];
Au.forEach((item, index) => { Au.forEach((item, index) => {
Auu.push({ Auu.push({
EmployeeId: item.DepartmentId, EmployeeId: item.Id,
emName: item.DepartmentName, emName: item.EmployeeName,
Sort: index + 1 Sort: index + 1
}) })
}) })
...@@ -1546,10 +1539,10 @@ ...@@ -1546,10 +1539,10 @@
AuditList.AuditUserList = Auu; AuditList.AuditUserList = Auu;
AuditList.SpecialNode = this.GetNodeValue; AuditList.SpecialNode = this.GetNodeValue;
if (Auu.length == 0) { if (Auu.length == 0) {
this.$message.error(this.$t('tips.cybnweikong')) this.$message.error('成员不能为空')
return return
} else if (Auu.length > 10) { } else if (Auu.length > 10) {
this.$message.error(this.$t('tips.rsbncgtr')) this.$message.error('rsbncgtr')
return return
} }
this.myAuditList.push(AuditList); this.myAuditList.push(AuditList);
...@@ -1678,24 +1671,6 @@ ...@@ -1678,24 +1671,6 @@
}, },
clearValue(t) { // 选择会计出纳窗口获取对应下拉 clearValue(t) { // 选择会计出纳窗口获取对应下拉
this.SpecialNodeSelectType = ''; // 选择普通节点初始化 特殊节点 值 this.SpecialNodeSelectType = ''; // 选择普通节点初始化 特殊节点 值
// if(t==5){
// this.WindowList = [];
// this.apipost('Window_post_GetWindowList',{Type:1},res=>{
// if(res.data.resultCode==1){
// let data = res.data.data;
// this.WindowList = data;
// }else{}
// },null)
// }
// if(t==6){
// this.WindowList = [];
// this.apipost('Window_post_GetWindowList',{Type:2},res=>{
// if(res.data.resultCode==1){
// let data = res.data.data;
// this.WindowList = data;
// }else{}
// },null)
// }
}, },
changeValue(value) { changeValue(value) {
......
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