Commit f24ce74e authored by 黄奎's avatar 黄奎

页面修改

parent 7d479422
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
}, },
$route:{ $route:{
handler(val, oldVal) { handler(val, oldVal) {
console.log(val,'-----')
}, },
deep: true, deep: true,
immediate:true, immediate:true,
......
...@@ -3141,8 +3141,6 @@ ...@@ -3141,8 +3141,6 @@
this.czmsgState = true; this.czmsgState = true;
} }
if(this.czmsg.ClientID&&this.czmsg.ClientID>0){ if(this.czmsg.ClientID&&this.czmsg.ClientID>0){
console.log('1:'+this.czmsg.ClientType);
console.log('2:'+this.czmsg.ClientID);
this.msg.IsPublic=1; this.msg.IsPublic=1;
this.msg.ClientType = this.czmsg.ClientType; this.msg.ClientType = this.czmsg.ClientType;
this.msg.ClientID = this.czmsg.ClientID; this.msg.ClientID = this.czmsg.ClientID;
......
...@@ -1007,7 +1007,6 @@ ...@@ -1007,7 +1007,6 @@
this.params, this.params,
res => { res => {
this.loading = false; this.loading = false;
console.log("GetDiDaPriceConfirm",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.PriceDetails; this.dataList = res.data.data.PriceDetails;
this.roomRateDetails = res.data.data.PriceDetails.HotelList[0]; this.roomRateDetails = res.data.data.PriceDetails.HotelList[0];
......
...@@ -1674,7 +1674,7 @@ ...@@ -1674,7 +1674,7 @@
<el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource"> <el-form-item :label="$t('salesModule.CustomFrom')" prop="ClientSource">
<!--票务修改平台 --> <!--票务修改平台 -->
<el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addMsg.ClientSource" filterable :placeholder="$t('pub.pleaseSel')"
@change="gettypechange(),getTotalPrice()" :disabled="addMsg.OutBranchId&&addMsg.OutBranchId!=1245" > @change="getTotalPrice()" :disabled="addMsg.OutBranchId!=1245">
<el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id"> <el-option v-for="item in ddlyList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -2543,7 +2543,7 @@ ...@@ -2543,7 +2543,7 @@
</td> </td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true"> <el-button-group v-if="isShow === true">
<el-tooltip v-if=" ConfigData.Config.IsCurrentMaxStartData == 0 || IsSupperOrderEdit" class="item" <el-tooltip class="item"
effect="dark" :content="$t('pub.updateMsg')" placement="top-start"> effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;" <el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;"
icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button> icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button>
...@@ -4780,7 +4780,7 @@ ...@@ -4780,7 +4780,7 @@
this.apipost( this.apipost(
"sellorder_post_GetOrderEntity", { "sellorder_post_GetOrderEntity", {
ID: obj.OrderId, ID: obj.OrderId,
IsDealDiscount:1 IsDealDiscount: 1
}, },
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -4789,7 +4789,7 @@ ...@@ -4789,7 +4789,7 @@
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
let x = res.data.data.model; let x = res.data.data.model;
this.addMsg = x; this.addMsg = x;
this.DealDiscountMoney = this.addMsg.DiscountMoney+this.addMsg.RedEnvelopeMoney; this.DealDiscountMoney = this.addMsg.DiscountMoney + this.addMsg.RedEnvelopeMoney;
this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价 this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice; this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
if (this.addMsg.IsLessPrice == 1) { if (this.addMsg.IsLessPrice == 1) {
...@@ -5518,19 +5518,21 @@ ...@@ -5518,19 +5518,21 @@
return; return;
} }
} }
var oldUnitPrice=this.addMsg.TC_Price; let userInfo = this.getLocalStorage();
if (this.addMsg.GroupType != 5) { if (userInfo != null && userInfo.EmployeeId != 1) {
//印象票务 if (this.addMsg.GroupType != 5) {
if (this.addMsg.OutBranchId&&this.addMsg.OutBranchId == 1245) { //印象票务
if (this.addMsg.CustomerType == 3 || this.addMsg.CustomerType == 4) { if (this.addMsg.OutBranchId && this.addMsg.OutBranchId == 1245) {
if (this.addMsg.PlatformPriceList && this if (this.addMsg.CustomerType == 3 || this.addMsg.CustomerType == 4) {
.addMsg.PlatformPriceList.length > 0) { if (this.addMsg.PlatformPriceList && this
var platFormObj = this.addMsg.PlatformPriceList.find(qitem => { .addMsg.PlatformPriceList.length > 0) {
return qitem.ItemId == this.addMsg.ClientSource var platFormObj = this.addMsg.PlatformPriceList.find(qitem => {
}); return qitem.ItemId == this.addMsg.ClientSource
if (platFormObj) { });
this.addMsg.TC_Price = platFormObj.ItemPrice; if (platFormObj) {
this.addMsg.Unit_Price = platFormObj.ItemPrice; this.addMsg.TC_Price = platFormObj.ItemPrice;
this.addMsg.Unit_Price = platFormObj.ItemPrice;
}
} }
} }
} }
......
...@@ -397,7 +397,6 @@ export default { ...@@ -397,7 +397,6 @@ export default {
clickSetAdmin(obj){ clickSetAdmin(obj){
this.dialogFormVisible = true this.dialogFormVisible = true
this.addType = 2 this.addType = 2
console.log(obj)
let list = obj.CustomerChildrenIds.split(',') let list = obj.CustomerChildrenIds.split(',')
this.addMsg = { this.addMsg = {
...JSON.parse(JSON.stringify(obj)), ...JSON.parse(JSON.stringify(obj)),
......
...@@ -102,7 +102,6 @@ export default { ...@@ -102,7 +102,6 @@ export default {
file, file,
{ {
progress: function* (p) { progress: function* (p) {
console.log('进度:', Math.round(p * 100) + '%');
const speeds = calculator(p); const speeds = calculator(p);
that.speed = that.formatSpeed(speeds); that.speed = that.formatSpeed(speeds);
that.handleProgress(p); that.handleProgress(p);
...@@ -133,7 +132,6 @@ export default { ...@@ -133,7 +132,6 @@ export default {
}) })
}, },
handleProgress(p) { handleProgress(p) {
console.log(p)
const now = Date.now() const now = Date.now()
const loaded = p.loaded const loaded = p.loaded
const total = p.total const total = p.total
......
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
}, },
methods: { methods: {
selectChange(item) { selectChange(item) {
console.log("this.sChangeRemark", this.sChangeRemark);
item.ChangeRemarks = this.sChangeRemark; item.ChangeRemarks = this.sChangeRemark;
}, },
getHotel(subItem, HotelId) { getHotel(subItem, HotelId) {
......
...@@ -266,7 +266,6 @@ ...@@ -266,7 +266,6 @@
watch: { watch: {
priceObj: { priceObj: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log("w_priceObj", this.priceObj);
this.resetPageIndex(); this.resetPageIndex();
}, },
deep: true deep: true
......
...@@ -1198,9 +1198,6 @@ ...@@ -1198,9 +1198,6 @@
getJourney(id, TCID, title) { getJourney(id, TCID, title) {
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
console.log("id",id);
console.log("TCID",TCID);
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id, TCID,2); that.$refs.comTeam.GetTrip(id, TCID,2);
}); });
......
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