Skip to content

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

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

parents 2cdc4053 e4becfa0
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 99 deletions
src/components/FinancialModule/TradeCommission/CommissionRule.vue
View file @ e0a934ef
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div class="page_FProcessManagement"> <div class="page_FProcessManagement">
<ul class="_nav clearfix"> <ul class="_nav clearfix">
<li style="color: red;">注：门票不计入人头奖励</li> <li style="color: red;">注：门票不计入人头奖励</li>
<input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/> <input type="button" class="hollowFixedBtn" value="新增" @click="AddMsg"/>
<input type="button" class="normalBtn" style="position: absolute; right: 90px;top: 9px;" value="查询" @click="getList"/> <input type="button" class="normalBtn" style="position: absolute; right: 90px;top: 9px;" value="查询" @click="getList"/>
</ul> </ul>
<div <div
class="cm_content" class="cm_content"
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="width:100%;overflow-x: auto;"> <div style="width:100%;overflow-x: auto;">
<table <table
class="po_content singeRowTable" class="po_content singeRowTable"
...@@ -94,10 +94,10 @@ ...@@ -94,10 +94,10 @@
cellspacing="0" cellspacing="0"
cellpadding="0" cellpadding="0"
> >
<tr> <tr>
<td rowspan="2" width="150" style="min-width: 150px;">日本及其他人头奖励<p>成交人数</p></td> <td rowspan="2" width="150" style="min-width: 150px;">日本及其他人头奖励<p>成交人数</p></td>
<th style="min-width: 220px;" <th style="min-width: 220px;"
v-for="( son , sIndex ) in item.AwardRuleList" v-for="( son , sIndex ) in item.AwardRuleList"
:key="sIndex" :key="sIndex"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<div style="width:100%;overflow-x: auto;"> <div style="width:100%;overflow-x: auto;">
<table <table
class="po_content singeRowTable" class="po_content singeRowTable"
...@@ -173,38 +173,38 @@ ...@@ -173,38 +173,38 @@
</div> </div>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">日本及其他人头奖励</p> <p class="ImpressionTicketing-title">日本及其他人头奖励</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.AwardRuleList" :key="index"> v-for="(item,index) in form.AwardRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
:label="form.AwardRuleList.length>0?`开始值 ${index+1} `:` ` " :label="form.AwardRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`AwardRuleList.${index}.StartValue`" :prop="`AwardRuleList.${index}.StartValue`"
:rules="rules.StartValue" :rules="rules.StartValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input> v-model="item.StartValue" clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.AwardRuleList.length>0?`结束值 ${index+1} `:` ` " :label="form.AwardRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`AwardRuleList.${index}.EndValue`" :prop="`AwardRuleList.${index}.EndValue`"
:rules="rules.EndValue" :rules="rules.EndValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input-number type="number" :min="-1" :max="99999999" <el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number> v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.AwardRuleList.length>0?`奖励 ${index+1} `:` ` " :label="form.AwardRuleList.length>0?`奖励 ${index+1} `:` ` "
:prop="`AwardRuleList.${index}.Rate`" :prop="`AwardRuleList.${index}.Rate`"
:rules="rules.Rate" :rules="rules.Rate"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input> v-model="item.Rate"></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -218,36 +218,36 @@ ...@@ -218,36 +218,36 @@
<p class="ImpressionTicketing-title">日本及其他提成比例</p> <p class="ImpressionTicketing-title">日本及其他提成比例</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.ProfitRuleList" :key="index"> <div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.ProfitRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
:label="form.ProfitRuleList.length>0?`开始值 ${index+1} `:` ` " :label="form.ProfitRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`ProfitRuleList.${index}.StartValue`" :prop="`ProfitRuleList.${index}.StartValue`"
:rules="rules.StartValue" :rules="rules.StartValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input> v-model="item.StartValue" clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.ProfitRuleList.length>0?`结束值 ${index+1} `:` ` " :label="form.ProfitRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`ProfitRuleList.${index}.EndValue`" :prop="`ProfitRuleList.${index}.EndValue`"
:rules="rules.EndValue" :rules="rules.EndValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input-number type="number" :min="-1" :max="99999999" <el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number> v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.ProfitRuleList.length>0?`比例 ${index+1} `:` ` " :label="form.ProfitRuleList.length>0?`比例 ${index+1} `:` ` "
:prop="`ProfitRuleList.${index}.Rate`" :prop="`ProfitRuleList.${index}.Rate`"
:rules="rules.Rate2" :rules="rules.Rate2"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<div class="Impression-ratio-box"> <div class="Impression-ratio-box">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input> v-model="item.Rate"></el-input>
<span class="Impression-ratio-right">%</span> <span class="Impression-ratio-right">%</span>
</div> </div>
...@@ -261,38 +261,38 @@ ...@@ -261,38 +261,38 @@
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">欧洲及其他人头奖励</p> <p class="ImpressionTicketing-title">欧洲及其他人头奖励</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.EuropeAwardRuleList" :key="index"> v-for="(item,index) in form.EuropeAwardRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeAwardRuleList.length>0?`开始值 ${index+1} `:` ` " :label="form.EuropeAwardRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`EuropeAwardRuleList.${index}.StartValue`" :prop="`EuropeAwardRuleList.${index}.StartValue`"
:rules="rules.StartValue" :rules="rules.StartValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input> v-model="item.StartValue" clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeAwardRuleList.length>0?`结束值 ${index+1} `:` ` " :label="form.EuropeAwardRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`EuropeAwardRuleList.${index}.EndValue`" :prop="`EuropeAwardRuleList.${index}.EndValue`"
:rules="rules.EndValue" :rules="rules.EndValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input-number type="number" :min="-1" :max="99999999" <el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number> v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeAwardRuleList.length>0?`奖励 ${index+1} `:` ` " :label="form.EuropeAwardRuleList.length>0?`奖励 ${index+1} `:` ` "
:prop="`EuropeAwardRuleList.${index}.Rate`" :prop="`EuropeAwardRuleList.${index}.Rate`"
:rules="rules.Rate" :rules="rules.Rate"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input> v-model="item.Rate"></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -304,43 +304,43 @@ ...@@ -304,43 +304,43 @@
</el-form-item> </el-form-item>
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px"> <el-form-item class="ImpressionTicketing-OuterFrame" label-width="0px">
<p class="ImpressionTicketing-title">欧洲及其他提成比例</p> <p class="ImpressionTicketing-title">欧洲及其他提成比例</p>
<div class="ImpressionTicketing-msgbox" <div class="ImpressionTicketing-msgbox"
v-for="(item,index) in form.EuropeProfitRuleList" :key="index"> v-for="(item,index) in form.EuropeProfitRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeProfitRuleList.length>0?`开始值 ${index+1} `:` ` " :label="form.EuropeProfitRuleList.length>0?`开始值 ${index+1} `:` ` "
:prop="`EuropeProfitRuleList.${index}.StartValue`" :prop="`EuropeProfitRuleList.${index}.StartValue`"
:rules="rules.StartValue" :rules="rules.StartValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input> v-model="item.StartValue" clearable></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeProfitRuleList.length>0?`结束值 ${index+1} `:` ` " :label="form.EuropeProfitRuleList.length>0?`结束值 ${index+1} `:` ` "
:prop="`EuropeProfitRuleList.${index}.EndValue`" :prop="`EuropeProfitRuleList.${index}.EndValue`"
:rules="rules.EndValue" :rules="rules.EndValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input-number type="number" :min="-1" :max="99999999" <el-input-number type="number" :min="-1" :max="99999999"
v-model="item.EndValue" clearable :controls="false"></el-input-number> v-model="item.EndValue" clearable :controls="false"></el-input-number>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.EuropeProfitRuleList.length>0?`比例 ${index+1} `:` ` " :label="form.EuropeProfitRuleList.length>0?`比例 ${index+1} `:` ` "
:prop="`EuropeProfitRuleList.${index}.Rate`" :prop="`EuropeProfitRuleList.${index}.Rate`"
:rules="rules.Rate" :rules="rules.Rate"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<div class="Impression-ratio-box"> <div class="Impression-ratio-box">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input> v-model="item.Rate"></el-input>
<span class="Impression-ratio-right">%</span> <span class="Impression-ratio-right">%</span>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
<div class="ImpressionTicketing-msg-but"> <div class="ImpressionTicketing-msg-but">
...@@ -353,27 +353,27 @@ ...@@ -353,27 +353,27 @@
<p class="ImpressionTicketing-title">年终奖励</p> <p class="ImpressionTicketing-title">年终奖励</p>
<div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.BonusRuleList" :key="index"> <div class="ImpressionTicketing-msgbox" v-for="(item,index) in form.BonusRuleList" :key="index">
<div> <div>
<el-form-item <el-form-item
:label="form.BonusRuleList.length>0?`连续达标 ${index+1} `:` ` " :label="form.BonusRuleList.length>0?`连续达标 ${index+1} `:` ` "
:prop="`BonusRuleList.${index}.StartValue`" :prop="`BonusRuleList.${index}.StartValue`"
:rules="rules.StartValue" :rules="rules.StartValue"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<div class="Impression-ratio-box"> <div class="Impression-ratio-box">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.StartValue" clearable></el-input> v-model="item.StartValue" clearable></el-input>
<span class="Impression-ratio-right">月</span> <span class="Impression-ratio-right">月</span>
</div> </div>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item <el-form-item
:label="form.BonusRuleList.length>0?`奖励 ${index+1} `:` ` " :label="form.BonusRuleList.length>0?`奖励 ${index+1} `:` ` "
:prop="`BonusRuleList.${index}.Rate`" :prop="`BonusRuleList.${index}.Rate`"
:rules="rules.Rate2" :rules="rules.Rate2"
label-width="100px" label-width="100px"
label-position="left"> label-position="left">
<el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999" <el-input onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" :min="0" :max="99999999"
v-model="item.Rate"></el-input> v-model="item.Rate"></el-input>
</el-form-item> </el-form-item>
</div> </div>
...@@ -627,7 +627,7 @@ ...@@ -627,7 +627,7 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.dataList = res.data.data;
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
} }
......
src/components/sale/ExpectedCommission.vue
View file @ e0a934ef
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
</div> </div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 0 0;"> <div class="CommissionLadder Line" style="margin: 0 0 0 0;">
<div class="title"> <div class="title">
<span>日本及其他线小包团、落地团以及单项提成</span> <span>日本及其他线小包团、落地团以及单项提成</span>
</div> </div>
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
<progressComm :commissionratioList="JapaneseProfit"></progressComm> <progressComm :commissionratioList="JapaneseProfit"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line" style="margin: 0 0 0 0;"> <div class="CommissionLadder Line" style="margin: 0 0 0 10px;">
<div class="title"> <div class="title">
<span>欧洲小包团、落地团以及单项提成</span> <span>欧洲小包团、落地团以及单项提成</span>
</div> </div>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</div> </div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div class="CommissionLadder Line" style="margin: 0 10px 10px 0;"> <div class="CommissionLadder Line" style="margin: 0 0 10px 0;">
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p> <p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor"> <div class="CommissionInfor">
<span> <span>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
<progressComm :commissionratioList="JapaneseLine"></progressComm> <progressComm :commissionratioList="JapaneseLine"></progressComm>
</div> </div>
</div> </div>
<div class="CommissionLadder Line"> <div class="CommissionLadder Line" style="margin: 0 0 10px 10px;">
<p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p> <p><span>当月人头奖励/不含门票、包车、国内游以及单团(独立成团)</span><span></span></p>
<div class="CommissionInfor"> <div class="CommissionInfor">
<span> <span>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
2.增加境外散拚提成(日本线.欧洲线分别奖励计算)</br> 2.增加境外散拚提成(日本线.欧洲线分别奖励计算)</br>
3.增加人头奖励(日本线与其他.欧洲线2种)</br> 3.增加人头奖励(日本线与其他.欧洲线2种)</br>
4.所有业绩结算皆以出发日.尾款收齐为基准</br> 4.所有业绩结算皆以出发日.尾款收齐为基准</br>
5.人头奖励包含归属各线所有产品(散拚.一日游.多日游.签证等)</br> 5.人头奖励包不含门票、包车、国内游以及单团(独立成团)</br>
6.人头奖励每月至少20条方可进行奖励!</br> 6.人头奖励每月至少20条方可进行奖励!</br>
7.以上所有核算皆以月为单位.核算基础为出发日或签证收取日算起!</br> 7.以上所有核算皆以月为单位.核算基础为出发日或签证收取日算起!</br>
8.直客部门归属直客业务编制.不参与同业部门业务销售!</br> 8.直客部门归属直客业务编制.不参与同业部门业务销售!</br>
...@@ -621,13 +621,10 @@ ...@@ -621,13 +621,10 @@
this.GNEopleNum+=Number(item.PeopleNum) this.GNEopleNum+=Number(item.PeopleNum)
this.GNCommission+=Number(item.Commission) this.GNCommission+=Number(item.Commission)
}) })
setTimeout(()=>{ let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney]
let arr1 =[this.CommissionInfor.PeopleMoney,this.CommissionInfor.EuropeMoney] let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission]
let arr2 =[this.CommissionInfor.SalesCommission,this.CommissionInfor.JapanCommission,this.CommissionInfor.EuropeCommission,this.GNCommission] this.CommissionJJ = this.CalculatePrice(arr1,0)
this.CommissionJJ = this.CalculatePrice(arr1,0) this.CommissionTC = this.CalculatePrice(arr2,2)
this.CommissionTC = this.CalculatePrice(arr2,2)
},500)
} }
}) })
}, },
......
src/components/sale/components/progressComm.vue
View file @ e0a934ef
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
} }
}else{ }else{
return () => { return () => {
return `连续${row.StartValue}月` return `达标${row.StartValue}月`
} }
} }
......
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ e0a934ef
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
/deep/.line-heigh .el-input-number{ /deep/.line-heigh .el-input-number{
line-height: 32px; line-height: 32px;
} }
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
<div class="time-box center"> <div class="time-box center">
<span>游玩日期：</span> <span>游玩日期：</span>
<div> <div>
<el-date-picker class="w150" v-model='msg.UseDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" <el-date-picker class="w150" v-model='msg.UseDate' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" laceholder="门票日期" @change="getInfo"> :picker-options="beforeCheck" laceholder="门票日期" @change="getInfo">
</el-date-picker> </el-date-picker>
</div> </div>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
<span>选择票型：</span> <span>选择票型：</span>
<div style="display: flex;flex-wrap: wrap;"> <div style="display: flex;flex-wrap: wrap;">
<template v-for="x in types"> <template v-for="x in types">
<el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;margin-bottom: 5px; cursor: pointer;" <el-tag class="time-box-width" :type="x.checked?'':'info'" style="margin-right: 10px;margin-bottom: 5px; cursor: pointer;"
@click="changeDetailListHandler(x)"> @click="changeDetailListHandler(x)">
<a>{{ x.TicketName }}</a> <a>{{ x.TicketName }}</a>
<p style="display: inline-block;margin-left: 5px;"> <p style="display: inline-block;margin-left: 5px;">
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
<template v-for="x in types"> <template v-for="x in types">
<div style="flex-direction: row;" v-if="x.checked"> <div style="flex-direction: row;" v-if="x.checked">
<el-input-number v-model="x.num" @change="changePeople" :min="1" label="购买数量" <el-input-number v-model="x.num" @change="changePeople" :min="1" label="购买数量"
style="margin-bottom: 10px;"></el-input-number> style="margin-bottom: 10px;"></el-input-number>
<!-- <span> {{x.CurrencyName <!-- <span> {{x.CurrencyName
}} </span> --> }} </span> -->
</div> </div>
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
<el-input v-model="msg.EName" placeholder="请输入英文名"/> <el-input v-model="msg.EName" placeholder="请输入英文名"/>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
<el-form-item label="电话" prop="Mobile"> <el-form-item label="电话" prop="Mobile">
<el-input type="Number" v-model="msg.Mobile" placeholder="请输入电话"/> <el-input type="Number" v-model="msg.Mobile" placeholder="请输入电话"/>
...@@ -394,12 +394,12 @@ ...@@ -394,12 +394,12 @@
</div> </div>
</el-form> </el-form>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;">
<el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" <el-input style="width: 100%;" type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
v-model="msg.Remark" placeholder="订单备注"/> v-model="msg.Remark" placeholder="订单备注"/>
</div> </div>
</div> </div>
</div> </div>
<div class="notice"> <div class="notice">
<b>预定须知</b> <b>预定须知</b>
<p>{{detailsObj.BookingInfo}}</p> <p>{{detailsObj.BookingInfo}}</p>
...@@ -439,10 +439,10 @@ ...@@ -439,10 +439,10 @@
</div> </div>
</div> </div>
<div class="right-Money"> <div class="right-Money">
<div> <div>
<span>订单总金额：</span> <span>订单总金额：</span>
<b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }} <b>{{ msg.Money>msg.MailingMoney?msg.Money.toFixed(2):0.0 }}
<span class="fz12" v-if="types&&types.length>0"> <span class="fz12" v-if="types&&types.length>0">
<template v-for="x in types" v-if="checkedTyps==1&&x.checked"> <template v-for="x in types" v-if="checkedTyps==1&&x.checked">
{{x.CurrencyName}} {{x.CurrencyName}}
...@@ -454,8 +454,8 @@ ...@@ -454,8 +454,8 @@
</div> </div>
</div> </div>
<div class="right-Submit"> <div class="right-Submit">
<button class="hollowFixedBtn" v-loading="loading" <button class="hollowFixedBtn" v-loading="loading"
type="primary" type="primary"
:disabled="!isCheck" @click="submit"> :disabled="!isCheck" @click="submit">
提交订单 提交订单
</button> </button>
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
detailsObj: {}, detailsObj: {},
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))); let endTime = new Date(this.getBeforeDate(1,new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime(); return time && endTime.getTime() >= time.getTime();
} }
}, },
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
} }
}, },
err => { err => {
this.Error(err.message) this.Error(err.message)
}); });
}, },
changePeople(val) { changePeople(val) {
...@@ -622,7 +622,7 @@ ...@@ -622,7 +622,7 @@
changeDetailListHandler(e) { changeDetailListHandler(e) {
e.checked = !e.checked e.checked = !e.checked
this.isCheck = this.types.findIndex(x => x.checked) > -1 this.isCheck = this.types.findIndex(x => x.checked) > -1
this.checkedTyps = 0 this.checkedTyps = 0
this.types.forEach(item=>{ if(item.checked==true){ this.checkedTyps++}}) this.types.forEach(item=>{ if(item.checked==true){ this.checkedTyps++}})
if(this.isCheck){ if(this.isCheck){
this.calcMoneyHandler() this.calcMoneyHandler()
...@@ -661,7 +661,7 @@ ...@@ -661,7 +661,7 @@
if(this.types&&this.types.length==0){ if(this.types&&this.types.length==0){
this.Error('暂无报价，无法下单') this.Error('暂无报价，无法下单')
} }
}else{ }else{
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,7 @@
err => {} err => {}
); );
}, },
}, },
mounted() { mounted() {
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
...@@ -718,6 +718,5 @@ ...@@ -718,6 +718,5 @@
this.getInfo() this.getInfo()
} }
}; };
</script> </script>
\ No newline at end of file
src/components/scenicSpot/Singleticket/SingleticketList.vue
View file @ e0a934ef
...@@ -306,7 +306,7 @@ export default { ...@@ -306,7 +306,7 @@ export default {
ViewType: 2, ViewType: 2,
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
let endTime = new Date(this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))); let endTime = new Date(this.getBeforeDate(1, new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime(); return time && endTime.getTime() >= time.getTime();
} }
}, },
......
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