Skip to content

S
SuperMan
Commit 44f6215b authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent dccdafec
Hide whitespace changes
Inline Side-by-side
Showing with 204 additions and 5 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ 44f6215b
......@@ -802,14 +802,19 @@
<button class="hollowFixedBtn" v-if="BOSSBtn3" @click="BOSSBtnClick(3)">{{$t('ground.dayin')}}</button>
</template>
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604">
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604 || ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown width:100px>
<span class="el-dropdown-link">
更多<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
<template v-if="this.userId==2739 || this.userId==3038 || this.userId==2604">
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
</template>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
</template>
</el-dropdown-menu>
</el-dropdown>
</template>
......@@ -1957,6 +1962,60 @@
</div>
</el-dialog>
<el-dialog title="机票今日付款查询" width="1060px" height="800px" :visible.sync="airPayState" :close-on-click-modal="false" center>
<el-form class="cdForm" label-width="80px">
<el-form-item label="付款日期" prop="picPayDate">
<el-date-picker class="h34" v-model="picPayDate" type="daterange"
value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
<el-form-item>
<input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="getAirPayList()">
<input type="button" :value="$t('visa.v_daochu')" class="hollowFixedBtn" @click="downloadAirPayData()">
</el-form-item>
</el-form>
<div style="height:500px">
<p>待付合计：{{waitAirTotal}}</p>
<p>已付合计：{{payAirTotal}}</p>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="MarkLoading" >
<tr>
<th>{{$t('fnc.danhao')}}</th>
<th>{{$t('sm.company')}}</th>
<th>{{$t('fnc.feiyongleixing')}}</th>
<th>付款批次</th>
<th>{{$t('fnc.jine')}}</th>
<th>{{$t('fnc.fkduixiang')}}</th>
<th>备注</th>
<th>{{$t('fnc.zhidanren')}}</th>
<th>{{$t('fnc.a_djztai')}}</th>
<th>是否付款</th>
<th>付款日期</th>
<th>会计</th>
</tr>
<tr v-for="(item,index) in picPayData" :key="index">
<td><span @click="goUrl('FinancialDocumentsDetail',item.FrID,1,1)" style="cursor: pointer; color:blur">{{item.FrID}}</span></td>
<td>{{item.RB_BranchName}}</td>
<td>{{item.CostTypeIdStr}}</td>
<td>{{item.TicketNum}}</td>
<td>{{item.WBMoney+" " + item.CurrencyName}}</td>
<td style="max-width: 120px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.RemitterName}}</td>
<td style="max-width: 150px;overflow: hidden; text-overflow: ellipsis;white-space: nowrap;">{{item.AuditDescription}}</td>
<td>{{item.CreateBy}}{{item.CreateDate}}</td>
<td>{{item.StatusName}}</td>
<td :style="item.Is_Cashier==1?'color:red':''">{{(item.Is_Cashier==1?'√':'')}}</td>
<td>{{item.PayDate}}</td>
<td>{{item.FinanceName}}</td>
</tr>
<tr v-if="picPayTotal">
<td colspan='4'>{{$t('fnc.a_heji')}}</td>
<td>{{picPayTotal}}</td>
</tr>
<tr v-if="picPayData.length==0">
<td colspan="13">{{$t('system.content_noData')}}</td>
</tr>
</table>
</div>
</el-dialog>
<!-- 修改汇率
<el-dialog :title="$t('objFill.modifytheexchangerate')" width="400px"
:visible.sync="costmodeHL" center >
......@@ -2242,6 +2301,7 @@
imgLength: 0,
//工资单附件结束
picPayState: false,
airPayState: false,
picPayDate:[],
picMsg:{
pageIndex: 1,
......@@ -2252,7 +2312,9 @@
EmployeeId:0
},
picPayData:[],
picPayTotal:0
picPayTotal:0,
payAirTotal:0,
waitAirTotal:0
};
},
created() {
......@@ -2832,6 +2894,31 @@
null
);
},
openAirPayDialog(){
this.airPayState = true;
this.picPayData = [];
this.picMsg.QEndDate= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
this.picMsg.QStartDate =this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
this.picPayDate = [this.picMsg.QStartDate,this.picMsg.QEndDate];
this.getAirPayList();
},
getAirPayList() {
this.picMsg.QEndDate= this.picPayDate[1];
this.picMsg.QStartDate =this.picPayDate[0];
this.MarkLoading = true
this.apipost(
"Financial_post_GetAirTicketPayDatePageList", this.picMsg,res => {
this.MarkLoading = false
if (res.data.resultCode === 1) {
this.picPayData = res.data.data.list.pageData;
this.picPayTotal = res.data.data.TotalMoney;
this.payAirTotal = res.data.data.PayMoney;
this.waitAirTotal = res.data.data.WaitMoney;
}
},
null
);
},
goUrlZD(item) {
let that = this;
let yfcheckList
......@@ -3001,6 +3088,12 @@
this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
this.GetLocalFile("Financial_post_GetPICPayDateListToExcel", this.picMsg, "今日付款" +this.picMsg.QEndDate+".xls");
},
downloadAirPayData() {
this.picMsg.QEndDate= this.picPayDate[1];
this.picMsg.QStartDate =this.picPayDate[0];
this.picMsg.EmployeeId = this.getLocalStorage().EmployeeId
this.GetLocalFile("Financial_post_GetAirTicketPayDateListToExcel", this.picMsg, "机票今日付款" +this.picMsg.QEndDate+".xls");
},
HebingSPLast() {
if (this.checkList.length == 0) {
this.Error(this.$t('fnc.a_qxzdanju'));
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 44f6215b
......@@ -628,7 +628,8 @@
<div class="recpayQueryMore" v-if="(scope.row.Type==1||scope.row.Type==2)&& IsUpdatePayment" @click="showHelpBranch(scope.row)">{{scope.row.Type==1?$t('objFill.xiugaibdsgs'):(scope.row.Type==2?$t('objFill.xiugaibdfgs'):'')}}</div>
<div class="recpayQueryMore" v-if="scope.row.Type==2 && scope.row.CostTypeList && scope.row.CostTypeList[0]=='固定资产-车辆'" @click="showAssets(scope.row.FrID)">{{$t('objFill.v101.FinancialModule.shezzjrq')}}</div>
<div class="recpayQueryMore" v-if="scope.row.KingdeeMark!=1&&IsUpdatePayment" @click="EditKingdeeMark(scope.row)">标记金蝶已导入</div>
<div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div>
<div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId!=2" @click="showPICPayDateDialog(scope.row)">修改预付款日</div>
<div class="recpayQueryMore" v-if="Finance_ExpenseType==true && scope.row.Type==2 && scope.row.TemplateId==2" @click="showAirPayDateDialog(scope.row)">修改机票付款日</div>
<i slot="reference" style="width: 30px;
height: 30px;
display: inline-block;
......@@ -953,6 +954,23 @@
<el-button class="normalBtn" type="primary" @click="setPICPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<!--修改机票付款日-->
<el-dialog title="修改PIC预付款日期" width="400px" :visible.sync="showAirPayDate" center >
<el-form class="cdForm" label-width="110px">
<el-form-item label="预付款日" prop="CreateDate">
<el-date-picker
v-model="FixedAssetsMsg.CreateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="showAirPayDate=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="setAirPayDate" :loading="transTax.loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1134,6 +1152,7 @@
ShowFixedAssets: false,
showUpdateCreate:false,
showPICPayDate:false,
showAirPayDate:false,
FixedAssetsMsg:{
BaseFinanceId:0,
RelevanceFrId2:0,
......@@ -1471,6 +1490,11 @@
this.FixedAssetsMsg.CreateDate= item.PICPayDate;
this.showPICPayDate=true;
},
showAirPayDateDialog(item){
this.FixedAssetsMsg.BaseFinanceId = item.FrID;
this.FixedAssetsMsg.CreateDate= item.PICPayDate;
this.showAirPayDate=true;
},
// 确定垫付对象
setFixedAssets() {
if (this.transTax.loading) return;
......@@ -1538,6 +1562,30 @@
this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
}
},
setAirPayDate(){
if (this.transTax.loading) return;
this.transTax.loading = true;
if (this.FixedAssetsMsg.BaseFinanceId && this.FixedAssetsMsg.CreateDate) {
this.apipost(
"Financial_post_SetPICPayDate", {BaseFinanceId:this.FixedAssetsMsg.BaseFinanceId,CreateDate:this.FixedAssetsMsg.CreateDate,Type:23},res => {
if (res.data.resultCode == 1) {
this.Success(this.$t('objFill.v101.FinancialModule.gengxincg')) ;
this.showAirPayDate = false;
this.getPageList()
}else{
this.Error(res.data.message);
}
this.transTax.loading = false;
},
err => {
this.transTax.loading = false;
}
);
} else {
this.transTax.loading = false;
this.Error(this.$t('objFill.v101.FinancialModule.qingxzxzdrq')) ;
}
},
showHelpBranch(item) {
//弹出付款对象修改
this.HelpBranchMsg.FrId = item.FrID;
......
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 44f6215b
......@@ -250,6 +250,28 @@
</div>
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="GetDetail.TemplateId==2&&IsAdminOrFinance">
<div class="border-b">
</div>
<div v-if="IsEditAirPayDate==false">
<el-tooltip class="item" effect="dark" content="用于机票每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
{{picMsg.CreateDate}}
<el-tooltip effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i class="edit el-icon-edit" @click="IsEditAirPayDate=true"></i>
</el-tooltip>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<el-tooltip effect="dark" content="删除" placement="top">
<i v-if="picMsg.CreateDate!=null && picMsg.CreateDate!=''" class="edit el-icon-delete" @click="DelAirPayDate()"></i>
</el-tooltip>
</div>
<div v-else>
<el-tooltip class="item" effect="dark" content="用于PIC每日查看可付款单据" placement="top"><span>预付款日：</span></el-tooltip>
<div>
<el-date-picker v-model="picMsg.CreateDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"></el-date-picker>
<el-button size="mini" type="success" icon="el-icon-check" circle @click="SaveAirPayDate()"></el-button>
</div>
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0">
<div v-if="clientBankAccountData.AccountCreateTime" class="border-b">
</div>
......@@ -429,6 +451,7 @@
return {
IsEditTravelRemark:false,
IsEditPICPayDate:false,
IsEditAirPayDate:false,
// clientBankAccountData: {},
tableData: [],
msg:{
......@@ -445,6 +468,7 @@
activeIndx: null,
FDList: [],
IsExpensesMonthlyShare:false,
IsAdminOrFinance:false,
saveMsg: {
FrId: 0,
Remark: '',
......@@ -493,6 +517,9 @@
if (ActionMenuCode.indexOf('Finance_Inner') != -1) {
this.isFinance_ExpenseType=true;
}
if(ActionMenuCode.indexOf('isManageFinance') != -1 || ActionMenuCode.indexOf('Finance_ExpenseType') != -1){
this.IsAdminOrFinance=true;
}
this.picMsg.BaseFinanceId = this.GetDetail.FrID
this.picMsg.CreateDate = this.GetDetail.PICPayDate
......@@ -713,6 +740,37 @@
}, err => {})
}).catch(() => {
});
},
SaveAirPayDate(){
this.picMsg.Type=23;
this.apipost('Financial_post_SetPICPayDate', this.picMsg, res => {
if (res.data.resultCode == 1) {
this.IsEditAirPayDate=false;
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
DelAirPayDate(){
this.$confirm("确认要删除机票付款日期吗？", this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.yes'),
cancelButtonText: this.$t('pub.no'),
type: 'warning'
}).then(() => {
this.picMsg.Type=23;
this.apipost('Financial_post_CancelPICPayDate', this.picMsg, res => {
if (res.data.resultCode == 1) {
this.picMsg.CreateDate ='';
this.IsEditAirPayDate=false;
this.$message.success(res.data.message);
} else {
this.$message.error(res.data.message);
}
}, err => {})
}).catch(() => {
});
}
},
......
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