Skip to content

S
SuperMan
Commit a697a4f4 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

财务审批新增一键审批！

parent 4bea2ae8
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 163 deletions
src/components/DomesticModule/FinancialOrder.vue
View file @ a697a4f4
...@@ -213,7 +213,6 @@ export default { ...@@ -213,7 +213,6 @@ export default {
} }
this.apipost('Financial_post_GetTicketFinanceList',msg,r=>{ this.apipost('Financial_post_GetTicketFinanceList',msg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.total = r.data.data.count;
if(this.total>0){ if(this.total>0){
this.noData =false; this.noData =false;
}else{ }else{
......
src/components/DomesticModule/SettlementOrder.vue
View file @ a697a4f4
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :page-size='msg.pageSize'
:total=total> :total='total'>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ a697a4f4
...@@ -97,6 +97,15 @@ ...@@ -97,6 +97,15 @@
width: 216px; width: 216px;
} }
._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;} ._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;}
.boss_btn_tips,.boss_btn{
text-align: center;
}
.boss_btn_tips{
padding-bottom: 25px;
}
.boss_btn span{
color: #2BB87C;
}
</style> </style>
<template > <template >
...@@ -369,160 +378,13 @@ ...@@ -369,160 +378,13 @@
<span> <span>
<em @click.stop="heightQueryBox=!heightQueryBox">{{$t('fnc.gjchaxun')}} <i class="iconfont icon-gengduo"></i></em> <em @click.stop="heightQueryBox=!heightQueryBox">{{$t('fnc.gjchaxun')}} <i class="iconfont icon-gengduo"></i></em>
</span> </span>
<!-- <div class="hight_query_box" @click.stop>
<el-collapse-transition>
<div v-show="heightQueryBox">
<p class="hqb_t">财务单据高级查询</p>
<el-form :model="msg" ref="msg" label-width="100px">
<ul class="clearfix">
<li>
<el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',getDepartment()" class="w135">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList'
:label='item.BName'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="费用部门：">
<el-select filterable v-model='msg.RB_Depart_Id' @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList'
:label='item.DepartmentName'
:value='item.DepartmentID'
:key='item.DepartmentID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="制单人员：">
<el-select filterable v-model='msg.UpdateBy' class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="账户类型：">
<el-select filterable v-model='msg.AccountType' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="交易方式：">
<el-select filterable v-model='msg.TradeWay' @change="getAccountList(msg.AccountType,msg.TradeWay),msg.ClientID=''" class="w135">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="收付款账户：" >
<el-select filterable v-model='msg.BankID' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in accountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li v-show="msg.Type==2">
<el-form-item label="对象类型：">
<el-select filterable v-model='msg.ClientType' @change="financeinfo_post_GetClientAccountList(msg.ClientType),msg.ClientID=''" class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li v-show="msg.Type==2">
<el-form-item label="付款对象：" >
<el-select filterable v-model='msg.ClientID' class="w135">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="团队编号：">
<el-input v-model="msg.TCID" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="订单编号：">
<el-input v-model="msg.OrderID" class="w135"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="币种类型：" >
<el-select filterable v-model='msg.CurrencyId' class="w135">
<el-option v-for="item in currencyTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="费用类型：">
<el-select filterable v-model='msg.CostTypeID' class="w135">
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select>
</el-form-item>
</li>
<li>
<el-form-item label="单据金额：" >
<el-input v-model="msg.sMoney" class="w64d5"></el-input>-<el-input v-model="msg.eMoney" class="w64d5"></el-input>
</el-form-item>
</li>
<li>
<el-form-item label="发团日期：">
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</li>
<li class="_hqb_btn">
<button class="normalBtn" @click="getPageList()">确定</button>
</li>
</ul>
</el-form>
</div>
</el-collapse-transition>
</div> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button> <button class="normalBtn" @click="goUrlAdd('ChoiceAddFinancialDocuments')">{{$t('pub.addBtn')}}</button>
<button class="normalBtn" v-if="checkboxShow" @click="Financial_post_SetBatch">{{$t('fnc.piltijiao')}}</button> <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="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
<button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button> <button class="hollowFixedBtn" @click="goUrl('WorkEntrustmentMy')">{{$t('fnc.gzweituo')}}</button>
<button class="hollowFixedBtn" @click="BOSSBtn = !BOSSBtn, checkList = [], getPageList(1)" v-if="msg.Conditon === 3 && !userMenuCode">{{BOSSBtn ? '关闭一键审批' : '一键审批'}}</button>
<button class="hollowFixedBtn" v-if="msg.Conditon === 3 && BOSSBtn" @click="BOSSBtnClick">审批</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -531,7 +393,7 @@ ...@@ -531,7 +393,7 @@
<div class="_fnDm_content" v-loading='loading' :style="{minHeight:minHeight+'px'}"> <div class="_fnDm_content" v-loading='loading' :style="{minHeight:minHeight+'px'}">
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr class="_t_head"> <tr class="_t_head">
<th v-if="checkboxShow"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th> <th v-if="checkboxShow || BOSSBtn"><input type="checkbox" v-model="isCkedAll" @click='checkedAll()'></th>
<th width="90">{{$t('system.query_company')}}</th> <th width="90">{{$t('system.query_company')}}</th>
<th>{{$t('fnc.danhao')}}</th> <th>{{$t('fnc.danhao')}}</th>
<th width="90">{{$t('fnc.djleixing')}}</th> <th width="90">{{$t('fnc.djleixing')}}</th>
...@@ -545,7 +407,7 @@ ...@@ -545,7 +407,7 @@
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr class="_item_list" v-for="(item,index) in DataList"> <tr class="_item_list" v-for="(item,index) in DataList">
<td v-if="checkboxShow"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td> <td v-if="checkboxShow || BOSSBtn"><input type="checkbox" :value="item.FrID" v-model="checkList" @change="ckeckedOne"></td>
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td class="Bill_par"> <td class="Bill_par">
<el-popover <el-popover
...@@ -696,7 +558,7 @@ ...@@ -696,7 +558,7 @@
<div class="noData" v-show="noData"> <div class="noData" v-show="noData">
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<div> <div v-if="!BOSSBtn">
<el-pagination <el-pagination
background background
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
...@@ -763,6 +625,29 @@ ...@@ -763,6 +625,29 @@
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button> <el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="一键审批" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false" :close-on-click-modal="false" >
<template v-if="!BOSSDialogText">
<el-form label-width="110px">
<el-form-item :label="$t('fnc.shuoming')">
<el-input type="textarea" v-model="AuditOrRefundMsg.Description" class="w216"></el-input>
</el-form-item>
</el-form>
<el-form>
<div style=" text-align: center;">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="BOSSDialog=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="bossLen = 1, subBOSSBtnClick()">{{$t('pub.sureBtn')}}</el-button>
</div>
</template>
<template v-else>
<p class="boss_btn">共计 {{checkList.length}} 条，当前第 <span>{{bossLen}}</span> 条。</p>
<p class="boss_btn_tips">一键审核中请不要进行其他操作。</p>
</template>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -879,7 +764,21 @@ export default { ...@@ -879,7 +764,21 @@ export default {
searchList:[], searchList:[],
minHeight:400, minHeight:400,
//当前登录用户功能权限 //当前登录用户功能权限
ActionMenuCode:'' ActionMenuCode:'',
BOSSBtn: false,
AuditOrRefundMsg:{
WorkFlowId:'',
Description:'',
Status:'5',
Image: '',
TradeDate:new Date().Format("yyyy-MM-dd"),
tradeWays:[],
emList:[],
},
bossLen: null,
BOSSDialog: false,
userMenuCode: false,
BOSSDialogText: false,
} }
}, },
created(){ created(){
...@@ -911,6 +810,8 @@ export default { ...@@ -911,6 +810,8 @@ export default {
"my-HB-Bill":myhrBill, "my-HB-Bill":myhrBill,
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.ActionMenuCode=userInfo.ActionMenuCode; this.ActionMenuCode=userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id; this.DepartIDs = userInfo.RB_Department_Id;
...@@ -927,7 +828,40 @@ export default { ...@@ -927,7 +828,40 @@ export default {
this.FinancialFlowTemplate_post_GetStatusList(); this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList(); this.getPageList();
this.AccountType_post_GetList(); this.AccountType_post_GetList();
},methods:{ },
methods:{
subBOSSBtnClick: function () {
this.loading = true;
if (this.bossLen && this.bossLen <= this.checkList.length) {
this.BOSSDialogText = true;
this.AuditOrRefundMsg.WorkFlowId = this.checkList[this.bossLen-1]
this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
if(res.data.resultCode==1){
this.bossLen += 1
this.subBOSSBtnClick()
}else{
this.$message.error(res.data.message);
this.loading = false;
this.checkList = [];
this.getPageList(1)
}
},err=>{})
} else {
this.BOSSDialogText = false;
this.BOSSDialog = false;
this.checkList = [];
this.$message.success('审核完毕');
this.loading = false;
this.getPageList(1)
}
},
BOSSBtnClick: function () {
if (this.checkList.length<1) {
this.$message.error(this.$t('rule.qxzygxytjddanju'));
} else {
this.BOSSDialog = true;
}
},
goTicketPage(data) { // 跳转机票 goTicketPage(data) { // 跳转机票
this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} }) this.$router.push({ name: 'TicketManager',query:{id:data.SourceID,blank:'y',tab:'票务管理'} })
}, },
...@@ -1022,10 +956,15 @@ export default { ...@@ -1022,10 +956,15 @@ export default {
} }
},err=>{}) },err=>{})
}, },
getPageList(){ // 获取列表数据 getPageList(t){ // 获取列表数据
this.loading= true this.loading= true
this.checkAllList =[]; this.checkAllList =[];
this.checkList = []; this.checkList = [];
if (t) {
this.msg.pageSize = 1000;
} else {
this.msg.pageSize = 6;
}
if(this.msg.Status==0){ if(this.msg.Status==0){
this.checkboxShow = true; this.checkboxShow = true;
}else{ }else{
...@@ -1067,7 +1006,7 @@ export default { ...@@ -1067,7 +1006,7 @@ export default {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
this.queryInfoInit(); this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex); this.currentPage = res.data.data.pageCount
},err=>{}) },err=>{})
}, },
financeRemove(id){//作废 financeRemove(id){//作废
...@@ -1406,6 +1345,8 @@ export default { ...@@ -1406,6 +1345,8 @@ export default {
goEit(path,type,id,edit,Conditon,pageIndex){ goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} }) this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} }
},
watch:{
} }
} }
</script> </script>
src/components/LeaderManagement/leaderReimbursement.vue
View file @ a697a4f4
...@@ -638,9 +638,10 @@ ...@@ -638,9 +638,10 @@
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.98 let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.98
let totailMoney = 0 let totailMoney = 0
this.nav.forEach(x=>{ this.nav.forEach(x=>{
totailMoney += x.LeaderGetPriceT totailMoney += parseFloat(x.LeaderGetPriceT)
}) })
if ((allMoney - totailMoney)<=0) return this.$message.error('总制单金额已大于等于总金额，无法制单！') console.log(allMoney, totailMoney)
if ((allMoney - totailMoney)<0) return this.$message.error('总制单金额已大于等于总金额，无法制单！')
if (!obj.LeaderGetPriceT || obj.LeaderGetPriceT<=0) return this.$message.error('请输入金额！') if (!obj.LeaderGetPriceT || obj.LeaderGetPriceT<=0) return this.$message.error('请输入金额！')
let TCIDARR = [obj.TCIDS] let TCIDARR = [obj.TCIDS]
let orderObj = { let orderObj = {
......
src/components/administrative/outWorkApproval.vue
View file @ a697a4f4
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :page-size='msg.pageSize'
:total=total> :total='total'>
</el-pagination> </el-pagination>
<el-dialog custom-class='w500' :title="dialogTitle" :visible.sync="outerVisible" center > <el-dialog custom-class='w500' :title="dialogTitle" :visible.sync="outerVisible" center >
......
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