Skip to content

S
SuperMan
Commit 1a0cecd5 authored by 王悦's avatar 王悦
Browse files
Options

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

parents e4811cdd 480bce7b
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 93 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 1a0cecd5
...@@ -2437,37 +2437,27 @@ ...@@ -2437,37 +2437,27 @@
} }
) )
this.Unit_PriceList=[]; this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => { this.apipost('sellorder_post_GetLessPrice',{"TCID":obj.tcid}, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = { var obj = {
ID: '', ID: '',
LessMoney: '' LessMoney: ''
} }
obj.ID = this.addMsg.TC_Price-i*10; obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10; obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj); this.Unit_PriceList.push(obj);
} }
// this.Unit_PriceList.forEach(person => {
if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) { if(this.Unit_PriceList.findIndex(markers => markers.ID == this.addMsg.Unit_Price)<0) {
var obj = { var obj = {
ID: '', ID: '',
LessMoney: '' LessMoney: ''
} }
obj.ID = this.addMsg.Unit_Price; obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price; obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj); this.Unit_PriceList.push(obj);
} }
// });
//判断下拉价格里面是否包含了成交单价，未包含就添加进来
// const option = {ID:this.addMsg.TC_Price,LessMoney:this.addMsg.TC_Price}
// // 如果数组里面本身不存在这个对象则把这个加进去
// if(JSON.stringify(this.Unit_PriceList).indexOf(JSON.stringify(option))==-1){
// this.Unit_PriceList.push(option); // 进行动态的操作
// }
} }
else{ else{
var obj = { var obj = {
...@@ -2476,7 +2466,7 @@ ...@@ -2476,7 +2466,7 @@
} }
obj.ID = this.addMsg.Unit_Price; obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price; obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj); this.Unit_PriceList.push(obj);
} }
}, err => {}) }, err => {})
...@@ -2585,30 +2575,6 @@ ...@@ -2585,30 +2575,6 @@
this.addMsg.CustomerId = '0' this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
} }
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => {
this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.TC_Price-i*10;
obj.LessMoney = this.addMsg.TC_Price-i*10;
this.Unit_PriceList.push(obj);
}
}
else{
var obj = {
ID: '',
LessMoney: ''
}
obj.ID = this.addMsg.Unit_Price;
obj.LessMoney = this.addMsg.Unit_Price;
this.Unit_PriceList.push(obj);
}
}, err => {})
}, },
getTicheng () { getTicheng () {
//提成 //提成
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 1a0cecd5
...@@ -1045,23 +1045,31 @@ ...@@ -1045,23 +1045,31 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span> <span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price"> <!-- <el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input> <el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()" ></el-input>
</el-form-item> </el-form-item> -->
<!-- <el-form-item label="成交单价" prop="Unit_Price"> <el-form-item label="成交单价" prop="Unit_Price">
<el-select v-model='addMsg.Unit_Price' <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()"> filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
<!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> --> </el-form-item>
<el-form-item> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <el-form-item>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> --> <p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
</el-form-item>
</el-col>
</el-row> </el-row>
<div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div> <div style="width: 100%; border-top:1px dashed #ccc;margin-bottom:25px;"></div>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -1616,7 +1624,7 @@ ...@@ -1616,7 +1624,7 @@
<tr> <tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if="item.tsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')">{{item.tsId}}</a> ;</span><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> --> <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
...@@ -2049,6 +2057,7 @@ export default { ...@@ -2049,6 +2057,7 @@ export default {
isShowHouse: false, isShowHouse: false,
isShowLayerRemarks: false, isShowLayerRemarks: false,
loading: true, loading: true,
isChecked: true,
comSelect: -1, comSelect: -1,
remarksMsg: { remarksMsg: {
OrderId: "0", OrderId: "0",
...@@ -2305,17 +2314,12 @@ export default { ...@@ -2305,17 +2314,12 @@ export default {
} }
}, },
methods: { methods: {
//跳转 //是否可以修改成交单价
goUrlTS (path, id, orderId, title) { canEditUnitPrice() {
this.$router.push({ let userInfo = this.getLocalStorage();
name: path, if (userInfo != null && userInfo.EmployeeId == 1) {
query: { this.isChecked = false;
'id': id, }
'orderId': orderId,
blank: 'y',
tab: title
}
})
}, },
maxCommissionMinusRate: function () { maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
...@@ -2753,7 +2757,7 @@ export default { ...@@ -2753,7 +2757,7 @@ export default {
} }
this.Unit_PriceList=[]; this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => { this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid}, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
...@@ -3784,6 +3788,7 @@ export default { ...@@ -3784,6 +3788,7 @@ export default {
this.getJyfs(); this.getJyfs();
this.getFylx(); this.getFylx();
this.getTuanInfo(); this.getTuanInfo();
this.canEditUnitPrice();
} }
}; };
</script> </script>
......
src/components/SalesModule/productQuery.vue
View file @ 1a0cecd5
...@@ -1481,7 +1481,7 @@ ...@@ -1481,7 +1481,7 @@
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
} }
this.Unit_PriceList=[]; this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => { this.apipost('sellorder_post_GetLessPrice', {"TCID":this.addObj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 1a0cecd5
...@@ -1089,19 +1089,27 @@ ...@@ -1089,19 +1089,27 @@
<span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span> <span class="colorE95252" v-show='!returnPriceShow'>暂无报价！</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5" v-if="isChecked==true">
<el-form-item label="成交单价" prop="Unit_Price"> <el-form-item label="成交单价" prop="Unit_Price">
<!-- <el-select v-model='addMsg.Unit_Price' <el-select v-model='addMsg.Unit_Price'
filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()"> filterable :placeholder="$t('pub.pleaseSel')" @change="getTotalPrice()">
<el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'> <el-option v-for="item in Unit_PriceList" :label='item.LessMoney' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> --> </el-select>
<el-input v-model='addMsg.Unit_Price' :disabled="isChecked" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> <!-- <el-input v-model='addMsg.Unit_Price' :disabled="true" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input> -->
</el-form-item> </el-form-item>
<el-form-item>
<p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p>
</el-form-item>
</el-col>
<el-col :span="5" v-else>
<el-form-item label="成交单价" prop="Unit_Price">
<el-input v-model='addMsg.Unit_Price' class="w210" @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item>
<el-form-item> <el-form-item>
<p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p> <p style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<!-- <p v-if="LessMoney==0" style="line-height: 18px; color: #E95252;">注：如果超出本团的最低让价，差价将由你来承担</p>
<p v-else="LessMoney>0" style="line-height: 18px; color: #E95252;">注：最多少价{{LessMoney}}元，如需少价更多请联系上级主管</p> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1707,7 +1715,6 @@ ...@@ -1707,7 +1715,6 @@
<div class="clearfix RL-MARK"> <div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span> <span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon"> <span class="RL-redType RL-remarkCon">
<span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a> ;</span>
<span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单 <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
{{childItem.PlatformOrder}};</span> {{childItem.PlatformOrder}};</span>
{{childItem.Remarks}} {{childItem.Remarks}}
...@@ -2489,18 +2496,6 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2489,18 +2496,6 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
updateSalesMan:updateSalesMan updateSalesMan:updateSalesMan
}, },
methods: { methods: {
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
name: path,
query: {
'id': id,
'orderId': orderId,
blank: 'y',
tab: title
}
})
},
maxCommissionMinusRate: function () { maxCommissionMinusRate: function () {
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace(/[^\.\d]/g,'');
this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.',''); this.TCMsg.CommissionMinusRate = this.TCMsg.CommissionMinusRate.replace('.','');
...@@ -2849,7 +2844,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -2849,7 +2844,7 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
} }
this.Unit_PriceList=[]; this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {}, res => { this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.TCID}, res => {
this.LessMoney = res.data.data.lessMoney; this.LessMoney = res.data.data.lessMoney;
if (parseFloat(this.LessMoney)>0){ if (parseFloat(this.LessMoney)>0){
for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) { for (var i = 0; i <= parseInt(this.LessMoney)/10; i++) {
......
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