Skip to content

S
SuperMan
Commit 54e929d7 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 79f2b274 0f9b79fc
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 84 deletions
src/components/FinancialModule/OpCommission/OpComPersonDetails.vue
View file @ 54e929d7
......@@ -169,7 +169,7 @@
<td>{{item.OutBranchName?item.OutBranchName:'-'}}</td>
<td>{{item.OrderTypeName}}</td>
<td>
<span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" @click="clickUrl(item)">{{item.TCID}}</span>
<span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" @click="!disabled?clickUrl(item):''">{{item.TCID}}</span>
</td>
<td><span class="cursor-p" :style="{'color': !disabled?'#409EFF':''}" v-if="item.TCNUM"
@click="!disabled?goTuanDetails(item):''">{{item.TCNUM}}</span></td>
......@@ -351,6 +351,14 @@
});
},
clickUrl(row){
this.$router.push({
name: 'erpCustomerOrderDayOP',
query: {
blank: 'y',
OrderId: row.TCID
}
});
return
let name = ''
if (row.OrderType == 5) {//签证
if (this.S_CheckBranchOrder || this.S_CheckAllOrder) {
......
src/components/Hotel/roomReservationsDetailsNew.vue
View file @ 54e929d7
......@@ -49,8 +49,8 @@
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<tr>
<th class="fz14" colspan="5">
{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th>
{{$t('visa.v_teaminfo')}}:{{TCNUM}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}</th>
<th class="fz14" colspan="17">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
style="float:left;margin-left:20px;display:none;">
......@@ -137,7 +137,6 @@
<th width="100">{{$t('ground.fangjianleixing')}}</th>
<th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th>
<th width="80">{{$t('ground.yudingrenshu')}}</th>
<!-- <th width="80">尚差<br />房间数</th> -->
<th width="80">{{$t('ground.danjiameiren')}}</th>
<th width="80">{{$t('ground.mianjianrenshu')}}</th>
<th width="80">{{$t('ground.jinexiaoji')}}</th>
......@@ -301,13 +300,6 @@
</el-input>
</div>
</td>
<!-- 尚差房间数 -->
<!-- <td>
<p class="pHouseStyle"
:class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
{{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
</p>
</td> -->
<!-- 单价/每人 -->
<td>
<div v-if="childItem.HouseType === 2">
......@@ -975,11 +967,6 @@
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
// in list">
// <template v-for="(subItem,subIndex) in item.HotelOrderList">
// <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex">
if (list != null && list.length > 0) {
list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => {
......@@ -991,10 +978,7 @@
Name: subItem.NewHotelName,
ID: subItem.NewHotelId
});
//默认成日元
if (subItem.CurrencyId == 0) {
subItem.CurrencyId = 3;
}
subItem.OrderDetailsList.forEach((x, index1) => {
x.HouseTypeCount = x.HouseTypeCount.toString();
x.UnitPrice = x.UnitPrice.toString();
......@@ -1004,11 +988,12 @@
subItem.ReserveNo = this.$route.query.NewCombinationNum;
}
subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
// this.calculationPrice(subItem);
const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {TotalPrice: 0}
subItem.TotalPrice = item.TotalPrice.toFixed(2);
// 将金额总计的值赋值给金额小计
subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2);
const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {
TotalPrice: 0
}
subItem.TotalPrice = item.TotalPrice.toFixed(2);
// 将金额总计的值赋值给金额小计
subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2);
subItem.isShowPop = false;
subItem.ckedHotelName = "";
//遍历手配
......
src/components/SalesModule/productQuery.vue
View file @ 54e929d7
......@@ -4154,12 +4154,7 @@ export default {
this.getPlatformAccount(obj.PlatformAccountTypeId);
this.getPlatformAccountNew();
this.clearMsg();
// let str = ''
// if (obj.OtherPrice > 0 ) {
// str += '杂费' + obj.OtherPrice + '/人;'
// }
// this.addMsg.Remarks = str
// this.otherRemark = str;
this.SingleDMCPrice = obj.SingleDMCPrice;
this.SingleDMCPricex = obj.SingleDMCPrice;
},
......
src/components/SalesModule/productQuery2.vue
View file @ 54e929d7
......@@ -446,7 +446,7 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
<!-- 产品列表 -->
<productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle"></productOrderList>
<productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle" :PBranchId="msg.BranchId"></productOrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
......
src/components/SingleContract.vue
View file @ 54e929d7
......@@ -1271,7 +1271,7 @@
Tourists_Fax: "",
Tourists_EmergencyLinkMan: "",
Tourists_EmergencyLinkTel: "",
SignType: 0, //合同章类型
SignType: 1, //合同章类型
TravelAgency_Name: "（株）ピースインターナショナル", //旅行社名称
TravelAgency_LicenseNum: "L-SC-CJ00015",
TravelAgency_DealMan: "",
......
src/components/administrative/ElectronicAudit.vue
View file @ 54e929d7
......@@ -330,7 +330,7 @@
</td>
</tr>
</table>
<el-pagination background @current-change="handleOutChange" :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>
</div>
......@@ -458,7 +458,7 @@
//审核通过或者驳回
AuditElec(item, type) {
item.AuditContract = type;
// this.apiJavaPost("/api/contract/dosaveOrUpdate", item, res => {
// this.apiJavaPost("/api/contract/dosaveOrUpdate", item, res => {
this.apipost("travelcontract_get_UpdateAuditContractService", item, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 54e929d7
......@@ -820,7 +820,7 @@
}, err => {})
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
this.apipost("line_post_GetList", {LineDirection: 2}, res => {//
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
......@@ -1234,7 +1234,7 @@
}
var userInfo = this.getLocalStorage();
if (userInfo.RB_Group_id == this.QjGroupId()) {
this.msg.LineId = 14;
// this.msg.LineId = 14;
}
this.getLineList();
......
src/components/orderCommon/order-form2.vue
View file @ 54e929d7
......@@ -137,12 +137,13 @@
</el-col>
<template v-if="showCity && pagesTitle == '跟团游产品'">
<el-col :span="4">
<!--出发城市-->
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select v-model="addMsg.DepartureCityId" :disabled="
<!--出发城市 :disabled="
priceObj.SonControlID !== -1 &&
priceObj.OutBranchId !== priceObj.SonControlID
" filterable :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsIntermodal = 2">
" HK 2023-05-25去掉联运限制 -->
<el-form-item :label="$t('system.table_goCity')" prop="DepartureCityId">
<el-select v-model="addMsg.DepartureCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
......@@ -150,53 +151,54 @@
</el-col>
<el-col :span="4">
<!--出发是否联运-->
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsIntermodal" v-show="
<!--出发是否联运 v-show="
addMsg.DepartureCityId != priceObj.StartCityID &&
addMsg.DepartureCityId != ''
">
" -->
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsIntermodal">
<el-switch v-model="addMsg.IsIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 1)"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
<!--联运时间-->
<!--联运时间 &&
addMsg.DepartureCityId != priceObj.StartCityID-->
<el-form-item :label="$t('salesModule.LYtime')" prop="GoCityTime" v-show="
addMsg.IsIntermodal == 1 &&
addMsg.DepartureCityId != priceObj.StartCityID
addMsg.IsIntermodal == 1
">
<el-date-picker :picker-options="pickerOptions0" v-model="addMsg.GoCityTime" value-format="yyyy-MM-dd"
type="date" @change="getUnionTravelPrice(priceObj, 1)"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<!--返回城市-->
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select v-model="addMsg.ReturnArriveCityId" :disabled="
<!--返回城市 :disabled="
priceObj.SonControlID !== -1 &&
priceObj.OutBranchId !== priceObj.SonControlID
" filterable :placeholder="$t('pub.pleaseSel')" @change="addMsg.IsReturnIntermodal = 2">
"-->
<el-form-item :label="$t('salesModule.BackCity')" prop="ReturnArriveCityId">
<el-select v-model="addMsg.ReturnArriveCityId" filterable :placeholder="$t('pub.pleaseSel')"
@change="addMsg.IsReturnIntermodal = 2">
<el-option v-for="item in startCityList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<!--返程是否联运-->
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsReturnIntermodal" v-show="
<!--返程是否联运 v-show="
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId &&
addMsg.ReturnArriveCityId != ''
">
"-->
<el-form-item :label="$t('salesModule.IsLianYn')" prop="IsReturnIntermodal">
<el-switch v-model="addMsg.IsReturnIntermodal" active-value="1" inactive-value="2"
@change="getUnionTravelPrice(priceObj, 2)"></el-switch>
</el-form-item>
</el-col>
<el-col :span="4">
<!--返程联运时间-->
<!--返程联运时间 &&
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
<el-form-item :label="$t('salesModule.LYtime')" prop="IsReturnIntermodal" v-show="
addMsg.IsReturnIntermodal == 1 &&
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId
addMsg.IsReturnIntermodal == 1
">
<el-date-picker :picker-options="pickerOptions1" v-model="addMsg.BackCityTime" value-format="yyyy-MM-dd"
type="date" @change="getUnionTravelPrice(priceObj, 2)"></el-date-picker>
......@@ -211,18 +213,20 @@
<el-input v-else v-model="SingleDMCPricex" :disabled="true" @input="getTotalPrice()"></el-input>
</el-form-item>
</el-col>
<!--&&
addMsg.DepartureCityId != priceObj.StartCityID-->
<el-col :span="4" v-show="
addMsg.IsIntermodal == 1 &&
addMsg.DepartureCityId != priceObj.StartCityID
addMsg.IsIntermodal == 1
">
<el-form-item :label="$t('salesModule.StartLY')">
<el-input v-model="stratPrice" v-show="stratPriceShow" :disabled="true"></el-input>
<span class="colorE95252" v-show="!stratPriceShow">{{ $t("pub.NoPrice") }}！</span>
</el-form-item>
</el-col>
<!--&&
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId-->
<el-col :span="4" v-show="
addMsg.IsReturnIntermodal == 1 &&
addMsg.ReturnArriveCityId != priceObj.ReturnArriveCityId
addMsg.IsReturnIntermodal == 1
">
<el-form-item :label="$t('salesModule.BackLY')">
<el-input v-model="returnPrice" v-show="returnPriceShow" :disabled="true"></el-input>
......@@ -633,10 +637,11 @@
</el-col>
</el-row>
<!--v-if="addMsg.IsIntermodal == 1 || addMsg.IsReturnIntermodal == 1"-->
<el-row :gutter="20" >
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="联运备注" prop="UnionRemark">
<el-input v-model="addMsg.UnionRemark" type="textarea" maxlength="500" placeholder="去程 成都到北京，提前一天，需要住宿;回程 北京到成都 晚一天，需要住宿"></el-input>
<el-input v-model="addMsg.UnionRemark" type="textarea" maxlength="500"
placeholder="去程 成都到北京，提前一天，需要住宿;回程 北京到成都 晚一天，需要住宿"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -1449,7 +1454,6 @@
this.addMsg.ContactName = "";
this.addMsg.ContactMobile = "";
}
if (this.addMsg.CustomerType == 1) {
this.addMsg.TC_Price = this.priceObj.B2BMemberPrice;
this.addMsg.Unit_Price = this.priceObj.B2BMemberPrice;
......@@ -1760,7 +1764,6 @@
this.getTypePrice();
}
},
//提交表单验证
submitForm(addMsg) {
if (this.TotalNumber == 0) {
......@@ -2236,6 +2239,16 @@
});
},
},
created() {
this.CurrentUserInfo = this.getLocalStorage();
this.getCustomerType(); //获取客户类型
this.getPlatformAccountNew();
this.getJoinType(); //参团类型
this.getEmployee(); //获取员工列表
this.getCityList(); //获取出发、返回城市
this.getTradeWay(); //获取交易方式
this.getCountry(); //获取国家
},
mounted() {
const that = this;
window.onresize = () => {
......@@ -2249,18 +2262,10 @@
} else {
this.ScreenHeight = "300px";
}
this.CurrentUserInfo = this.getLocalStorage();
this.getCustomerType(); //获取客户类型
this.getMinPrice(this.productObj.LineID); // 当前线路报价
this.getScenicRefund(this.PTCID); // 可退景点
//获取所有账户列表
this.getPlatformAccount(this.productObj.PlatformAccountTypeId);
this.getPlatformAccountNew();
this.getJoinType(); //参团类型
this.getEmployee(); //获取员工列表
this.getCityList(); //获取出发、返回城市
this.getTradeWay(); //获取交易方式
this.getCountry(); //获取国家
},
watch: {
fullHeight(val) {
......@@ -2281,11 +2286,13 @@
productObj: {
handler(oldValue, newVal) {
this.clearMsg();
this.getTravelPirceInfo();
//this.getTravelPirceInfo();
this.addMsg.DepartureCityId = oldValue.StartCityID;
this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId;
this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
this.addMsg.SonControlID = oldValue.SonControlID;
console.log("this.addMsg.SonControlID ", this.addMsg.SonControlID);
this.priceObj = JSON.parse(JSON.stringify(oldValue));
if (this.pagesTitle == "当地游产品") {
let str = "";
......@@ -2308,10 +2315,7 @@
},
//监听TCID变化
PTCID: function (oldValue, newVal) {
// if (oldValue != newVal) {
// this.clearMsg();
// this.getTravelPirceInfo()
// }
},
},
};
......
src/components/orderCommon/productOrderList.vue
View file @ 54e929d7
......@@ -484,9 +484,6 @@
<span v-if="item.CustomerName">客户名称：{{item.CustomerName}}
</span>
</p>
<!-- <p v-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<a style="color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</p> -->
</div>
</div>
<div class="d2" v-if="pagesTitle=='跟团游产品'">
......@@ -608,7 +605,8 @@
<span class="TCL-greenType">{{ item.SaleClearOrderHour
}}{{ $t("salesModule.Hour") }}</span>
</p>
<p v-if="item.LineID == 14 && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
<!--日本线和欧洲线显示酒店预定情况-->
<p v-if="(item.LineID == 14||item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
<el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj">
</commonHotelInfo>
......@@ -974,7 +972,7 @@
</el-dialog>
<!-- 下单 -->
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="0"
<orderForm @success="reSearchPage" @close="closeForm" :PTCID="teamInfo.TCID" :POrderId="0" :PBranchId="PBranchId"
:PProductType="1" :showCity="true" :productObj="teamInfo" :pagesTitle="pagesTitle">
</orderForm>
</div>
......@@ -986,7 +984,7 @@
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
import orderForm from "./order-form2.vue";
export default {
props: ['loading', 'list', 'pagesTitle'],
props: ['loading', 'list', 'pagesTitle','PBranchId'],
data() {
return {
//当前登录用户信息
......
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