Skip to content

S
SuperMan
Commit 2644d87f authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 804dcd76 88d7dce0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 718 additions and 370 deletions
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 2644d87f
......@@ -89,11 +89,10 @@
padding: 0 !important;
}
/deep/.page_CompanyAccDetail .el-table .el-table__cell {
padding: 0 12px!important;
padding: 0 3px!important;
}
.cm_content{
width: 100%;
height: 600px;
}
.BalanceBox{
......@@ -111,13 +110,20 @@
right: 0;
top: 0;
bottom: 0;
width: 479px;
width: 330px;
background: #fff;
z-index: 2;
}
/deep/.page_CompanyAccDetail .el-table__row.hover-row .BalanceListBox{
background: #F5F7FA;
}
/deep/.page_CompanyAccDetail .el-table th.el-table__cell>.cell{
/* font-size: 13px; */
}
/deep/.page_CompanyAccDetail .el-table .cell{
padding-left: 0;
padding-right: 0;
}
</style>
<template>
......@@ -188,7 +194,7 @@
</div>
<div class="cm_content">
<el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600"
style="width: 100%;"
v-loading="loadingTable"
:span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }"
......@@ -211,7 +217,7 @@
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangshouru')" width="83" align="center">
<template slot-scope="scope">
<div>
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" class="textnowrap">
......@@ -230,7 +236,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.danjusr')" width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.danjusr')" width="83" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox"
......@@ -239,14 +245,14 @@
</div>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.yinhangzhichu')" width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.yinhangzhichu')" width="83" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5">
{{ scope.row.BalanceList[index].Expenses }}
</div>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.v103.danjuzc')" width="120" align="center">
<el-table-column prop="" :label="$t('objFill.v103.danjuzc')" width="83" align="center">
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox"
......@@ -258,9 +264,9 @@
</el-table-column>
</el-table-column>
</template>
</el-table>
</div>
<div style="height:30px"></div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
<addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
<BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
......@@ -330,7 +336,7 @@ export default {
},
created(){
let mon1= this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(2, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
let mon2= this.getBeforeDate(4, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
// let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7)
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 2644d87f
......@@ -978,7 +978,7 @@
<td @click="gotoTravelList(o)" v-if="GetDetail.CreateBy!=userInfo.EmployeeId"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && GetDetail.CreateBy!=userInfo.EmployeeId"
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && (GetDetail.CreateBy!=userInfo.EmployeeId || ActionMenuCode.indexOf('S_Travel_AirLoss') != -1)"
@click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)">
<span class="_jump_page _font_bold">{{$t('objFill.tdsz')}}</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 2644d87f
......@@ -280,7 +280,7 @@
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="7" class="_color_b">
<template v-for="(item,index) in GetDetail.CashierDetail">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） </p>
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） <span v-if="item.MultiplePay>0">{{item.MultPayDate}}[{{item.MultiplePay}}]</span></p>
</template>
</td>
</tr>
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ 2644d87f
......@@ -182,7 +182,7 @@
<td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{item.AllotDate}}</td>
<td>{{item.AllotDate}}<span v-if="item.MultiplePay>0"> [{{item.MultiplePay}}]</span></td>
<td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
<!-- <td>{{item.FrIdStr}}</td> -->
<td>{{item.SubjectName}}</td>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 2644d87f
......@@ -1053,6 +1053,7 @@
@click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
</td>
<td width="80" class="_zhidan">
<template v-if="myLineId==90">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
......@@ -1071,6 +1072,7 @@
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
</template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</div>
</template>
<template v-else>
......@@ -1098,6 +1100,7 @@
<template v-else-if="!item.hideZDBtn && index2==0">
<span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span>
</template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</template>
</div>
</template>
......@@ -1760,8 +1763,20 @@
err => {}
);
},
//跳转报报价单
gotoOfferChange(offerId) {
if (offerId) {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': offerId,
'Qtype': 3,
'blank': 'y',
}
});
}
},
ZhuiJiaTuanKuan(item) {
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: item.TCIDS
}, res => {
......@@ -1773,14 +1788,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId);
}).catch(() => {
});
......@@ -1790,14 +1798,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId);
}).catch(() => {
});
......@@ -1916,14 +1917,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId)
}).catch(() => {
});
......@@ -1933,17 +1927,8 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
this.gotoOfferChange(res.data.data.OfferId)
}).catch(() => {});
}
} else {
this.goDiJieZhiDan(obj, num, leadr, cur);
......@@ -2342,7 +2327,8 @@
LeaderGetPriceT: 0,
ShowTotalPrice: 0,
TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS
TCIDS: x.TCIDS,
OfferId: x.OfferId,
};
x.LeaderGetPriceList.forEach(price => {
if (cur.CurrencyId == price.CurrencyId) {
......@@ -3152,11 +3138,6 @@
border-collapse: collapse;
}
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
} */
table.OtherExpensesList th {
border: 1px solid #ccc;
padding: 8px;
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ 2644d87f
......@@ -15,11 +15,20 @@
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit>
</div>
<div class="btnFixedDiv" v-if="haveData">
<div class="toTop">
<i class="iconfont icon-huidaodingbu"></i>
</div>
<div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">{{$t('fnc.tijiao')}}</div>
<div class="btnFixedDiv" v-if="haveData" style="margin:0 auto;">
<el-button @click="SaveData(2)" :loading="saveLoading"
style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:10px;border:none;width:45px;height:45px;padding:0;">
{{$t('fnc.tijiao')}}
</el-button>
<template v-if="IsEdit==3">
<br />
<el-tooltip class="item" effect="dark" content="根据地接数据更新报价单" placement="top">
<el-button :loading="saveLoading" @click="ReCalcOffer()"
style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:5px; border:none;width:45px;height:45px;padding:0;padding-top:10px;">
更新
</el-button>
</el-tooltip>
</template>
</div>
</div>
</template>
......@@ -80,28 +89,52 @@
AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型,
OfferArray:[],
OfferArray: [],
OfferId: 0,
},
pMsg: {
offerId: 0,
// BatchNum: "",
},
isSubmit: true,
loading: false,
IsEdit: 0,
saveLoading: false,
};
},
methods: {
ReCalcOffer() {
this.saveLoading = true;
var newMsg = {
OfferId: this.pMsg.offerId,
}
this.apipost(
"travel_post_CalcChangeOffer", newMsg,
res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getPostData();
} else {
this.Error(res.data.message);
}
},
err => {
this.saveLoading = false;
}
);
},
//保存数据
SaveData(Type) {
this.saveLoading = true;
var nObj = {
offerid:this.pMsg.offerId,
offerid: this.pMsg.offerId,
};
this.loading = true;
this.apipost(
"travel_post_SetOfferChangeAudit", nObj,
res => {
this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.goUrl('newQuotation');
......@@ -134,9 +167,13 @@
this.loading = false;
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("travel_get_PriceOfferInfo",tempData);
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
if (tempData.OfferId && tempData.OfferId > 0) {
this.postData.OfferId = tempData.OfferId;
}
if (tempData.LineId && tempData.LineId > 0) {
this.postData.LineId = tempData.LineId;
}
......
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