Skip to content

S
SuperMan
Commit e1db0733 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent a8694d51
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 13 deletions
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ e1db0733
......@@ -123,7 +123,12 @@
// 手配费 收款单参数Handmsg
if(this.$route.query.Handmsg){
this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"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 if(this.$route.query.czmsg){
let Handmsg=this.$route.query.czmsg;
this.$router.push({ name: "addReceivablesDocuments",query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"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: "addReceivablesDocuments",query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"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:'新增收款单'}})
......
src/components/leaderPay2.vue
View file @ e1db0733
......@@ -853,6 +853,47 @@
<td colspan="5">暂无数据</td>
</tr>
</table>
<!-- 财务单据 -->
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th colspan="10">财务收据
</th>
</tr>
<tr>
<th>ID</th>
<th>团号</th>
<th>账户类型</th>
<th>账户名称</th>
<th>收据金额</th>
<th>汇率</th>
<th>原币</th>
<th>收据日期</th>
<th>财务单据</th>
<th>操作</th>
</tr>
<tr v-for="(item,index) in dataDocList" :key="index">
<td>{{item.Id}}</td>
<td>{{item.TCNUM}}（{{item.TCID}}）</td>
<td>
<span v-if="item.Type==1">银行</span>
<span v-if="item.Type==2">平台</span>
<span v-if="item.Type==3">现金</span>
<span v-if="item.Type==4">资金池</span>
</td>
<td>{{item.AccountName}}</td>
<td>{{item.Money}}</td>
<td>{{item.Rate}}</td>
<td>{{item.WBMoney}}</td>
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
<td>
<input style="margin-top:15px" v-if="item.FinanceId==0" type="button" value="收据退款制单" class="leader2Btn" @click="gofzZd2(item)">
</td>
</tr>
<tr v-if="dataDocList.length==0">
<td colspan="12">暂无数据</td>
</tr>
</table>
<table border="0" cellspacing="1" class="leaderPayTable" v-if="listCost.length>0">
<tr>
<th>人头费</th>
......@@ -1176,6 +1217,44 @@
<button class="normalBtn" type="primary" @click="goUrlfk">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-dialog title="收据退款制单" width="860px" :visible.sync="cdState2" center>
<el-form class="cdForm" label-width="90px">
<el-form-item label="单号" prop="FinanceId">
<el-input class="w220" @keyup.native="checkInteger(fzMsg,'FinanceId')" v-model="fzMsg.FinanceId"></el-input>
</el-form-item>
<el-form-item>
<input type="button" value="查询" class="leader2Btn" @click="fzgetList">
</el-form-item>
</el-form>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th></th>
<th>费用类型</th>
<th>原币</th>
<th>汇率</th>
<th>本位币</th>
<th>备注</th>
</tr>
<tr v-for="(item,index) in fzList" :key="index">
<td><input type="checkbox" :value="item" v-model="checkList2" @change="ckeckOne2"></td>
<td>{{item.CostTypeName}}</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>{{item.Remark}}</td>
</tr>
<tr v-if="fzList.length==0">
<td colspan="12">暂无数据</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="cdState2=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="goUrlfk2">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -1280,9 +1359,84 @@
},
fzList:[],
fzObj:{},
dataDocList:[],
fzObj2:{},
fkZDmsg2:{
OtherType:10,
ReFinanceId:0,
Rate:0,
TCNUM:'',
noEditRate:true,
ReFinanceId2:0,
},
checkList2:[],
cdState2:false,
};
},
methods: {
goUrlfk2(){
let obj=this.fzObj2;
let that=this;
let checkList=JSON.parse(JSON.stringify(this.checkList2))
if(this.checkList2.length>1){
this.Error("只能选择一项！");
return;
}
if(this.checkList2.length==0){
this.Error("至少选择一项");
return;
}
let arr=[];
that.fkZDmsg2. ReFinanceId2=this.checkList2[0].FinanceId;
that.fkZDmsg2.Rate=this.checkList2[0].Rate;
var msg=JSON.stringify(that.fkZDmsg2);
let id = [];
if (obj.LineId == this.LineId) {
id = [75]
} else {
id = [59, 63, 78];
}
let TCIDARR = [obj.TCID];
let orderObj = {
OrderID: 0,
OrderSource: 8,
Obj: {},
SourceID: 0,
CostType: 57,
TCIDList: TCIDARR,
Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUM
};
console.log("orderObj",orderObj)
let fullPath =
`/ChoiceAddFinancialDocuments?searchTitle=报账&czmsg=${msg}&Type=${2}&templateID=${JSON.stringify(id)}&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
ckeckOne2(){
if(this.checkList2.length==2){
this.checkList2.splice(0,1);
}
if(this.checkList2.length>1){
this.Error("只能选择一项！");
}
},
gofzZd2(item){
this.cdState2=true;
this.fkZDmsg2.TCNUM=item.TCID;
this.fkZDmsg2.ReFinanceId=item.Id;
this.checkList2=[];
this.fzObj2=item;
console.log("this.fzObj2",this.fzObj2)
},
goUrlfk(){
let obj=this.fzObj;
let that=this;
......@@ -1298,21 +1452,9 @@
}
let arr=[];
// var TCArr = [this.fkZDmsg.TCNUM];
// let orderObj = {
// OrderID: 0,
// OrderSource: 8,
// Obj: {},
// TCIDList: TCArr
// }
that.fkZDmsg.ReFinanceId=this.checkList1[0].FinanceId;
that.fkZDmsg.Rate=this.checkList1[0].Rate;
var msg=JSON.stringify(that.fkZDmsg);
// let routeData = this.$router.resolve({
// name: 'ChoiceAddFinancialDocuments',
// query: {czmsg:msg,'orderObj': JSON.stringify(orderObj),companyID: this.OutBranchId,Type: 2,searchTitle:'报账'}
// })
// window.open(routeData.href, '_blank')
let id = [];
if (obj.LineId == this.LineId) {
......@@ -1833,6 +1975,11 @@
});
this.TotalNav = TotalNav;
console.log("this.TotalNav",this.TotalNav)
this.dataDocList=[];
this.TotalNav.forEach(item=>{
this.getDataDoc(item.TCNUMS,item.OutBranchId);
})
this.listCost = listCost;
if(Tcnums!=''){
......@@ -1847,6 +1994,32 @@
err => {}
);
},
getDataDoc(Tcnums,OutBranchId){
let obj={
pageIndex:1,
pageSize:999,
TCNUM:Tcnums,
FinanceId:0,
AccountId:-1,
Type:3,
StartTime:'',
EndTime:'',
};
this.apipost('Financial_get_GetFinanceReceiptPageList',obj,res=>{
if(res.data.resultCode==1){
let data=res.data.data.pageData;
console.log("res",data);
data.forEach(item=>{
item.OutBranchId=OutBranchId;
this.dataDocList.push(item)
})
console.log("this.dataDocList",this.dataDocList)
}else{
this.$message.error(res.data.message);
}
},err=>{})
},
//获取数据
getList() {
this.loading = true;
......
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