Skip to content

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

update

parent feff7635
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 1 deletion
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ aa0b669c
......@@ -130,7 +130,7 @@
}
}else if(this.active==2){
// 领队报账 预付款冲抵
// 领队报账 预付款冲抵 返款制单
if(this.$route.query.czmsg){
this.$router.push({ name: path,query:{"czmsg":this.czmsg,"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/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @ aa0b669c
......@@ -85,6 +85,41 @@
</table>
</div>
</div>
<div v-if="LeaderRefundDetailList && LeaderRefundDetailList.length>0">
<div class="_tit">
<span class="_text">领队领款单据</span>
<div>
<span class="_btn" v-if="tableShow1" @click="tableShow2=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShow2=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</div>
</div>
<div v-show="tableShow2" class="sanjiao-box _padding_20_15">
<table border="1" class="czBillModule _border_color_b Receipt_table" bordercolor="#c94052" style="border-collapse:collapse;width: 100%;" v-loading='loading'>
<tr>
<th>单号</th>
<th>公司</th>
<th>费用类型</th>
<th>原币</th>
<th>汇率</th>
<th>本位币</th>
<th>备注</th>
<th>制单人</th>
</tr>
<tr class="_color_b" v-for="(item,index) in LeaderRefundDetailList" :key="index">
<td class="hover_text" @click="goDetail(item.FinanceId)" ><span>{{item.FinanceId}}</span></td>
<td>{{item.BName}}</td>
<td>{{item.CostTypeName}}</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.Rate}}</td>
<td>{{item.Money}}</td>
<td>{{item.Remark}}</td>
<td>{{item.EmName}}</td>
</tr>
</table>
</div>
</div>
</div>
</template>
......@@ -95,6 +130,7 @@ export default {
return{
tableShow: true,
tableShow1: true,
tableShow2: true,
tit: '',
details: [],
loading: true,
......@@ -105,6 +141,7 @@ export default {
ReFinanceId:0,
IsAdvanceFinance:-1,
cdtotal:0,
LeaderRefundDetailList:[],
}
},watch:{
......@@ -123,6 +160,8 @@ export default {
this.loading = false
if (res.data.resultCode == 1) {
let data=res.data.data;
console.log("data",data)
this.LeaderRefundDetailList=data.LeaderRefundDetailList;
this.OtherType=data.OtherType;
this.ReFinanceId=data.ReFinanceId;
this.IsAdvanceFinance=data.IsAdvanceFinance;
......
src/components/leaderPay2.vue
View file @ aa0b669c
......@@ -845,6 +845,7 @@
<input v-if="TimeXiao" type="button" value="制单" class="leader2Btn" @click="goZhiDan(item)">
<input v-else-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type="button" value="制单" class="leader2Btn" @click="goZhiDan(item)">
<input style="margin-top:15px" v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2" type="button" value="返款制单" class="leader2Btn" @click="gofzZd(item)">
</td>
</tr>
......@@ -1138,12 +1139,50 @@
<button class="normalBtn" type="primary" @click="goUrlZD">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
<el-dialog title="返款制单" width="860px" :visible.sync="cdState1" 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="checkList1" @change="ckeckOne1"></td>
<td>{{item.Money}}</td>
<td>{{item.OriginalMoney}}</td>
<td>{{item.CostTypeName}}</td>
<td>{{item.Rate}}</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="cdState1=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="goUrlfk">{{$t('pub.sureBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
czdateList:[],
czMsg:{
pageIndex:1,
......@@ -1227,9 +1266,72 @@
UserId:0,
OutBranchId:'',
EditBtn: false,
fkZDmsg:{
OtherType:8,
ReFinanceId:0,
Rate:0,
TCNUM:'',
noEditRate:true
},
checkList1:[],
cdState1:false,
fzMsg:{
FinanceId:'',
},
fzList:[],
};
},
methods: {
goUrlfk(){
let that=this;
let checkList=JSON.parse(JSON.stringify(this.checkList1))
if(this.checkList1.length>1){
this.Error("只能选择一项！");
return;
}
if(this.checkList1.length==0){
this.Error("至少选择一项");
return;
}
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}
})
window.open(routeData.href, '_blank')
},
ckeckOne1(){
if(this.checkList1.length==2){
this.checkList1.splice(0,1);
}
if(this.checkList1.length>1){
this.Error("只能选择一项！");
}
},
gofzZd(item){
this.cdState1=true;
this.fkZDmsg.TCNUM=item.TCIDS;
this.checkList1=[];
},
fzgetList(){
this.apipost("Financial_get_GetFinanceRate", this.fzMsg, res => {
if (res.data.resultCode === 1) {
this.fzList = res.data.data;
}
}, null)
},
GetAuth() {
var actionCode = this.$AuthCode.LeaderAudit;
this.CheckUserAuth(actionCode, res => {
......@@ -2142,6 +2244,7 @@
this.getzhuijiaList()
this.getCostTypeList();
this.czgetList();
}
};
......
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