Skip to content

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

页面修改

parent 2cee3819
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 49 deletions
src/components/SalesModule/productQuery.vue
View file @ eedcf604
......@@ -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 @ eedcf604
......@@ -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/orderCommon/order-form2.vue
View file @ eedcf604
......@@ -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) {
......@@ -2286,6 +2291,8 @@
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 @ eedcf604
......@@ -974,7 +974,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 +986,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