Commit 3ebcfff5 authored by zhengke's avatar zhengke

修改

parents 16cd652e 62a270f5
...@@ -616,6 +616,7 @@ tr._item_list td:last-child { ...@@ -616,6 +616,7 @@ tr._item_list td:last-child {
:footer="footer" :footer="footer"
:footer-row-height="33" :footer-row-height="33"
:multiple-sort="multipleSort" :multiple-sort="multipleSort"
:row-click="rowClick"
> >
<!-- 多个排序 --> <!-- 多个排序 -->
</v-table> </v-table>
...@@ -1795,6 +1796,20 @@ export default { ...@@ -1795,6 +1796,20 @@ export default {
this.getPageList(); this.getPageList();
}, },
methods: { methods: {
rowClick(rowIndex,rowData,column){
let path='RegistrationList';
if(this.msg.DataType==1 || this.msg.DataType=='1'){
if(column.title=="待收金额" || column.title=="溢收金额"){
this.$router.push({
name: path,
query: {
id: rowData.TCID,
blank: "y",
}
});
}
}
},
//获取目的地列表 //获取目的地列表
getLinePlaceList(lineId) { getLinePlaceList(lineId) {
let msg = { let msg = {
......
...@@ -124,10 +124,11 @@ ...@@ -124,10 +124,11 @@
</ul> </ul>
</div> </div>
<div style=" padding-bottom: 10px;"> <div style="padding-bottom: 10px;">
<span>应收总额:{{moneyFormat(PreferPrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span>应收总额:{{moneyFormat(PreferPrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>实收:{{moneyFormat(IncomePrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span>实收:{{moneyFormat(IncomePrice)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>待收:<span :class="{color_red:(PreferPrice-IncomePrice)!==0}">{{moneyFormat(PreferPrice-IncomePrice)}}</span></span> <span>优惠:{{moneyFormat(DiscountMoneyAll)}}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<span>待收:<span :class="{color_red:(PreferPrice-IncomePrice-DiscountMoneyAll)!==0}">{{moneyFormat(PreferPrice-IncomePrice-DiscountMoneyAll)}}</span></span>
</div> </div>
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr> <tr>
...@@ -321,6 +322,7 @@ export default { ...@@ -321,6 +322,7 @@ export default {
isShow:0, isShow:0,
PreferPrice:0, PreferPrice:0,
IncomePrice:0, IncomePrice:0,
DiscountMoneyAll:0,
EmployeeId:0, EmployeeId:0,
EditVisible:false, EditVisible:false,
EditMsg:{ EditMsg:{
...@@ -400,8 +402,9 @@ export default { ...@@ -400,8 +402,9 @@ export default {
}, },
getList(){ // 获取列表数据 getList(){ // 获取列表数据
this.apipost('dmc_get_visa_GetVisaOrderList',this.msg,res=>{ this.apipost('dmc_get_visa_GetVisaOrderList',this.msg,res=>{
this.PreferPrice=0; this.PreferPrice=0;
this.IncomePrice=0; this.IncomePrice=0;
this.DiscountMoneyAll=0;
if(res.data.resultCode==0){ if(res.data.resultCode==0){
this.loading = false; this.loading = false;
this.dataList=[] this.dataList=[]
...@@ -412,8 +415,11 @@ export default { ...@@ -412,8 +415,11 @@ export default {
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
if(x.VisaOrderStatus!=2){ if(x.VisaOrderStatus!=2){
this.PreferPrice+=x.TotalPrice; this.PreferPrice+=x.TotalPrice;
this.DiscountMoneyAll+=x.DiscountMoney;
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
} }
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
}) })
} }
},err=>{}) },err=>{})
......
...@@ -57,7 +57,8 @@ ...@@ -57,7 +57,8 @@
<p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p> <p v-if="d.w">{{d.w.CreateName}} 提交于 {{item.CreateDate}}</p>
<div class="cont">{{item.Content}}</div> <div class="cont">{{item.Content}}</div>
<div class="attach"> <div class="attach">
<a href="http://baidu.com" target="_blank">附件:baidu.jpg</a> 附件:无
<!--<a href="http://baidu.com" target="_blank"></a>-->
</div> </div>
</el-card> </el-card>
</div> </div>
......
...@@ -357,6 +357,15 @@ export default { ...@@ -357,6 +357,15 @@ export default {
err => {} err => {}
); );
}, },
query(id){
this.$router.push({
name: "workDetails",
query: {
"id": id,
blank: 'y'
}
})
},
query2(id){ query2(id){
this.$router.push({ this.$router.push({
name: "workDetails", name: "workDetails",
......
...@@ -118,7 +118,7 @@ export default { ...@@ -118,7 +118,7 @@ export default {
javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000"; javaUrldo=locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000";
if (locationName.indexOf('testerp.oytour') !== -1) { if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://127.0.0.1:8082"; domainUrl = "http://testapi.oytour.com";
} }
else if (locationName.indexOf('oytour') !== -1) { else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
......
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