Skip to content

S
SuperMan
Commit 8929ed0a authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f118d779
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 83 deletions
src/components/Hotel/SupplierHandFee.vue
View file @ 8929ed0a
<style> <style>
.SupplierTable td{ .SupplierTable td {
padding:0 5px; padding: 0 5px;
text-align: center!important; text-align: center !important;
} }
.SupplierTable .linkStr {
color: blue;
text-decoration: underline;
cursor: pointer;
}
</style> </style>
<template> <template>
<div class="flexOne SupplierHandeFee"> <div class="flexOne SupplierHandeFee">
...@@ -51,9 +58,15 @@ ...@@ -51,9 +58,15 @@
<template v-for="(subItem,subIndex) in item.SubList"> <template v-for="(subItem,subIndex) in item.SubList">
<tr :key="subIndex"> <tr :key="subIndex">
<td>{{subItem.OutBranchName}}</td> <td>{{subItem.OutBranchName}}</td>
<td>{{subItem.TCNUM}}({{subItem.TCID}})</td> <td><span class="linkStr" @click="gotoDmcTable(subItem)"> {{subItem.TCNUM}}({{subItem.TCID}})
<td v-if="subIndex==0" :rowspan="item.SubList.length">{{item.DMCNum}}</td> </span>
<td>{{subItem.GuestNum}}</td> </td>
<td v-if="subIndex==0" :rowspan="item.SubList.length">
<span class="linkStr" @click="gotoDmcTable(subItem)"> {{item.DMCNum}} </span>
</td>
<td>
<span class="linkStr" @click="goUrlT(subItem)"> {{subItem.GuestNum}} </span>
</td>
<td>{{subItem.UnitPrice}}</td> <td>{{subItem.UnitPrice}}</td>
<td style="text-align:left!important;"> <td style="text-align:left!important;">
<span style="color:red;">{{subItem.DayCount}}泊</span> <span style="color:red;">{{subItem.DayCount}}泊</span>
...@@ -68,7 +81,7 @@ ...@@ -68,7 +81,7 @@
<template v-if="subItem.Frids!=''"> {{subItem.RMBMoney}}</template> <template v-if="subItem.Frids!=''"> {{subItem.RMBMoney}}</template>
</td> </td>
<td> <td>
{{subItem.Frids}} <a v-if="subItem.Frids!=''" class="linkStr" @click="goFncUrl(subItem.Frids)">{{subItem.Frids}}</a>
</td> </td>
<td v-if="subIndex==0" :rowspan="item.SubList.length"> <td v-if="subIndex==0" :rowspan="item.SubList.length">
<el-tooltip class="item" effect="dark" content="生成单据" placement="top-start"> <el-tooltip class="item" effect="dark" content="生成单据" placement="top-start">
...@@ -113,26 +126,56 @@ ...@@ -113,26 +126,56 @@
}, },
filters: {}, filters: {},
methods: { methods: {
  //生成手配费单据 goUrlT(item) {
      CreateSupplierBill(item) { this.$router.push({
        var that = this; name: "RegistrationList",
        this.Confirm("是否要生成财务单据?", function () { query: {
          that.loading = true; "id": item.TCID,
          that.apipost("dmcstatistics_get_CreateDmcSupplierHotelBillService", { blank: 'y',
              TCID: item.TCIDS, tab: "报名清单"
              Supplier:that.msg.Supplier, }
QMonthStr:that.msg.QMonthStr, })
            }, },
            res => { goFncUrl(frid) {
              that.loading = false; this.$router.push({
              if (res.data.resultCode == 1) { name: "FinancialDocumentsDetail",
                that.Success('生成单据成功!'); query: {
                that.getList(); id: frid,
              } else { blank: "y",
                that.Error(res.data.data); tab: "单据详情"
              } }
            }, null); });
        }); },
gotoDmcTable(item) {
this.$router.push({
name: "dmcTotalTable",
query: {
TCNUM: item.TCNUM,
blank: "y",
tab: "详情"
}
});
},
//生成手配费单据
CreateSupplierBill(item) {
var that = this;
this.Confirm("是否要生成财务单据?", function () {
that.loading = true;
that.apipost("dmcstatistics_get_CreateDmcSupplierHotelBillService", {
TCID: item.TCIDS,
Supplier: that.msg.Supplier,
QMonthStr: that.msg.QMonthStr,
},
res => {
that.loading = false;
if (res.data.resultCode == 1) {
that.Success('生成单据成功!');
that.getList();
} else {
that.Error(res.data.data);
}
}, null);
});
}, },
//报价单下载 //报价单下载
DownLoadFile() { DownLoadFile() {
...@@ -145,12 +188,12 @@ ...@@ -145,12 +188,12 @@
return; return;
} }
var SupplierName = '' var SupplierName = ''
this.SupplierList.forEach(x=>{ this.SupplierList.forEach(x => {
if(this.msg.Supplier==x.ID){ if (this.msg.Supplier == x.ID) {
SupplierName=x.Name SupplierName = x.Name
} }
}) })
var fileName = SupplierName + this.msg.QMonthStr+".xls"; var fileName = SupplierName + this.msg.QMonthStr + ".xls";
this.loading = true; this.loading = true;
this.GetLocalFile("dmc_get_DowmLoadDmcSupplierHote", this.msg, fileName, res => { this.GetLocalFile("dmc_get_DowmLoadDmcSupplierHote", this.msg, fileName, res => {
this.loading = false; this.loading = false;
...@@ -166,6 +209,7 @@ ...@@ -166,6 +209,7 @@
this.Error('请选择供应商'); this.Error('请选择供应商');
return; return;
} }
this.msg.PageIndex = 1;
this.getList(); this.getList();
}, },
//获取数据 //获取数据
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 8929ed0a
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<el-option :label="$t('ground.zandingew')" :value='2'></el-option> <el-option :label="$t('ground.zandingew')" :value='2'></el-option>
<el-option :label="$t('ground.zandingsw')" :value='3'></el-option> <el-option :label="$t('ground.zandingsw')" :value='3'></el-option>
<el-option :label="$t('ground.zandingsiw')" :value='4'></el-option> <el-option :label="$t('ground.zandingsiw')" :value='4'></el-option>
<el-option :label="$t('ground.zandingww')" :value='5'></el-option> <el-option :label="$t('ground.zandingww')" :value='5'></el-option>
<el-option :label="$t('ground.zandingliuw')" :value='6'></el-option> <el-option :label="$t('ground.zandingliuw')" :value='6'></el-option>
<el-option :label="$t('ground.zding7yishang')" :value='7'></el-option> <el-option :label="$t('ground.zding7yishang')" :value='7'></el-option>
</el-select> </el-select>
...@@ -144,8 +144,8 @@ ...@@ -144,8 +144,8 @@
</ul> </ul>
</div> </div>
<div class="mt10 fz14 color333 dmcTotalIconStyle"> <div class="mt10 fz14 color333 dmcTotalIconStyle">
{{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;">√</span>{{$t('ground.daiqueding')}}:<span style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span {{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;">√</span>{{$t('ground.daiqueding')}}:<span
style="color:#E95252 ;">X</span> style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span style="color:#E95252 ;">X</span>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
...@@ -232,7 +232,8 @@ ...@@ -232,7 +232,8 @@
</tr> </tr>
</table> </table>
<el-button slot="reference" class="normalBtn mt5 restaurantDetails" <el-button slot="reference" class="normalBtn mt5 restaurantDetails"
style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}</el-button> style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>
{{$t('fnc.xiangqing')}}</el-button>
</el-popover> </el-popover>
</div> </div>
</td> </td>
...@@ -262,14 +263,16 @@ ...@@ -262,14 +263,16 @@
</td> </td>
<td> <td>
<div class="link"> <div class="link">
<p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{$t('ground.peizhilingdui')}}</p> <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
{{$t('ground.peizhilingdui')}}</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')"> <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p> {{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
</div> </div>
</td> </td>
<td> <td>
<div class="link"> <div class="link">
<p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{$t('ground.daituananpai')}}</p> <p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
{{$t('ground.daituananpai')}}</p>
<p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}</p> <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}</p>
</div> </div>
</td> </td>
...@@ -281,13 +284,14 @@ ...@@ -281,13 +284,14 @@
</td> </td>
<td> <td>
<!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" --> <!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
<div class="fz16 fbold linkspan" > <div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span> <span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div> </div>
<p v-if="item.FenFangUrl!=''"> <p v-if="item.FenFangUrl!=''">
<a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件" v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">{{$t('op.FFBDowmLoad')}}</a> <a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件"
</p> v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">{{$t('op.FFBDowmLoad')}}</a>
</p>
</td> </td>
<td> <td>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
...@@ -330,7 +334,8 @@ ...@@ -330,7 +334,8 @@
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">{{$t('ground.jiudianxinxi')}}</span> <span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('ground.jiudianxinxi')}}</span>
</el-popover> </el-popover>
</p> </p>
</td> </td>
...@@ -502,15 +507,18 @@ ...@@ -502,15 +507,18 @@
<td colspan="23" style="text-align: left!important;padding:0 20px;"> <td colspan="23" style="text-align: left!important;padding:0 20px;">
<div class="link"> <div class="link">
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p> <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div <div class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">
class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span> {{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
</div> </div>
<div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_remark')}}：{{outItem.PriceCommonList[index].OPInnerRemark}}</div> style="padding-top:5px;padding-bottom:4px;font-size:13px;">
{{$t('Operation.Op_remark')}}：{{outItem.PriceCommonList[index].OPInnerRemark}}</div>
<div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_duiwaiRemark')}}：{{outItem.PriceCommonList[index].OPRemark}}</div> style="padding-top:5px;padding-bottom:4px;font-size:13px;">
{{$t('Operation.Op_duiwaiRemark')}}：{{outItem.PriceCommonList[index].OPRemark}}</div>
<div v-show="outItem.PriceCommonList[index].DMCRemark!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].DMCRemark!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_dijieRemark')}}：{{outItem.PriceCommonList[index].DMCRemark}} style="padding-top:5px;padding-bottom:4px;font-size:13px;">
{{$t('Operation.Op_dijieRemark')}}：{{outItem.PriceCommonList[index].DMCRemark}}
</div> </div>
<div v-show="outItem.PriceCommonList[index].SupplierRemarks!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].SupplierRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;"> style="padding-top:5px;padding-bottom:4px;font-size:13px;">
...@@ -518,7 +526,7 @@ ...@@ -518,7 +526,7 @@
</div> </div>
<div v-show="outItem.PriceCommonList[index].SupplierToDmcRemarks!=''" class="colorE95252" <div v-show="outItem.PriceCommonList[index].SupplierToDmcRemarks!=''" class="colorE95252"
style="padding-top:5px;padding-bottom:4px;font-size:13px;"> style="padding-top:5px;padding-bottom:4px;font-size:13px;">
{{$t('ground.gysduindibeizhu')}}：{{outItem.PriceCommonList[index].SupplierToDmcRemarks}} {{$t('ground.gysduindibeizhu')}}：{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
</div> </div>
</div> </div>
</td> </td>
...@@ -531,7 +539,8 @@ ...@@ -531,7 +539,8 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class='w450' :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center> <el-dialog custom-class='w450' :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2"> <tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon> </tripDownLoadCommon>
</el-dialog> </el-dialog>
...@@ -600,7 +609,7 @@ ...@@ -600,7 +609,7 @@
remarkString: '', remarkString: '',
SupplierRemarks: '', SupplierRemarks: '',
IsBookTeam: 0, IsBookTeam: 0,
IsSure:0, IsSure: 0,
}, },
queryCommonData: { queryCommonData: {
//公司数据 //公司数据
...@@ -674,7 +683,7 @@ ...@@ -674,7 +683,7 @@
methods: { methods: {
goDinnerUrl(obj, outItem) { goDinnerUrl(obj, outItem) {
// if (this.IsEditDinner == 1) { // if (this.IsEditDinner == 1) {
this.$router.push({ this.$router.push({
name: 'bookDinnerStatisticsDetails', name: 'bookDinnerStatisticsDetails',
query: { query: {
"id": obj.TCIDS, "id": obj.TCIDS,
...@@ -689,7 +698,7 @@ ...@@ -689,7 +698,7 @@
blank: 'y', blank: 'y',
tab: "餐厅详情" tab: "餐厅详情"
} }
}) })
// } else { // } else {
// this.Error("请联系地接部操作!"); // this.Error("请联系地接部操作!");
// } // }
...@@ -729,25 +738,22 @@ ...@@ -729,25 +738,22 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.getList(); this.getList();
} } else if (res.data.resultCode == 2) {
else if(res.data.resultCode==2) that.Confirm(res.data.message, function () {
{ that.NumObj.IsSure = 1;
that.Confirm(res.data.message, function () { that.apipost(
that.NumObj.IsSure = 1; "dmcstatistics_post_SetDMCRemark",
that.apipost( that.NumObj,
"dmcstatistics_post_SetDMCRemark", res => {
that.NumObj, if (res.data.resultCode == 1) {
res => { that.$message.success(res.data.message);
if (res.data.resultCode == 1) { that.getList();
that.$message.success(res.data.message); }
that.getList(); },
} err => {}
}, );
err => {} });
); } else {
});
}
else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
...@@ -877,12 +883,12 @@ ...@@ -877,12 +883,12 @@
} }
}) })
}, },
goUrlF(path, obj,lineId, outItem, title) { goUrlF(path, obj, lineId, outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj, "id": obj,
"lineId": lineId, "lineId": lineId,
NewCombinationNum: outItem.NewCombinationNum, NewCombinationNum: outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
...@@ -943,14 +949,14 @@ ...@@ -943,14 +949,14 @@
}) })
}, },
//跳转用款计划 //跳转用款计划
goUrlYongKuan(path, obj, outItem, title){ goUrlYongKuan(path, obj, outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": outItem.TCIDS, "id": outItem.TCIDS,
NewCombinationNum: outItem.NewCombinationNum, NewCombinationNum: outItem.NewCombinationNum,
isUpdate: true, isUpdate: true,
OutBranchId:obj.OutBranchId, OutBranchId: obj.OutBranchId,
blank: 'y', blank: 'y',
tab: title, tab: title,
lineId: outItem.PriceCommonList[0].LineId lineId: outItem.PriceCommonList[0].LineId
...@@ -1182,14 +1188,18 @@ ...@@ -1182,14 +1188,18 @@
}, },
mounted() { mounted() {
this.GetAuth(); this.GetAuth();
let myDate = new Date(); if (this.$route.query.TCNUM) {
let nowDate = this.msg.TCNUM = this.$route.query.TCNUM;
myDate.getFullYear() + } else {
"-" + let myDate = new Date();
parseInt(myDate.getMonth() + 1) + let nowDate =
"-" + myDate.getFullYear() +
myDate.getDate(); "-" +
this.msg.StartDate = nowDate; parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
}
this.getLineList(); this.getLineList();
this.getList(); this.getList();
this.getCompanyList(); this.getCompanyList();
......
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