Skip to content

C
confucius
Commit db321944 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents 79d574f4 c1762307
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3332 additions and 77 deletions
src/App.vue
View file @ db321944
......@@ -12,7 +12,7 @@ export default {
<style>
@import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_xkbuljsn3gc.css');
@import url('//at.alicdn.com/t/font_2077629_yp91bsm9op.css');
html,
body,
......
src/pages/financial/TeamRevenueReport.vue
View file @ db321944
......@@ -1893,11 +1893,11 @@
GetSupperOrderEditAuth() {
// F_GeneralManager_Special 财务总经理副总经理权限
var actionCode = this.$AuthCode.F_GeneralManager_Special;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_GeneralManager = true;
}
});
// this.CheckUserAuth(actionCode, res => {
// if (res.data.resultCode == 1 && res.data.data == 1) {
// this.F_GeneralManager = true;
// }
// });
},
rowClick(rowIndex,rowData,column){
let path='RegistrationList';
......
src/pages/financial/addFinancialProcess.vue
View file @ db321944
......@@ -465,15 +465,15 @@
</el-input>
</p>
<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">
</el-tree>
</div>
<div class="fl">
<p style="margin: 0 0 20px 0;">{{$t('fnc.yixuangangwei')}}：</p>
<div class="Approval_yxList">
<li v-for="item in showRole">{{item.DepartmentName}}
<i @click="deleteRole()" class="el-icon-circle-close showMemberIcon"></i>
<li v-for="(item,index) in showRole">{{item.DepartmentName}}
<i @click="deleteRole(index)" class="el-icon-circle-close showMemberIcon"></i>
</li>
</div>
</div>
......@@ -528,6 +528,9 @@
import {
getSchoolPage
} from '../../api/school/index'
import {
getPostPage,
} from '../../api/system/post'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
......@@ -710,6 +713,15 @@
rowsPerPage: 12,
SName: "",
Status: '-1'
},
//岗位msg
jobMsg:{
pageIndex: 1,
pageSize: 12,
rowsPerPage: 12,
PostName: "", //岗位名称
PostId: 0, //岗位编号
Status: "-1",
}
}
},
......@@ -1029,8 +1041,6 @@
this.$message.error(this.$t('tips.qxzspiren'))
return
}
console.log(this.myAuditList,'myAuditList');
console.log(this.myAuditUserList,'myAuditUserList');
if (this.myAuditUserList.length != 0) {
this.addMsg.Workflow_Condition.AuditUserList = this.myAuditUserList
......@@ -1046,9 +1056,8 @@
this.$message.error(this.$t('tips.qxzliucehng'))
return
}
// this.loading = true;
this.loading = true;
this.addMsg.Workflow_Condition.AuditList;
console.log(this.addMsg,'this.addMsg');
this.apipost('FinancialFlowTemplate_post_Set', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.loading = false;
......@@ -1166,40 +1175,37 @@
},
checkedRole(data, checked) { // 岗位选择+
if (data.DepartmentId == 0) return
if (checked) {
this.roleSetCheckedKeys.push(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)
if(checked){
this.$refs.treeRole.setCheckedKeys([data.PostId]);
}
}
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() { // 删除已选岗位
this.showRole = []
this.roleSetCheckedKeys.splice(this.roleSetCheckedKeys.findIndex(item => item), 1)
this.$refs.treeRole.setCheckedKeys(this.roleSetCheckedKeys);
deleteRole(index) { // 删除已选岗位
this.showRole.splice(index,1);
var arr=[];
this.showRole.forEach(x=>{
arr.push(x.Id);
})
if(this.$refs.treeRole){
this.$refs.treeRole.setCheckedKeys(arr);
}
},
getRole() { // 选择岗位
this.apipost('admin_get_PostGetList', {
RB_Group_Id: this.getPostMsg.RB_Group_Id
}, res => {
let data = res.data.data;
data.forEach(x => {
x.Disabled = false;
})
this.roleList = data;
}, err => {})
getPostPage(this.jobMsg).then(res => {
if(res.Code==1){
this.roleList = res.Data.PageData;
}
}).catch(() => {
})
},
saveUpdateNode() {
let AuditList = {};
......@@ -1394,28 +1400,26 @@
this.directors = obj.RoleOrInitiator
}
if (obj.AuditType == 2) {
console.log(obj,'objjj');
this.showMember = [];
// this.showMember = [];
this.memberSetCheckedKeys = [];
this.AuditWay = obj.AuditWay;
var arr=[];
obj.AuditUserList.forEach((item, index) => {
this.showMember.push({
EmployeeName: item.EmName,
Id: item.Id
Id: item.EmployeeId
})
arr.push(item.Id);
arr.push(item.EmployeeId);
if(this.$refs.tree){
this.$refs.tree.setCheckedKeys(arr);
}
})
console.log(this.showMember,'this.showMember');
}
if (obj.AuditType == 3) {
this.AuditWay = obj.AuditWay;
this.showRole = [];
this.showRole.push({
DepartmentName: obj.AduitName,
DepartmentName: obj.RoleOrInitiatorName,
Id: obj.RoleOrInitiator
})
this.defaultCheckedArr.push(obj.RoleOrInitiator)
......@@ -1439,7 +1443,6 @@
handleNodeChange(data, checked) {
data.IsCheck = checked;
let res = this.$refs.tree.getCheckedNodes(true, true);
console.log(res,'选中');
this.showMember=[];
res.forEach(x=>{
var obj={
......@@ -1460,7 +1463,6 @@
}
},
getMember() { // 获取指定成员列表
console.log(this.showMember,'this.showMember');
this.outerVisible = true;
this.dialogTitle = this.$t('fnc.xzrenyuan');
queryEmployee({}).then(res => {
......@@ -1536,7 +1538,6 @@
return
}
this.myAuditList.push(AuditList);
console.log(this.myAuditList,'this.myAuditList');
}
if (type == 3) {
AuditList.AuditType = type;
......@@ -1552,7 +1553,7 @@
return
} else {
AuditList.RoleOrInitiator = this.showRole[0].Id;
AuditList.Name = this.showRole[0].DepartmentName;
AuditList.RoleOrInitiatorName = this.showRole[0].DepartmentName;
AuditList.AuditDescription = this.AuditDescription;
}
this.myAuditList.push(AuditList);
......@@ -1706,7 +1707,6 @@
this.GetNodeValue = 0;
},
goUrl(path) {
console.log(path,'path');
this.$router.push({
path: '/financial/'+path,
query: {
......
src/pages/financial/components/NewBillModule.vue 0 → 100644
View file @ db321944
This diff is collapsed.
src/pages/financial/components/czBillModule.vue
View file @ db321944
......@@ -250,11 +250,11 @@
this.IsAdvanceFinance=data.IsAdvanceFinance;
this.ECommerceGoodsModel=data.ECommerceGoodsModel;
this.details=data;
if(this.OtherType==7){
this.getDetails()
}else{
this.getczTableList();
}
// if(this.OtherType==7){
// this.getDetails()
// }else{
// this.getczTableList();
// }
}
}, err => {})
......
src/pages/financial/financalDocument/BasicDocuments.vue 0 → 100644
View file @ db321944
This source diff could not be displayed because it is too large. You can view the blob instead.
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @ db321944
......@@ -594,13 +594,13 @@
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrlWeituo('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button>
<button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button>
<!-- <button v-if="active==3 && !hbState && hbShow" class="hollowFixedBtn" @click="HebingSP">合并审批</button> -->
<!-- <button v-if="active==3 && hbState" class="hollowFixedBtn" @click="hbState=false,getPageList">关闭合并审批</button> -->
<button v-loading="hbBtn" v-if="active==3 && hbState" class="hollowFixedBtn" @click="HebingSPLast">审批</button>
<!-- <button v-if="HandShow" class="hollowFixedBtn" @click="Handwithfee">手配费收入</button>-->
<!-- <button class="hollowFixedBtn" @click="ZhiDanChongDi"> 预付款冲抵</button>-->
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 ">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<!-- <button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if="msg.Conditon === 3 ">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button> -->
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn"
@click="BOSSBtnClick(1)">{{$t('ios.shenpi')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn2 = !BOSSBtn2, checkList = [], getPageList(1), BOSSBtn = false"
......@@ -966,7 +966,7 @@
</template>
</td>
<td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt="">
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<span>{{item.EmName}}</span>
</td>
<td class="_btn_group">
......
src/pages/financial/financalDocument/FinancialDocumentsDetail.vue
View file @ db321944
......@@ -988,17 +988,17 @@
methods:{
GetAuth() {
var actionCode = this.$AuthCode.TeamShouZhi;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.TeamShouZhi = true;
}
});
// this.CheckUserAuth(actionCode, res => {
// if (res.data.resultCode == 1 && res.data.data == 1) {
// this.TeamShouZhi = true;
// }
// });
var actionCodeNew = this.$AuthCode.F_Disbursement_Schedule;
this.CheckUserAuth(actionCodeNew, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.F_Disbursement_Schedule = true;
}
});
// this.CheckUserAuth(actionCodeNew, res => {
// if (res.data.resultCode == 1 && res.data.data == 1) {
// this.F_Disbursement_Schedule = true;
// }
// });
},
goHand(type,GetDetail){
......
src/pages/financial/financalDocument/addFinancialDocuments.vue
View file @ db321944
......@@ -677,7 +677,7 @@
<p>{{$t('fnc.fjshuoming')}}</p>
<div>
<p>{{$t('fnc.fygsbumen')}}：<span>
<el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
<el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1" @change="admin_get_Depart_IdGetList(msg.RB_Depart_Id)">
<el-option v-for='item in departmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DeptId'>
</el-option>
......@@ -1577,8 +1577,14 @@
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
if(this.$route.query.companyID!=='undefined'){
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
}else {
this.msg.RB_Branch_Id = this.getLocalStorage().School_Id;
}
}
this.admin_get_DepartmentGetList(this.msg.RB_Branch_Id);
this.msg.PayDate = this.msg.PayDate;
this.msg.detailList = [];
......@@ -1693,10 +1699,22 @@
}
}, err => {})
},
admin_get_Depart_IdGetList(Bid){
this.departmentList.forEach(x=>{//给msg传部门名称
if(x.DeptId==Bid){
this.msg.RB_DepartName = x.DeptName;
}
})
},
admin_get_DepartmentGetList(Bid, T) {
if (Bid == 0) {
this.chosenPeople = [];
}
this.CompanyList.forEach(x=>{//给msg传校区的名字
if(x.SId==Bid){
this.msg.RB_BranchName = x.SName;
}
})
// this.msg.RB_Depart_Id = '';
// this.departmentMsg.RB_Branch_Id = Bid ? Bid : -1;
this.departmentMsg.RB_Branch_Id = -1;
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ db321944
......@@ -579,7 +579,7 @@
<p>{{$t('fnc.fjshuoming')}}</p>
<div>
<p>{{$t('fnc.fygsbumen')}}：<span>
<el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1">
<el-select filterable v-model='msg.RB_Depart_Id' class="w135 _border_b_1" @change="admin_get_Depart_IdGetList(msg.RB_Depart_Id)">
<el-option v-for='item in departmentList' :label='item.DeptName' :value='item.DeptId'
:key='item.DeptId'>
</el-option>
......@@ -1707,6 +1707,11 @@
// this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id
this.departmentMsg.RB_Branch_Id = -1;
this.msg.RB_Depart_Id = '';
this.companyList.forEach(x=>{//给msg传校区的名字
if(x.SId==Bid){
this.msg.RB_BranchName = x.SName;
}
})
getDeptList(this.departmentMsg).then(res => {
if (res.Code == 1) {
this.departmentList = res.Data;
......@@ -1714,12 +1719,22 @@
} else {
this.msg.RB_Depart_Id = this.msg.RB_Depart_Id ? this.msg.RB_Depart_Id : this.getLocalStorage().DeptId;
this.msg.RB_DepartName =this.msg.RB_DepartName?this.msg.RB_DepartName: this.getLocalStorage().RB_DepartName;
}
}
}).catch(() => {
})
},
admin_get_Depart_IdGetList(Bid){
this.departmentList.forEach(x=>{//给msg传部门名称
if(x.DeptId==Bid){
this.msg.RB_DepartName = x.DeptName;
}
})
},
getCompany() { // 获取公司
getSchoolPage(this.schoolMsg).then(res => {
let data = res.Data.PageData;
......
src/router/routes.js
View file @ db321944
......@@ -286,6 +286,11 @@ const routes = [{
component: () =>
import("pages/financial/financalDocument/FinancialDocumentsDetail.vue")
},
{
path: "/financial/financalDocument/BasicDocuments", //财务 财务单据 审核标准单据
component: () =>
import("pages/financial/financalDocument/BasicDocuments.vue")
},
{
path: "/test", //API测试
......
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