Skip to content

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

财务新增挂账，修改领队用款计划页面，新增发票相关页面

parent 569a73cf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2943 additions and 218 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 300033c4
...@@ -262,12 +262,15 @@ ...@@ -262,12 +262,15 @@
<div class="page_bdm" v-if="GetDetail" v-loading="loading"> <div class="page_bdm" v-if="GetDetail" v-loading="loading">
<p class="_tit">{{GetDetail.FinanceName}}</p> <p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten"> <div class="_conten">
<template v-if="GetDetail.Type!=1"> <template v-if="GetDetail.Type===2">
<my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
</template> </template>
<template v-else> <template v-else-if="GetDetail.Type===1">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
</template> </template>
<template v-else-if="GetDetail.Type===7">
<my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
</template>
<div class="_explain"> <div class="_explain">
<p>附加说明：</p> <p>附加说明：</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
...@@ -302,7 +305,7 @@ ...@@ -302,7 +305,7 @@
</table> </table>
<!-- <p>附加说明</p> --> <!-- <p>附加说明</p> -->
<div> <div>
<p>费用归属部门：<span>{{GetDetail.DepartName}}</span></p> <p v-if="GetDetail.Type!==7">费用归属部门：<span>{{GetDetail.DepartName}}</span></p>
<div> <div>
<el-popover <el-popover
popper-class="detailsIT_Journal" popper-class="detailsIT_Journal"
...@@ -997,6 +1000,7 @@ ...@@ -997,6 +1000,7 @@
<script> <script>
import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue"; import myFlowChartModule from "./FinancialSubmodule/FlowChartModule.vue";
import myBill from "./FinancialSubmodule/BillModule.vue"; import myBill from "./FinancialSubmodule/BillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue"; import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue"; import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import teamProductModule from "../commonPage/teamProductModule.vue"; import teamProductModule from "../commonPage/teamProductModule.vue";
...@@ -1104,11 +1108,13 @@ export default { ...@@ -1104,11 +1108,13 @@ export default {
LogLoading:false, LogLoading:false,
userId:0, userId:0,
RB_Post_Id: 0, RB_Post_Id: 0,
ISGZ: false,
} }
},components:{ },components:{
"my-FlowChartModule": myFlowChartModule, "my-FlowChartModule": myFlowChartModule,
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
"my-GZ-Bill": myGZBill,
'TicketingModule':TicketingModule, 'TicketingModule':TicketingModule,
'teamProductModule':teamProductModule, 'teamProductModule':teamProductModule,
'SaleOrderModule':SaleOrderModule, 'SaleOrderModule':SaleOrderModule,
...@@ -1584,7 +1590,11 @@ export default { ...@@ -1584,7 +1590,11 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.$message.success(res.data.message); this.$message.success(res.data.message);
// let _this = this; // let _this = this;
this.$router.push({name:'FinancialDocuments',query:{'returnCode':3,"pageIndex":this.pageIndex}}) if (this.$route.query.ISGZ){
this.$router.push({name:'FinancialAccounting',query:{}})
} else {
this.$router.push({name:'FinancialDocuments',query:{'returnCode':3,"pageIndex":this.pageIndex}})
}
// setTimeout(function () { // setTimeout(function () {
// _this.MsgBus.$emit('msg'); // _this.MsgBus.$emit('msg');
// },500) // },500)
...@@ -1694,6 +1704,7 @@ export default { ...@@ -1694,6 +1704,7 @@ export default {
if(this.$route.query.pageIndex){ if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex; this.pageIndex = this.$route.query.pageIndex;
} }
this.ISGZ = this.$route.query.ISGZ ? true : false
},mounted(){ },mounted(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
......
src/components/FinancialModule/CapitalAllocation.vue
View file @ 300033c4
...@@ -60,13 +60,13 @@ ...@@ -60,13 +60,13 @@
<el-form label-width="100px" class="form"> <el-form label-width="100px" class="form">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单据编号"> <el-form-item :label="$t('fnc.djbianhao')">
<el-input v-model="msg.FrID"></el-input> <el-input v-model="msg.FrID"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="公司"> <el-form-item :label="$t('system.table_company')">
<el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2"> <el-select v-model="msg.RB_Branch_Id" :placeholder="$t('rule.company')" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Depart_Id = -2">
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.BName'
...@@ -77,8 +77,8 @@ ...@@ -77,8 +77,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="部门"> <el-form-item :label="$t('admin.admin_Department')">
<el-select v-model="msg.RB_Depart_Id" placeholder="请选择部门" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'"> <el-select v-model="msg.RB_Depart_Id" :placeholder="$t('rule.qxzbmen')" @change="employeeMsg.DepartmentId = msg.RB_Depart_Id, getEmployee(), msg.UpdateBy='-1'">
<el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-2" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in DepartmentList' <el-option v-for='item in DepartmentList'
:label='item.DepartmentName' :label='item.DepartmentName'
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="制单人"> <el-form-item :label="$t('fnc.zhidanren')">
<el-select filterable v-model='msg.UpdateBy'> <el-select filterable v-model='msg.UpdateBy'>
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList'
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="制单日期"> <el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker <el-date-picker
@change="timeAdd(1)" @change="timeAdd(1)"
v-model="productionDate" v-model="productionDate"
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="交易日期"> <el-form-item :label="$t('fnc.jiaoyiriqi')">
<el-date-picker <el-date-picker
@change="timeAdd(2)" @change="timeAdd(2)"
v-model="productionDate2" v-model="productionDate2"
type="daterange" type="daterange"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至"> :range-separator="$t('restaurant.res_To')">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -141,13 +141,13 @@ ...@@ -141,13 +141,13 @@
<div class="page_CapitalAllocation_list"> <div class="page_CapitalAllocation_list">
<table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>单号</th> <th>{{$t('fnc.danhao')}}</th>
<th>金额</th> <th>{{$t('fnc.jine')}}</th>
<!-- <th>实付</th> --> <!-- <th>实付</th> -->
<!-- <th>原币金额</th> --> <!-- <th>原币金额</th> -->
<!-- <th>交易日期</th> --> <!-- <th>交易日期</th> -->
<th>创建时间</th> <th>{{$t('fnc.cjshijian')}}</th>
<th>创建人</th> <th>{{$t('active.cl_addPp')}}</th>
<!-- <th>备注</th> --> <!-- <th>备注</th> -->
<th>{{$t('admin.admin_status')}}</th> <th>{{$t('admin.admin_status')}}</th>
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
trigger="click"> trigger="click">
<div class="InfoChangeLog" > <div class="InfoChangeLog" >
<div class="changLog"> <div class="changLog">
<p class="_log_t">流程日志</p> <p class="_log_t">{{$t('fnc.lcrizhi')}}</p>
<ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'> <ul class="changLogList" v-if="GetFinancLogList" v-loading='LogLoading'>
<li class="changLogList_l" v-for="(log,li) in GetFinancLogList"> <li class="changLogList_l" v-for="(log,li) in GetFinancLogList">
<span style="background-color: #47BF8C" class="_radius_green"></span> <span style="background-color: #47BF8C" class="_radius_green"></span>
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
</li> </li>
</ul> </ul>
<ul v-else> <ul v-else>
<li>暂无修改日志</li> <li>{{$t('hotel.hotel_zanwu')}}</li>
</ul> </ul>
</div> </div>
</div> </div>
...@@ -190,16 +190,16 @@ ...@@ -190,16 +190,16 @@
</el-popover> </el-popover>
</td> </td>
<td> <td>
<el-tooltip class="item" effect="dark" content="修改" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1"> <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top" v-if="item.Status===1 && item.CreateBy===EmId && item.InOrNotProcess===-1">
<i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i> <i class="edit el-icon-edit" @click="goURL('addCapitalAllocation', 1, item.FrID)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="详情" placement="top"> <el-tooltip class="item" effect="dark" :content="$t('fnc.xiangqing')" placement="top">
<i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i> <i class="iconfont icon-sousuo" @click="goDetail('CapitalAllocationDetail', item.FrID)"></i>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
</table> </table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div> <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>{{$t('active.ld_noData')}}</p></div>
<div> <div>
<el-pagination <el-pagination
background background
...@@ -259,7 +259,9 @@ export default { ...@@ -259,7 +259,9 @@ export default {
GetFinancLogList: [], GetFinancLogList: [],
loading: true, loading: true,
LogLoading: true, LogLoading: true,
EmId:0 EmId:0,
total: 0,
currentPage: 0
} }
}, },
created(){ created(){
...@@ -304,7 +306,7 @@ export default { ...@@ -304,7 +306,7 @@ export default {
if(!this.msg.Status)this.msg.Status=0; if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0; if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId; this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} , this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,this.$t('fnc.zjdbbiao')+".xls");} ,
getCompanyList: function () { //获取公司列表 getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 300033c4
...@@ -24,10 +24,12 @@ ...@@ -24,10 +24,12 @@
<ul class="_nav clearfix" v-if="showTab==0"> <ul class="_nav clearfix" v-if="showTab==0">
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li> <li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li> <li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
<li :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
</ul> </ul>
<ul class="_nav clearfix" v-else> <ul class="_nav clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li> <li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li> <li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
<li :class="active==3?'_active':''" v-else>挂账单</li>
</ul> </ul>
<ul class="_conten"> <ul class="_conten">
<li v-for="(item,index) in GetList"> <li v-for="(item,index) in GetList">
...@@ -76,6 +78,7 @@ ...@@ -76,6 +78,7 @@
}, },
collectList:[], collectList:[],
payList:[], payList:[],
GZList: [],
total:0, total:0,
currentPage:1, currentPage:1,
noData:false, noData:false,
...@@ -87,8 +90,10 @@ ...@@ -87,8 +90,10 @@
goUrl(path,id,Name,Type,IsUploadPic) { goUrl(path,id,Name,Type,IsUploadPic) {
if(this.active==1){ if(this.active==1){
this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}}) this.$router.push({ name: "addReceivablesDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'}})
}else{ }else if(this.active==2){
this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}}) this.$router.push({ name: path,query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'}})
}else {
this.$router.push({ name: "addFinancialGZDocuments",query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'}})
} }
}, },
getFlowChart(id){ //获取流程图 getFlowChart(id){ //获取流程图
...@@ -106,8 +111,10 @@ ...@@ -106,8 +111,10 @@
tabData(t){ //切换 tabData(t){ //切换
if(t==1){ if(t==1){
this.GetList = this.collectList; this.GetList = this.collectList;
}else{ }else if (t==2){
this.GetList = this.payList; this.GetList = this.payList;
}else if (t==3) {
this.GetList = this.GZList;
} }
if(this.GetList.length<1){ if(this.GetList.length<1){
this.noData = true; this.noData = true;
...@@ -123,13 +130,16 @@ ...@@ -123,13 +130,16 @@
data.forEach(x => { data.forEach(x => {
if(x.Type==1){ if(x.Type==1){
this.collectList.push(x); this.collectList.push(x);
}else{ }else if (x.Type==2){
if(this.active===2){ if(this.active===2){
if(x.Id!=11){ if(x.Id!=11){
this.payList.push(x); this.payList.push(x);
} }
}else{ }else{
this.payList.push(x);} this.payList.push(x);
}
}else if (x.Type==7){
this.GZList.push(x);
} }
}); });
} }
...@@ -150,6 +160,8 @@ ...@@ -150,6 +160,8 @@
this.showTab = this.$route.query.Type?this.$route.query.Type:0; this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){ if(this.showTab==1){
this.GetList = this.collectList; this.GetList = this.collectList;
} else if(this.showTab==1){
this.GetList = this.GZList;
}else{ }else{
this.GetList = this.payList; this.GetList = this.payList;
} }
......
src/components/FinancialModule/FinancialAccounting.vue 0 → 100644
View file @ 300033c4
This diff is collapsed.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 300033c4
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.page_bdm{padding: 20px 0;} .page_bdm{padding: 20px 0;}
._tit{padding-left: 10px;border-left: 3px solid #E95252;font-size: 14px} ._tit{padding-left: 10px;border-left: 3px solid #E95252;font-size: 14px}
._conten{position: relative} ._conten{position: relative}
._conten,._process{margin-top: 20px;width: 830px;} ._conten,._process{margin-top: 20px;width: 890px;}
._explain{padding: 20px 15px;border-top: 1px dashed #BFBFBF;border-bottom: 1px dashed #BFBFBF;background-color: white;} ._explain{padding: 20px 15px;border-top: 1px dashed #BFBFBF;border-bottom: 1px dashed #BFBFBF;background-color: white;}
._explain>p{color: #1273BC;font-size: 12px;} ._explain>p{color: #1273BC;font-size: 12px;}
._explain>div{display: flex;justify-content: space-between;font-size: 12px;color: #333333;margin-top: 10px;align-items: center;} ._explain>div{display: flex;justify-content: space-between;font-size: 12px;color: #333333;margin-top: 10px;align-items: center;}
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
._upload_tips{font-size: 12px;position: absolute;top: 66%;width: 100%;left: 0;text-align: center;color: #949494;} ._upload_tips{font-size: 12px;position: absolute;top: 66%;width: 100%;left: 0;text-align: center;color: #949494;}
._log_t{padding: 10px;} ._log_t{padding: 10px;}
._time_n{float: right;} ._time_n{float: right;}
.w830px{width: 830px;padding: 0;margin: 0;} .w890px{width: 890px;padding: 0;margin: 0;}
.w600px{ .w600px{
width: 600px; width: 600px;
padding: 15px; padding: 15px;
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
} }
._fujian_box{ ._fujian_box{
position: fixed; position: fixed;
left: 914px; left: 961px;
top: 141px; top: 141px;
width: 440px; width: 440px;
} }
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
display: flex; display: flex;
} }
._splic{ ._splic{
width: 830px; width: 890px;
overflow: hidden; overflow: hidden;
font-size: 12px; font-size: 12px;
color: #929292; color: #929292;
...@@ -336,8 +336,9 @@ ...@@ -336,8 +336,9 @@
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span> <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p> <p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
<div class="_conten"> <div class="_conten">
<my-Bill v-if="GetDetail.Type!==1 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill> <my-Bill v-if="GetDetail.Type===2 && GetDetail.Type!==5" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill> <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
<my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-GZ-Bill>
<div class="_explain"> <div class="_explain">
<p>附加说明：</p> <p>附加说明：</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0"> <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
...@@ -372,7 +373,7 @@ ...@@ -372,7 +373,7 @@
</tr> </tr>
</table> </table>
<div> <div>
<p>费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p> <p v-if="GetDetail.Type!==7">费用归属部门：<span class="_font_bold">{{GetDetail.DepartName}}</span></p>
<div> <div>
<el-popover <el-popover
popper-class="detailsIT_Journal" popper-class="detailsIT_Journal"
...@@ -509,8 +510,8 @@ ...@@ -509,8 +510,8 @@
</div> </div>
<p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p> <p class="_splic">///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////</p>
<template v-if="sonTCIDList"> <template v-if="sonTCIDList">
<div class="w830px"> <div class="w890px">
<div class="_tit _tit2 w830px _border_bottom_none"> <div class="_tit _tit2 w890px _border_bottom_none">
<p> <p>
<span class="_text">团队</span> <span class="_text">团队</span>
<span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span> <span class="_btn" v-if="tableShowTeam" @click="tableShowTeam=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
...@@ -524,13 +525,13 @@ ...@@ -524,13 +525,13 @@
</div> </div>
</div> </div>
</template> </template>
<div class="w830px"> <div class="w890px">
<SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :OrderID='OrderID'/> <SaleOrderModule v-if="OrderSource==10&&SourceID&&OrderID" :SourceID='SourceID' :OrderID='OrderID'/>
<TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/> <TicketFinace v-if="OrderSource==4&&SourceID&&Callback&&ID" :SourceID='SourceID' :Callback='Callback' :id='ID'/>
<TicketingModule v-if="OrderSource==9&&FrID&&ID" :FrID='FrID' :id='ID'/> <TicketingModule v-if="OrderSource==9&&FrID&&ID" :FrID='FrID' :id='ID'/>
</div> </div>
<div class="_tit _tit2 w830px"> <div class="_tit _tit2 w890px">
<p> <p>
<span class="_text">审核流程</span> <span class="_text">审核流程</span>
<span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span> <span class="_btn" v-if="tableShow" @click="tableShow=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
...@@ -745,6 +746,7 @@ import myBill from "./FinancialSubmodule/BillModule.vue"; ...@@ -745,6 +746,7 @@ import myBill from "./FinancialSubmodule/BillModule.vue";
import myCBill from "./FinancialSubmodule/CashierBillModule.vue"; import myCBill from "./FinancialSubmodule/CashierBillModule.vue";
import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue"; import myrbvBill from "./FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialSubmodule/MergeBillModule.vue"; import myhrBill from "./FinancialSubmodule/MergeBillModule.vue";
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import teamProductModule from "../commonPage/teamProductModule.vue"; import teamProductModule from "../commonPage/teamProductModule.vue";
import TicketFinace from "../commonPage/TicketFinace.vue"; import TicketFinace from "../commonPage/TicketFinace.vue";
import SaleOrderModule from "../commonPage/SaleOrderModule.vue"; import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
...@@ -808,6 +810,7 @@ export default { ...@@ -808,6 +810,7 @@ export default {
'my-C-Bill': myCBill, 'my-C-Bill': myCBill,
'my-RVB-Bill':myrbvBill, 'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
"my-GZ-Bill": myGZBill,
'teamProductModule':teamProductModule, 'teamProductModule':teamProductModule,
'TicketingModule':TicketingModule, 'TicketingModule':TicketingModule,
'SaleOrderModule':SaleOrderModule, 'SaleOrderModule':SaleOrderModule,
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 300033c4
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</div> </div>
<div class="rb_top_row _r_mb5" v-if="isPrintPage"> <div class="rb_top_row _r_mb5" v-if="isPrintPage">
<p> <p>
<span class="">{{$t('fnc.v_tuanhao')}}： <span class="">{{$t('visa.v_tuanhao')}}：
<template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0"> <template v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0">
<span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}（{{o.TCID}}）</span> <span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" >{{o.TCNUM}}（{{o.TCID}}）</span>
</template> </template>
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 300033c4
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
</tr> </tr>
<tr v-else @keyup.enter="addList(2,daIn+1)"> <tr v-else @keyup.enter="addList(2,daIn+1)">
<td height="26px"> <td height="26px">
<el-select filterable v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)" class=" _border_b_1"> <el-select filterable v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-option v-for='item in GetCostTypeList' <el-option v-for='item in GetCostTypeList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -991,10 +991,14 @@ export default { ...@@ -991,10 +991,14 @@ export default {
} }
} }
}, },
getCostTypeName(i){ // 根据支出费用类型获取费用类型名称 列表展示用 getCostTypeName(i, t){ // 根据支出费用类型获取费用类型名称 列表展示用
this.GetCostTypeList.forEach(x=>{ this.GetCostTypeList.forEach(x=>{
if(x.ID == i){ if(x.ID == i){
this.detailList.CostTypeName = x.Name; if (t>=0) {
this.msg.detailList[t].CostTypeName = x.Name;
}else{
this.detailList.CostTypeName = x.Name;
}
} }
}) })
}, },
...@@ -1118,6 +1122,9 @@ export default { ...@@ -1118,6 +1122,9 @@ export default {
}) })
}) })
} }
if (this.orderObj && this.orderObj.CostType) {
this.getCostTypeName(this.detailList.CostTypeId)
}
} }
}, err => {}) }, err => {})
}, },
...@@ -1194,6 +1201,9 @@ export default { ...@@ -1194,6 +1201,9 @@ export default {
this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:''; this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0; this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0; this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
} }
if(data.VorcherInos){ if(data.VorcherInos){
data.VorcherInos.forEach(x=>{ data.VorcherInos.forEach(x=>{
...@@ -1204,6 +1214,9 @@ export default { ...@@ -1204,6 +1214,9 @@ export default {
if(this.msg.TCIDAndTCNUMList==null){ if(this.msg.TCIDAndTCNUMList==null){
this.msg.TCIDAndTCNUMList = []; this.msg.TCIDAndTCNUMList = [];
} }
if (this.orderObj && this.orderObj.CostType) {
this.Calculation(1)
}
this.msg.URL = this.$route.query.path; this.msg.URL = this.$route.query.path;
this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:''; this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
this.$forceUpdate(); this.$forceUpdate();
......
src/components/FinancialModule/addFinancialGZDocuments.vue 0 → 100644
View file @ 300033c4
This diff is collapsed.
src/components/FinancialModule/addFinancialProcess.vue
View file @ 300033c4
...@@ -319,6 +319,8 @@ ...@@ -319,6 +319,8 @@
<el-radio v-model="radio" v-else @change="getCostTypeList(1),CostIdS=[],accListShow=true" :label="1">{{$t('restaurant.res_income')}}</el-radio> <el-radio v-model="radio" v-else @change="getCostTypeList(1),CostIdS=[],accListShow=true" :label="1">{{$t('restaurant.res_income')}}</el-radio>
<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="2">{{$t('restaurant.res_outcome')}}</el-radio> <el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="2">{{$t('restaurant.res_outcome')}}</el-radio> <el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="2">{{$t('restaurant.res_outcome')}}</el-radio>
<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled" :label="7">{{$t('fnc.guazhang')}}</el-radio>
<el-radio v-model="radio" v-else @change="getCostTypeList(2),CostIdS=[],accListMsg=[],accListShow=false" :label="7">{{$t('fnc.guazhang')}}</el-radio>
</el-form-item> </el-form-item>
<el-form-item :label="$t('fnc.scfujian')"> <el-form-item :label="$t('fnc.scfujian')">
<el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio> <el-radio v-model="addMsg.IsUploadPic" :label="0">{{$t('fnc.buqiyong')}}</el-radio>
...@@ -402,7 +404,7 @@ ...@@ -402,7 +404,7 @@
</div> </div>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center> <el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible" center>
<div class="fl" style="width: 300px; margin: 0 20px;"> <div class="fl" style="width: 300px; margin: 0 20px;">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}： <el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText"> <p style="margin: 0 0 10px 0;">{{$t('fnc.xuanze')}}： <el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText">
</el-input> </el-input>
</p> </p>
<el-tree class='ApprovalProcessBg' <el-tree class='ApprovalProcessBg'
...@@ -430,7 +432,7 @@ ...@@ -430,7 +432,7 @@
</el-dialog> </el-dialog>
<el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible1" center> <el-dialog custom-class='w700' :title="dialogTitle" :visible.sync="outerVisible1" center>
<div class="fl" style="width: 300px; margin: 0 20px;"> <div class="fl" style="width: 300px; margin: 0 20px;">
<p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}： <el-input class='w200' :placeholder="$t('fnc.srgjzjxguolv')" v-model="filterText1"> <p style="margin: 0 0 10px 0;">{{$t('fnc.xzgangwei')}}： <el-input class='w200' :placeholder="$t('tips.srgjzjxguolv')" v-model="filterText1">
</el-input> </el-input>
</p> </p>
<el-tree class='ApprovalProcessBg' <el-tree class='ApprovalProcessBg'
...@@ -536,7 +538,7 @@ export default { ...@@ -536,7 +538,7 @@ export default {
}, },
{ {
id:5, id:5,
name: this.$t('fnc.kjiedian') name: this.$t('fnc.cnchuangkou')
}, },
{ {
id:6, id:6,
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 300033c4
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</tr> </tr>
<tr v-else @keyup.enter="addList(2,daIn+1)" style="border-right:none;"> <tr v-else @keyup.enter="addList(2,daIn+1)" style="border-right:none;">
<td height="26px"> <td height="26px">
<el-select filterable v-model='da.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(2,daIn+1)" class="w200 _border_b_1"> <el-select filterable v-model='da.CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),addList(2,daIn+1)" class="w200 _border_b_1">
<el-option v-for='item in GetCostTypeList' <el-option v-for='item in GetCostTypeList'
:label='item.Name' :label='item.Name'
:value='item.ID' :value='item.ID'
...@@ -1237,10 +1237,14 @@ export default { ...@@ -1237,10 +1237,14 @@ export default {
this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee); this.msg.BankList[0].Fee = parseFloat(this.msg.BankList[0].ybFee);
this.$forceUpdate(); this.$forceUpdate();
}, },
getCostTypeName(i){ // 根据支出费用类型获取费用类型名称 列表展示用 getCostTypeName(i, t){ // 根据支出费用类型获取费用类型名称 列表展示用
this.GetCostTypeList.forEach(x=>{ this.GetCostTypeList.forEach(x=>{
if(x.ID == i){ if(x.ID == i){
this.detailList.CostTypeName = x.Name; if (t>=0) {
this.msg.detailList[t].CostTypeName = x.Name;
}else{
this.detailList.CostTypeName = x.Name;
}
} }
}) })
}, },
......
src/components/FinancialModule/invoicesManager.vue 0 → 100644
View file @ 300033c4
<style>
.page_iisMg ._nav {
margin: 20px 0 0 0;
background-color: #f5f5f5;
}
.page_iisMg ._nav li {
float: left;
font-size: 14px;
color: #666666;
padding: 15px 20px;
cursor: pointer;
position: relative;
background-color: #f1f1f1;
margin-right: 5px;
}
.page_iisMg ._nav li._active {
background-color: #ffffff;
color: #333333;
}
.page_iisMg ._nav li._active::after {
content: "";
width: 20px;
height: 3px;
background-color: #e95252;
display: inline-block;
position: absolute;
bottom: 0;
left: 38%;
}
.page_iisMg .query-box {
padding-bottom: 0;
}
.page_iisMg .iis_info_box {
padding-top: 15px;
}
.page_iisMg .el-date-editor .el-range-separator {
width: 9% !important;
}
</style>
<template>
<div class="page_iisMg">
<ul class="_nav clearfix">
<li :class="active==1?'_active':''" @click="active=1,msg.Conditon=1,getPageList()">全部发票</li>
<li :class="active==2?'_active':''" @click="active=2,msg.Conditon=2,getPageList()">已开发票</li>
<li :class="active==3?'_active':''" @click="active=3,msg.Conditon=3,getPageList()">欠票发票</li>
</ul>
<div class="query-box">
<el-form class="iis_info_box clearfix" label-width="110px">
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item label="团号">
<el-input placeholder v-model="msg.TCID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="订单号">
<el-input placeholder v-model="msg.TCID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35" v-if="active !== 3">
<el-form-item label="单据状态">
<el-select v-model="msg.InvoiceApplyState" filterable>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option :value="1" label="申请中"></el-option>
<el-option :value="2" label="取消"></el-option>
<el-option :value="3" label="通过"></el-option>
<el-option :value="4" label="拒绝"></el-option>
<el-option :value="5" label="欠票"></el-option>
<el-option :value="6" label="发票追回"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="开票日期">
<el-date-picker
class="h34"
@change="timeAdd"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
<li>
<button
class="hollowFixedBtn"
@click="resetPageIndex(),getPageList()"
>{{$t('pub.searchBtn')}}</button>
<!-- <button
class="normalBtn"
@click="goUrlAdd('invoicesManagerAdd')"
>{{$t('pub.addBtn')}}</button> -->
</li>
</ul>
</div>
</div>
</template>
<script>
export default {
data() {
return {
active: 1,
msg: {
TCID: 0,
OrderId: 0,
AccountInfo: '',
ApplyMoney: 0,
AactualMoney: 0,
CompanyName: '',
DutyParagraph: '',
InvoiceApplyState: 0,
pageIndex: 1,
pageSize: 10
},
productionDate: []
};
},
methods: {
timeAdd() {
// 日期格式
if (!this.productionDate) {
this.msg.sTradeDate = "";
this.msg.eTradeDate = "";
return;
}
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
getPageList: function() {},
goUrlAdd: function (path) {
this.$router.push({
name: path,
query: { blank: "y",}
});
}
},
mounted() {}
};
</script>
src/components/FinancialModule/invoicesManagerAdd.vue 0 → 100644
View file @ 300033c4
<style scoped>
.page_iisMgadd {
width: 830px;
background-color: white;
padding: 10px;
}
.page_iisMgadd > p {
font-size: 18px;
text-align: center;
padding-bottom: 15px;
}
.page_iisMgadd .page_iisMgadd_table {
width: 100%;
font-size: 14px;
text-align: center;
}
.page_iisMgadd .page_iisMgadd_table td {
padding: 10px;
}
.page_iisMgadd .page_iisMgadd_table .page_iisMgadd_bank td._bank_td{
width: 679px;
}
.iis_save{
text-align: right;
padding: 10px 0 0 0;
}
.page_iisMgadd .page_iisMgadd_table tr td.text-align-left{
font-weight: 800;
}
</style>
<template>
<div class="page_iisMgadd">
<p>发票开具申请单</p>
<table
data-v-ca5157c2
border="1"
class="page_iisMgadd_table"
style="border-collapse: collapse;"
>
<tr>
<td width="130">部门</td>
<td>{{DepartName}}</td>
<td width="130">申请人</td>
<td>{{emName}}</td>
</tr>
<tr>
<td>开具金额</td>
<td>
<el-input placeholder v-model="msg.ApplyMoney"></el-input>
</td>
<td>到账金额</td>
<td>
<el-input placeholder v-model="msg.AactualMoney"></el-input>
</td>
</tr>
<tr class="page_iisMgadd_bank">
<td>到账银行</td>
<td colspan="3" class="_bank_td">
<el-select v-model="msg.AccountInfo" class="width100b">
<el-option v-for="(a, i) in accountList" :key="i" :value="a.ID" :label="a.allName"></el-option>
</el-select>
</td>
</tr>
<tr>
<td>申请日期</td>
<td>
{{new Date().Format('yyyy-MM-dd')}}
</td>
<td>到账日期</td>
<td>
{{new Date().Format('yyyy-MM-dd')}}
</td>
</tr>
<tr>
<td>团号</td>
<td colspan="3" class="w600 text-align-left">
{{msg.TCID}}
</td>
</tr>
<tr>
<td>平台ID</td>
<td colspan="3" class="w600 text-align-left">
{{msg.OrderId}}
</td>
</tr>
<tr>
<td rowspan="2">开具内容</td>
<td>公司名称</td>
<td colspan="2">
<el-input placeholder v-model="msg.CompanyName"></el-input>
</td>
</tr>
<tr>
<td>税号</td>
<td colspan="2">
<el-input placeholder v-model="msg.DutyParagraph"></el-input>
</td>
</tr>
<tr>
<td>备注</td>
<td colspan="3">
<el-input type="textarea" placeholder v-model="msg.Remarks"></el-input>
</td>
</tr>
</table>
<div class="iis_save">
<button class="normalBtn" @click="Addiis()">{{$t('fnc.tijiao')}}</button>
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg: {
TCID: 0,
OrderId: 0,
AccountInfo: '',
ApplyMoney: 0,
AactualMoney: 0,
CompanyName: '',
DutyParagraph: '',
InvoiceApplyState: 1
},
DepartName: "",
emName: "",
accountList: [],
};
},
methods: {
Addiis: function () {
if (this.msg.AccountInfo === '') return this.$message.error('请选择到账银行！')
if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称！')
if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号！')
this.apipost(
"InvoiceApply_get_SetInvoiceApply",
this.msg,
res => {
if (res.data.resultCode == 1) {
setTimeout(()=>{
this.$router.push({
name: 'invoicesManager'
});
},1000)
} else {
this.$message.error(res.data.message)
}
},
err => {}
);
},
getAccountList() {
//获取账户类型对应下的账户列表
this.apipost(
"FinancialInstitutions_post_GetALLAccountList",
{ TypeId: 3 },
res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = `${x.Alias}-${x.BackNo}`
});
this.accountList = data;
}
},
err => {}
);
}
},
mounted() {
let userInfo = this.getLocalStorage();
this.DepartName = userInfo.DepartName;
this.emName = userInfo.emName;
this.msg.OrderId = this.$route.query.OrderId;
this.msg.TCID = this.$route.query.TCID;
this.getAccountList();
}
};
</script>
src/components/FinancialModule/invoicesManagerDetail.vue 0 → 100644
View file @ 300033c4
<style scoped>
</style>
<template>
<div class="page_iisMgdetail">
</div>
</template>
<script>
export default {
data() {
return {
msg: {
TCID: 0,
OrderId: 0,
AccountInfo: 0,
ApplyMoney: 0,
AactualMoney: 0,
CompanyName: 0,
DutyParagraph: 0,
InvoiceApplyState: 0,
},
};
},
methods: {
},
mounted() {}
};
</script>
src/components/PrintPage.vue
View file @ 300033c4
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<template v-loading="loading"> <template v-loading="loading">
<div class="_PrintPage"> <div class="_PrintPage">
<div class="_PrintPage_box"> <div class="_PrintPage_box">
<template v-if="type!=='1'&&(Merge==='0'||Merge===null)"> <template v-if="type==='2'&&(Merge==='0'||Merge===null)">
<div class="_border_1" v-for="(item,index) in loopNumT"> <div class="_border_1" v-for="(item,index) in loopNumT">
<my-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill> <my-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-Bill>
</div> </div>
...@@ -29,6 +29,11 @@ ...@@ -29,6 +29,11 @@
<my-RVB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill> <my-RVB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
</div> </div>
</template> </template>
<template v-if="type==='7'&&(Merge==='0'||Merge===null)">
<div class="_border_1" v-for="(item,index) in loopNumT">
<my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>
</div>
</template>
<template v-if="Merge==='1'"> <template v-if="Merge==='1'">
<div class="_border_1" v-for="(item,index) in loopNumN"> <div class="_border_1" v-for="(item,index) in loopNumN">
<my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill> <my-HB-Bill v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :name='index+1'></my-HB-Bill>
...@@ -41,6 +46,7 @@ ...@@ -41,6 +46,7 @@
import myBill from "./FinancialModule/FinancialSubmodule/BillModule.vue"; import myBill from "./FinancialModule/FinancialSubmodule/BillModule.vue";
import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModule.vue"; import myrbvBill from "./FinancialModule/FinancialSubmodule/ReceivablesModule.vue";
import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModule.vue"; import myhrBill from "./FinancialModule/FinancialSubmodule/MergeBillModule.vue";
import myGZBill from "./FinancialModule/FinancialSubmodule/GZBillModule.vue";
export default { export default {
data(){ data(){
return{ return{
...@@ -60,6 +66,7 @@ export default { ...@@ -60,6 +66,7 @@ export default {
'my-Bill': myBill, 'my-Bill': myBill,
'my-RVB-Bill':myrbvBill, 'my-RVB-Bill':myrbvBill,
'my-HB-Bill':myhrBill, 'my-HB-Bill':myhrBill,
'my-GZ-Bill': myGZBill
},methods:{ },methods:{
numAdd(){ numAdd(){
alert(111) alert(111)
......
src/components/confirmationOrderDownLoad.vue
View file @ 300033c4
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
.confirmOrder{ .confirmOrder{
width:950px; width:950px;
} }
.travelControlTrip .hangban-info tr td,.travelControlTrip .hangban-info tr th{
padding-left: 0 !important;
}
</style> </style>
<template> <template>
......
src/components/dmc/manager/teamReimbursement.vue
View file @ 300033c4
...@@ -382,9 +382,9 @@ ...@@ -382,9 +382,9 @@
<td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3"> <td width="240" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
<div class="d7"> <div class="d7">
<el-button-group> <el-button-group>
<el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button> <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">用款计划</el-button>
<!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 --> <!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
<el-button v-show="outItem.TravelPriceList.LeaderApplyStatus==1" @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 <el-button v-show="outItem.ReaultPlanState==1" @click.native="goUrl('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
</el-button> </el-button>
</el-button-group> </el-button-group>
......
src/components/leaderPay2.vue
View file @ 300033c4
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
width:1000px; width:1000px;
margin:0 auto; margin:0 auto;
} }
.LeaderPrintDiv .childDiv ._Titles{
font-size: 14px;
}
.wLeader2 .el-textarea__inner{ .wLeader2 .el-textarea__inner{
height:130px; height:130px;
} }
...@@ -69,25 +72,29 @@ ...@@ -69,25 +72,29 @@
<div class="childDiv"> <div class="childDiv">
<table border="0" cellspacing='1' class="leaderPayTable"> <table border="0" cellspacing='1' class="leaderPayTable">
<tr> <tr>
<th width="110">出发地</th> <th width="130">团号</th>
<th width="290">行程名称</th> <th width="250">行程名称</th>
<th width="13%">团号</th> <th width="110">出发时间</th>
<th width="13%">出发时间</th> <th width="90">行程天数</th>
<th width="8%">天数</th> <th width="90">成人</th>
<th width="8%">出团人数</th> <th width="90">占床小孩</th>
<th width="8%">领队</th> <th width="90">不占床小孩</th>
<th width="8%">导游</th> <th width="90">婴儿人数</th>
<th width="110">人数</th>
<th width="110">领队</th>
</tr> </tr>
<tr v-for="item in nav"> <tr v-for="item in nav">
<td>{{item.StartCityNames}}</td> <td>{{item.NewCombinationNum}}</td>
<td class="_Titles">{{item.Titles}}</td>
<td> <td>
<div class="LeaderTitle">{{item.Titles}}</div> {{item.StartDateStr}}
</td> </td>
<td>{{item.TCNUMS}}</td> <td>{{item.DayNum}}</td>
<td>{{item.FlightDate}}</td> <td>{{item.CommonReport.HouseStatistics.ManNum}}人</td>
<td>{{item.DayNum}}天</td> <td>{{item.CommonReport.HouseStatistics.NeedBed}}人</td>
<td>{{item.TotalSeat}}人</td> <td>{{item.CommonReport.HouseStatistics.NoNeedBed}}人</td>
<td>{{item.LeaderName}}</td> <td>{{item.CommonReport.HouseStatistics.BabyNum}}人</td>
<td>{{item.CommonReport.HouseStatistics.RealityNum}}人</td>
<td>{{item.GuideName}}</td> <td>{{item.GuideName}}</td>
</tr> </tr>
</table> </table>
...@@ -223,7 +230,25 @@ ...@@ -223,7 +230,25 @@
<td>{{totalHotelPrice}}</td> <td>{{totalHotelPrice}}</td>
</tr> </tr>
</table> </table>
<el-input type="textarea" v-show="dataList.LeaderApply.Status==1" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/> <table border="0" cellspacing='1' class="leaderPayTable" v-if="TotalPriceData.length>0">
<tr>
<th>币种</th>
<th>预付合计</th>
<th>实际领款</th>
<th>实付合计</th>
<th>领队退款</th>
</tr>
<tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
<td>{{item.CurrencyStr}}</td>
<td>{{item.PlanPrice}}</td>
<td>{{item.PlanTotalPrice}}</td>
<td>{{item.ExpendTotalPrice}}</td>
<td>{{item.PlanTotalPrice - item.ExpendTotalPrice}}</td>
</tr>
</table>
<template v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1">
<el-input type="textarea" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
</template>
<div class="btnListDiv" > <div class="btnListDiv" >
<input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/> <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
<input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/> <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
...@@ -256,6 +281,7 @@ export default { ...@@ -256,6 +281,7 @@ export default {
totalList:[], totalList:[],
isShowRemark:false, isShowRemark:false,
TotalPriceData: [],
} }
}, },
methods: { methods: {
...@@ -287,7 +313,7 @@ export default { ...@@ -287,7 +313,7 @@ export default {
}, },
//获取顶部数据 //获取顶部数据
getNav() { getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', { this.apipost('dmcstatistics_post_GetNewStaticsByTCIDs', {
TCIDs: this.$route.query.id TCIDs: this.$route.query.id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -297,6 +323,18 @@ export default { ...@@ -297,6 +323,18 @@ export default {
} }
}, err => {}) }, err => {})
}, },
// 获取总金额
getTotalPrice: function(){
this.apipost('dmcstatistics_post_GetNewTotalPrice', {
TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
this.TotalPriceData = res.data.data;
} else {
this.Error(res.data.message)
}
}, err => {})
},
//获取总额 //获取总额
getTotal(obj) { getTotal(obj) {
let totalPrice = 0 let totalPrice = 0
...@@ -348,6 +386,7 @@ export default { ...@@ -348,6 +386,7 @@ export default {
this.getNav(); this.getNav();
this.getList(); this.getList();
this.getTotalMoney(); this.getTotalMoney();
}, this.getTotalPrice();
},
} }
</script> </script>
src/plug/index.js
View file @ 300033c4
...@@ -117,8 +117,8 @@ export default { ...@@ -117,8 +117,8 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.65:8025"; //214主域名 domainUrl = "http://192.168.2.65:8025"; //214主域名
domainUrl = "http://192.168.2.214:8082"; //214主域名 // domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082"; // domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.16:8083"; // domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
......
src/router/config.js
View file @ 300033c4
...@@ -2265,7 +2265,7 @@ export default { ...@@ -2265,7 +2265,7 @@ export default {
name: 'FinancialAccounting', name: 'FinancialAccounting',
component: resolve => require(['@/components/FinancialModule/FinancialAccounting'], resolve), component: resolve => require(['@/components/FinancialModule/FinancialAccounting'], resolve),
meta: { meta: {
title: '我的财务单据' title: '财务挂账单据'
}, },
}, { //财务 发票管理 }, { //财务 发票管理
path: '/invoicesManager', path: '/invoicesManager',
...@@ -2433,7 +2433,7 @@ export default { ...@@ -2433,7 +2433,7 @@ export default {
name: 'addFinancialGZDocuments', name: 'addFinancialGZDocuments',
component: resolve => require(['@/components/FinancialModule/addFinancialGZDocuments'], resolve), component: resolve => require(['@/components/FinancialModule/addFinancialGZDocuments'], resolve),
meta: { meta: {
title: '新增收款单据' title: '新增挂账单据'
}, },
}, { //财务 流程列表 }, { //财务 流程列表
path: '/ProcessList', path: '/ProcessList',
......
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