Skip to content

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

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

parents 535fc5bb b8761b6e
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 48 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ ee41dab4
...@@ -942,12 +942,12 @@ ...@@ -942,12 +942,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4"> <!-- <el-col :span="4">
...@@ -2678,10 +2678,10 @@ ...@@ -2678,10 +2678,10 @@
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) Number(this.addMsg.OldPeopleNum)
this.addMsg.YSeatNum =
Number(this.addMsg.ManNum) + var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
Number(this.addMsg.ChirdNum) + (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
Number(this.addMsg.OldPeopleNum) this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
}, },
getTotalPrice () { getTotalPrice () {
this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1 this.addMsg.ChirdNum = this.addMsg.ChirdNoNeedBedNum * 1 + this.addMsg.ChirdNeedBedNum * 1
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ ee41dab4
...@@ -733,7 +733,7 @@ ...@@ -733,7 +733,7 @@
<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-input v-model='addMsg.Unit_Price' @keyup.native="checkPrice(addMsg,'Unit_Price');getTotalPrice()"></el-input>
</el-form-item> </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>
...@@ -845,12 +845,12 @@ ...@@ -845,12 +845,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1176,12 +1176,12 @@ ...@@ -1176,12 +1176,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input="getNumber()"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -3053,10 +3053,10 @@ export default { ...@@ -3053,10 +3053,10 @@ export default {
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum); Number(this.addMsg.OldPeopleNum);
this.addMsg.YSeatNum =
Number(this.addMsg.ManNum) + var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
Number(this.addMsg.ChirdNum) + (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
Number(this.addMsg.OldPeopleNum); this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
}, },
getTotalPrice() { getTotalPrice() {
if (this.addMsg.GroupType !=5) { if (this.addMsg.GroupType !=5) {
......
src/components/SalesModule/productQuery.vue
View file @ ee41dab4
...@@ -366,12 +366,12 @@ ...@@ -366,12 +366,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -1577,7 +1577,9 @@ ...@@ -1577,7 +1577,9 @@
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.SafeNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + this.addMsg.SafeNum = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.YSeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum)) var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
(Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
this.autoRemarks("VisaNum", "不要签证数量") this.autoRemarks("VisaNum", "不要签证数量")
}, },
getTotalPrice() { getTotalPrice() {
...@@ -1758,11 +1760,13 @@ ...@@ -1758,11 +1760,13 @@
this.$message.warning('保险数量不能大于人数总和！') this.$message.warning('保险数量不能大于人数总和！')
return return
} }
// if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNum)+Number(this.addMsg.OldPeopleNum)+Number(this.addMsg.BabyNum))<Number(this.addMsg.AirticketNum))
// { // if((Number(this.addMsg.ManNum)+Number(this.addMsg.ChirdNoNeedBedNum)+Number(this.addMsg.ChirdNeedBedNum)+Number(this.addMsg.OldPeopleNum))
// this.$message.warning('机票数量不能大于人数总和！') // <(Number(this.addMsg.YSeatNum)+Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum)))
// return // {
// } // this.$message.warning('机票数量不能大于人数总和！')
// return
// }
if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) { if (Number(this.addMsg.ChirdNeedBedNum) > Number(this.addMsg.ChirdNum)) {
this.$message.warning('儿童占床不能大于儿童数！') this.$message.warning('儿童占床不能大于儿童数！')
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ ee41dab4
...@@ -157,10 +157,10 @@ ...@@ -157,10 +157,10 @@
<el-tooltip v-else class="item" effect="dark" content="修改备注" placement="top-start"> <el-tooltip v-else class="item" effect="dark" content="修改备注" placement="top-start">
<el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button> <el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" content="结算" placement="top-start"> <el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算" placement="top-start">
<el-button type="primary" style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)' icon="iconfont icon-qian"></el-button> <el-button type="primary" style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)' icon="iconfont icon-qian"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" content="旅客名单" placement="top-start"> <el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="旅客名单" placement="top-start">
<el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button> <el-button v-show='item.visaManagementId>0' type="primary" style='background:#00a1f1; border-color:#00a1f1' @click='goUrlT(item)' icon="iconfont icon-bumen"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.income<=0&&item.visaOrderStatus==1" class="item" effect="dark" content="取消" placement="top-start"> <el-tooltip v-if="item.income<=0&&item.visaOrderStatus==1" class="item" effect="dark" content="取消" placement="top-start">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ ee41dab4
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
<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-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-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>
...@@ -945,12 +945,12 @@ ...@@ -945,12 +945,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1231,12 +1231,12 @@ ...@@ -1231,12 +1231,12 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="商务舱" prop="ESeatNum"> <el-form-item label="商务舱" prop="ESeatNum">
<el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.ESeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="头等舱" prop="FSeatNum"> <el-form-item label="头等舱" prop="FSeatNum">
<el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input> <el-input v-model='addMsg.FSeatNum' @input='getNumber()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
...@@ -3008,10 +3008,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue"; ...@@ -3008,10 +3008,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
Number(this.addMsg.ChirdNum) + Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum); Number(this.addMsg.OldPeopleNum);
this.addMsg.YSeatNum = var SeatNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))-
Number(this.addMsg.ManNum) + (Number(this.addMsg.ESeatNum)+Number(this.addMsg.FSeatNum));
Number(this.addMsg.ChirdNum) + this.addMsg.YSeatNum = SeatNum<0?0:SeatNum;
Number(this.addMsg.OldPeopleNum);
let totalNum = let totalNum =
Number(this.addMsg.AirticketNum) + Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) + Number(this.addMsg.ManNum) +
......
src/components/busManagement/BusApportionManagement.vue
View file @ ee41dab4
...@@ -151,10 +151,10 @@ ...@@ -151,10 +151,10 @@
></v-table> ></v-table>
<div class="_bus_edit _scrollbar" v-if="addShow" :class="addShow==true?'BusedHeight':''"> <div class="_bus_edit _scrollbar" v-if="addShow" :class="addShow==true?'BusedHeight':''">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="21">
<p class="_tit">添加分摊</p> <p class="_tit">添加分摊</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="3" class="_add_saveBtn">
<button <button
type="button" type="button"
class="normalBtn" class="normalBtn"
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="客户名称"> <el-form-item label="客户名称">
<el-select filterable v-model='customId' placeholder="客户名称" @change="GetClientAccountList(customId)" class="w200 _border_b_1"> <el-select filterable v-model='customId' placeholder="客户名称" @change="GetClientAccountList(customId)" class="_border_b_1">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
:label='item.Name' :label='item.Name'
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="付款账户"> <el-form-item label="付款账户">
<el-select filterable v-model='addMsg.ClientID' placeholder="请选择付款账户" class="w200 _border_b_1"> <el-select filterable v-model='addMsg.ClientID' placeholder="请选择付款账户" class="_border_b_1">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ClientAccountListS' <el-option v-for='item in ClientAccountListS'
:label='item.allName' :label='item.allName'
...@@ -247,13 +247,7 @@ ...@@ -247,13 +247,7 @@
<el-row> <el-row>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="金额" prop="f_UnitPrice"> <el-form-item label="金额" prop="f_UnitPrice">
<el-input v-model="addMsg.f_UnitPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'f_UnitPrice'),getTotalMoney()" maxlength="20"></el-input> <el-input v-model="addMsg.f_UnitPrice" placeholder="请输入" @keyup.native="checkPrice(addMsg,'f_UnitPrice'),getTotalMoney(),getSingelePrice()" maxlength="20"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="汇率">
<el-input v-model="addMsg.f_rate" placeholder="请输入" @keyup.native="checkRate(addMsg,'f_rate')" maxlength="20" class="w90"></el-input>
<el-input disabled class="w100" v-model="TotalMoney"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
...@@ -268,6 +262,12 @@ ...@@ -268,6 +262,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :gutter="35">
<el-form-item label="汇率">
<el-input v-model="addMsg.f_rate" placeholder="请输入" @keyup.native="checkRate(addMsg,'f_rate'),getTotalMoney()" maxlength="20" class="w90"></el-input>
<el-input disabled class="w100" v-model="TotalMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35"> <el-col :span="4" :gutter="35">
<el-form-item label="总价"> <el-form-item label="总价">
<el-input disabled v-model="TotalMoney"></el-input> <el-input disabled v-model="TotalMoney"></el-input>
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="客户名称" class='multiple_input countryList'> <el-form-item label="客户名称" class='multiple_input countryList'>
<el-select filterable v-model='exportInfo.ClientId' placeholder="请选择客户名称" class="w200 _border_b_1"> <el-select filterable v-model='exportInfo.ClientId' placeholder="请选择客户名称" class=" _border_b_1">
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
:label='item.Name' :label='item.Name'
...@@ -812,8 +812,8 @@ export default { ...@@ -812,8 +812,8 @@ export default {
getInfo(){ getInfo(){
this.addShow = true; this.addShow = true;
var rate = this.addMsg.f_currency; var rate = this.addMsg.f_currency;
this.getRate(rate);
this.initAddMsg(); this.initAddMsg();
this.getRate(rate);
}, },
//输入金额得到总价 //输入金额得到总价
getTotalMoney(){ getTotalMoney(){
......
src/plug/index.js
View file @ ee41dab4
...@@ -553,7 +553,7 @@ export default { ...@@ -553,7 +553,7 @@ export default {
co(function* () { co(function* () {
for (let index = 0; index < files.length; index++) { for (let index = 0; index < files.length; index++) {
let fileName = nameList[index] let fileName = nameList[index]
fileName = path + fileName + "." + files[index].name.split('.').pop() fileName ="/New"+ path + fileName + "." + files[index].name.split('.').pop()
var result = yield oss.multipartUpload(fileName, files[index], { var result = yield oss.multipartUpload(fileName, files[index], {
progress: function* (p) {}, progress: function* (p) {},
mime: 'application/octet-stream' mime: 'application/octet-stream'
......
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