Skip to content

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

支付方式修改

parent cdc8e5b5
Show whitespace changes
Inline Side-by-side
Showing with 42 additions and 29 deletions
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 8ef67977
...@@ -116,12 +116,13 @@ ...@@ -116,12 +116,13 @@
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' value='3'></el-option> <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='公司合团支付' value='6'></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
</td> </td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6"> <tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" > <td width="60" style="text-align:right;">
付款团号: 付款团号:
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
...@@ -234,7 +235,6 @@ ...@@ -234,7 +235,6 @@
this.list.forEach(item => { this.list.forEach(item => {
item.DinnerList = []; item.DinnerList = [];
item.DiningSummaryList.forEach(x => { item.DiningSummaryList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
x.DiningReserveType = x.DiningReserveType.toString(); x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x); this.calculationPrice(x);
item.DinnerList.push({ item.DinnerList.push({
...@@ -318,6 +318,8 @@ ...@@ -318,6 +318,8 @@
if (subItem.NewDiningID == x.ID) { if (subItem.NewDiningID == x.ID) {
subItem.Address = x.Address; subItem.Address = x.Address;
subItem.Tel = x.Tel; subItem.Tel = x.Tel;
subItem.PayStyle=x.PayStyle;
subItem.PayStyleExt=x.PayStyle;
} }
}) })
}, },
......
src/components/Restaurant/restaurantInfoManage.vue
View file @ 8ef67977
...@@ -757,7 +757,7 @@ ...@@ -757,7 +757,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch> <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -916,6 +916,8 @@ ...@@ -916,6 +916,8 @@
navbar:false, navbar:false,
title:false title:false
}, },
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [], images: [],
selectAddress: false, selectAddress: false,
addimg: false, addimg: false,
...@@ -1460,6 +1462,12 @@ ...@@ -1460,6 +1462,12 @@
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
userInfo.RB_Branch_id == 49) {
this.IsHaveAuth = 1;
}
this.GetPayList(); this.GetPayList();
this.GetDiningTypeList(); this.GetDiningTypeList();
this.GetDiningPriceTypeList(); this.GetDiningPriceTypeList();
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 8ef67977
...@@ -105,17 +105,18 @@ ...@@ -105,17 +105,18 @@
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option> <el-option label='请选择' :value='0' ></el-option>
<el-option label='现付' value='1'></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' value='2'></el-option> <el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' value='5'></el-option> <el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' value='4'></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='公司合团支付' value='6'></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
<tr v-show="subItem.PayStyle==6"> <tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" > <td width="60" style="text-align:right;">
付款团号： 付款团号：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
...@@ -130,7 +131,6 @@ ...@@ -130,7 +131,6 @@
<el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input> <el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
...@@ -192,7 +192,6 @@ ...@@ -192,7 +192,6 @@
this.DataList = res.data.data; this.DataList = res.data.data;
this.DataList.forEach(item => { this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(x => { item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x); this.calculationPrice(x);
if (x.CombinationNum == '' || x.CombinationNum == null) { if (x.CombinationNum == '' || x.CombinationNum == null) {
x.CombinationNum = this.$route.query.NewCombinationNum; x.CombinationNum = this.$route.query.NewCombinationNum;
...@@ -213,9 +212,8 @@ ...@@ -213,9 +212,8 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum) if (!subItem.UsePeopleNum) {
{ subItem.UsePeopleNum = 0;
subItem.UsePeopleNum=0;
} }
}); });
}) })
...@@ -229,9 +227,8 @@ ...@@ -229,9 +227,8 @@
if (!subItem.Discount) { if (!subItem.Discount) {
subItem.Discount = 0; subItem.Discount = 0;
} }
if(!subItem.UsePeopleNum) if (!subItem.UsePeopleNum) {
{ subItem.UsePeopleNum = 0;
subItem.UsePeopleNum=0;
} }
}); });
}) })
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 8ef67977
...@@ -658,7 +658,7 @@ ...@@ -658,7 +658,7 @@
<el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch> <el-switch v-model="addMsg.AppointmentStyle" :active-value="inActive" :inactive-value="notInActive"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -804,11 +804,11 @@ ...@@ -804,11 +804,11 @@
navbar:false, navbar:false,
title:false title:false
}, },
//是否有权限操作支付方式
IsHaveAuth: 0,
images: [], images: [],
selectAddress: false, selectAddress: false,
addimg: false, addimg: false,
// imgArray: [],
// PicPathArray: [],
imgKeyword: "", imgKeyword: "",
imglistArry: [], imglistArry: [],
openplatform: "", openplatform: "",
...@@ -1322,6 +1322,12 @@ ...@@ -1322,6 +1322,12 @@
}, },
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage()
//有权限操作的部门
if (userInfo.RB_Department_Id == 240 || userInfo.RB_Department_Id == 1 || userInfo.RB_Department_Id == 3 ||
userInfo.RB_Branch_id == 49) {
this.IsHaveAuth = 1;
}
this.GetPayList(); this.GetPayList();
this.ID = this.$route.query.id; this.ID = this.$route.query.id;
var jsArray = document.getElementsByTagName("script"); var jsArray = document.getElementsByTagName("script");
......
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