Skip to content

S
SuperMan
Commit 0c687dfc authored by 罗超's avatar 罗超
Browse files
Options

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

parents b5380156 c6924936
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8978 additions and 11298 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ 0c687dfc
......@@ -108,6 +108,8 @@
width: 216px;
}
._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;}
._icon_btn i.icon-zhifupeizhiguanli{background-color: #1296db;font-size: 16px;}
.boss_btn_tips,.boss_btn{
text-align: center;
}
......@@ -642,7 +644,10 @@
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item" :content="$t('fnc.tzjyriqi')" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
</el-tooltip>
<el-tooltip class="item" content="交易方式" placement="top" v-if="active==2 && istransaction == true">
<i v-if="active==2" class="iconfont icon-zhifupeizhiguanli"
@click="showjiaoyi(item.FrID)"></i>
</el-tooltip>
</td>
</tr>
......@@ -723,6 +728,32 @@
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<!-- 修改交易方式 -->
<el-dialog title="修改交易方式" width="600px"
:visible.sync="transactionmode" center :before-close="closeChangeMachie">
<el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>收款账户：
<el-select filterable v-model='x.AccountTypeId' placeholder="" @change="getAccountList2(x.AccountTypeId,y)"
class="w150 _border_b_1">
<el-option v-for='item in AccList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
<el-select filterable v-model='x.AccountId' placeholder="" @change="getAccountList3(x,y)"
class="w250 _border_b_1" >
<el-option v-for='item in x.list' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</p>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="transactionmode=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<el-dialog title="一键审批" width="400px" :visible.sync="BOSSDialog" center :close-on-press-escape="false" :close-on-click-modal="false" >
<template v-if="!BOSSDialogText">
......@@ -1043,6 +1074,11 @@ export default {
IsAdvanceFinance:1,
},
costList:[],
transactionmode:false,
accountList2:[],
trabeList:[],//获取的交易方式列表
alltransaction:[],
istransaction:false,
......@@ -1058,6 +1094,9 @@ export default {
if(ActionMenuCode.indexOf('F_HandWithFee')!=-1){
this.HandShow=true;
}
if(ActionMenuCode.indexOf('F_Trademodify')!=-1){
this.istransaction=true;
}
if(this.$route.query.returnCode){
this.active = this.$route.query.returnCode;
this.msg.Conditon = this.$route.query.returnCode;
......@@ -1471,6 +1510,27 @@ export default {
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){
this.AccList = res.data.data;
let alltransaction = []
this.AccList.forEach(x=>{
let obj = {
Id:x.ID,
list:[]
}
this.apipost('FinancialInstitutions_post_GetALLAccountList', {
TypeId: x.ID
}, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
data.forEach(x => {
x.allName = x.BackNo + "(" + x.Alias + ")";
x.Name = x.Alias;
})
obj.list = data
}
}, err => {})
this.alltransaction.push(obj)
})
}else{
this.$message.error(res.data.message);
}
......@@ -1902,8 +1962,67 @@ export default {
path = 'addFinancialGZDocuments'
this.$router.push({ name: path,query:{"FrID":id,"edit":1,blank:'y',tab:'修改财务单据'} })
}
// this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
},
showjiaoyi(FrId){//弹出交易方式修改
this.apipost('Financial_get_GetFinanceTrabeList', {FrId:FrId}, res => {
if (res.data.resultCode == 1) {
this.trabeList = res.data.data
this.trabeList.forEach(x=>{
this.alltransaction.map(j=>{
if(x.AccountTypeId == j.Id){
x.list = j.list
return
}
})
})
this.transactionmode = true
}
}, err => {})
},
getAccountList2(AccountTypeId,y){//获取账户类型对应下的账户列表
this.alltransaction.map(x=>{
if(x.Id == AccountTypeId){
this.trabeList[y].list = x.list;
return
}
})
},
getAccountList3(x,y){
x.list.map(item=>{
if(x.AccountId == item.ID){
this.trabeList[y].Type = item.BankType;
return
}
})
},
getAccountListtype(AccountId){
this.accountList2.map(x=>{
if(x.ID == AccountId){
this.FinanceTrabeMsg.Type = x.BankType
return
}
})
},
preservetransaction(){//保存交易方式
let msg = []
this.trabeList.forEach(x=>{
let obj ={
ID:x.ID,
Type:x.Type,
AccountId:x.AccountId,
}
msg.push(obj)
})
this.apipost('Financial_get_SetFinanceTrabeInfo', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.transactionmode = false
this.getPageList()
}else{
this.Error(res.data.message);
}
}, err => {})
}
},
watch:{
}
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 0c687dfc
......@@ -375,6 +375,26 @@
</div>
</template>
</el-dialog>
<!-- 修改费用类型 -->
<el-dialog title="修改费用类型" width="400px"
:visible.sync="costmode" center >
<el-form label-width="110px">
<div class="rb_top_row _r_mb5" v-for='(x,y) in trabeList' :key='y'>
<p>费用类型：
<el-select filterable v-model='x.CostTypeId' placeholder="" @change="getAccountList2(x.CostTypeId,y)"
class="w250 _border_b_1">
<el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID' >
</el-option>
</el-select>
</p>
</div>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="costmode=false">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="preservetransaction()">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -455,8 +475,23 @@ Vue.component('table-operation',{ //查看操作按钮
class="iconfont icon-zhuanhuan1" @click="getExchange(rowData,index)">
</i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="费用类型" placement="top">
<i style="width: 30px;
height: 30px;
display: inline-block;
color: white !important;
border-radius: 50%;
text-align: center;
line-height: 30px;
margin-right: 10px;
cursor: pointer;
background-color: #47BF8C;
outline: none;" class="iconfont icon-feiyongleixing" v-if="Finance_ExpenseType==true && (rowData.Type==2 || rowData.Type==1)" @click="showfeiy(rowData)">
</i>
</el-tooltip>
</span>`,
props:{
rowData:{
type:Object
},
......@@ -467,6 +502,19 @@ Vue.component('table-operation',{ //查看操作按钮
type:Number
}
},
data(){
return{
Finance_ExpenseType:false
}
},
created(){
let userinfo = this.getLocalStorage();
let ActionMenuCode=userinfo.ActionMenuCode;
if(ActionMenuCode.indexOf('Finance_ExpenseType')!=-1){
this.Finance_ExpenseType=true;
}
},
methods:{
goUrl(path){
// let routeData = this.$router.resolve({
......@@ -482,6 +530,9 @@ Vue.component('table-operation',{ //查看操作按钮
getExchange(rowData,index){
this.MsgBus.$emit('getRecQuery',rowData.FrID);
},
showfeiy(rowData){
this.MsgBus.$emit('showfeiyong',rowData);
}
}
})
Vue.component('table-RecPay',{ //收支样式
......@@ -921,7 +972,9 @@ export default {
],
pageSize:5,
pageIndex:1,
heightQueryBox:false
heightQueryBox:false,
costmode:false,//费用类型的修改弹窗
trabeList:[],//修改费用类型的下啦数据
}
},created(){
if(this.$route.query.returnCode){
......@@ -993,6 +1046,9 @@ export default {
that.zhuanjiaoMsg.FrIDList.push(FrID);
that.zhuanjiaoBox = true;
});
that.MsgBus.$on('showfeiyong',function(row){
that.showfeiyong(row)
})
},methods:{
customCompFunc(params){
},
......@@ -1420,6 +1476,43 @@ export default {
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
},
showfeiyong(row){
this.apipost('Financial_get_GetFinanceCostTypeList', {FrId:row.FrID}, res => {
if (res.data.resultCode == 1) {
this.trabeList = res.data.data
this.costmode = true
}
}, err => {})
},
getAccountList2(val,index){
this.GetCostTypeList.map((x)=>{
if(x.ID == val){
this.trabeList[index].CostTypeName = x.Name;
return
}
})
},
preservetransaction(){//保存费用类型的修改
let msg = []
this.trabeList.forEach(x=>{
let obj ={
ID:x.ID,
FinanceId:x.FinanceId,
CostTypeId:x.CostTypeId,
CostTypeName:x.CostTypeName,
}
msg.push(obj)
})
this.apipost('Financial_get_SetFinanceCostTypeInfo', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.costmode = false
this.getPageList()
}else{
this.Error(res.data.message);
}
}, err => {})
}
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 0c687dfc
......@@ -689,10 +689,10 @@ Vue.component("TCIDJump", {
// 团队跳转
template: `
<div>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID,rowData)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12||rowData.DataType===13">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
......@@ -715,11 +715,19 @@ Vue.component("TCIDJump", {
}
},
methods: {
goUrl(path, id) {
this.$router.push({
path: "/" + path,
query: { id: id, blank: "y" }
});
goUrl(path, id ,row) {
if(row.TeamType==2){//为一日游的时候跳转到一日游团控列表
this.$router.push({
path: "/oneDayTrip" ,
query: { id: id, blank: "y" }
});
}else{
this.$router.push({
path: "/" + path,
query: { id: id, blank: "y" }
});
}
},
goUrlVisa(path, id) {
this.$router.push({
......@@ -732,7 +740,7 @@ Vue.component("TCIDJump", {
Vue.component("TCNUMJump", {
// 团队跳转
template: `<div>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===2" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
......@@ -820,11 +828,19 @@ Vue.component("TCNUMJump", {
});
},
goUrl(path, id) {
this.$router.push({
goUrl(path, id,row) {
if(row.TeamType==2){//为一日游的时候跳转到一日游团控列表
this.$router.push({
path: "/oneDayTrip" ,
query: { id: row.TCID, blank: "y" }
});
}else{
this.$router.push({
path: "/" + path,
query: { tcmun: id, blank: "y" }
});
}
},
goUrlExtend(path, id) {
this.$router.push({
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 0c687dfc
......@@ -216,7 +216,7 @@
<span style="color:green">{{subItem.NewHotelName}}</span>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<comCheckHotel :ref="'comCheckHotel'+index+subIndex+''" v-on:childHotel="childHotelList"
:UseDate="item.UseTimeStr" :Country="651">
:UseDate="item.UseTimeStr" :Country="ChooseCountry">
</comCheckHotel>
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......@@ -683,7 +683,8 @@
HouseNum: 0,
BookNum: 0
},
]
],
ChooseCountry:"651"
}
},
components: {
......@@ -1206,6 +1207,14 @@
if (this.$route.query.LineId) {
this.LineId = this.$route.query.LineId;
}
if(this.LineId==90)
{
this.ChooseCountry=2;
}
else if(this.LineId==14)
{
this.ChooseCountry=651;
}
this.GetAuth();
this.getAllCurrency();
this.LeaderName = this.$route.query.LeaderName;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 0c687dfc
......@@ -153,7 +153,7 @@
<span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span>
<span v-else-if="item.HighSpeedPayType === 8">酒店接送</span>
<span v-else></span>
</br>
<br/>
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td>
<td>
......@@ -498,7 +498,7 @@
</td>
<td v-if="childIndex==0" :rowspan="3">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
......@@ -594,8 +594,9 @@
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 12">网订</span>
<span v-else></span>
</br>
<br/>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 0c687dfc
......@@ -172,8 +172,8 @@
<td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<el-option :label='$t("ground.xianfu")' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option :label='$t("ground.qiandan")' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option :label='$t("ground.xianfu")' :value='1' v-if="subItem.PayStyleExt==1||LineId==90"></el-option>
<el-option :label='$t("ground.qiandan")' :value='2' v-if="subItem.PayStyleExt==2||LineId==90"></el-option>
<el-option :label='$t("ground.shiwudk")' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option :label='$t("ground.yufu")' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option :label='$t("ground.yufukuandk")' :value='5' v-if="subItem.PayStyleExt==5">
......
src/components/Restaurant/demesticRestaurantInfoManage.vue
View file @ 0c687dfc
......@@ -1078,23 +1078,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="美食分类" prop="FoodType">
<!-- <el-select
v-model="addMsg.FoodType"
class="multiple_input w300"
:placeholder="$t('pub.pleaseSel')"
@change="getFoodTypeList(addMsg.FoodType)"
>
<el-option label="不限" :value="0"></el-option>
<el-option
v-for="item in FoodTypeList"
:key="item.ID"
:label="item.Name"
:value="item.ID"
>
</el-option>
</el-select> -->
<!-- <el-form-item label="美食分类" prop="FoodType">
<el-cascader
style="width:300px"
v-model="addMsg.FoodType"
......@@ -1109,6 +1093,13 @@
}"
clearable>
</el-cascader>
</el-form-item> -->
<el-form-item label="美食分类" prop="FoodType">
<el-select v-model="addMsg.FoodType" class='w300' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in FoodTypeList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('Operation.Op_price')">
<el-select
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0c687dfc
......@@ -546,7 +546,7 @@
<span>{{$t('salesModule.XSQW')}}</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}{{$t('salesModule.Hour')}}</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<p v-if="(item.LineID==14 || item.LineID==90) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 0c687dfc
......@@ -1615,6 +1615,9 @@
this.queryMsg = this.$store.state.pageCondition
}
}
if(this.$route.query.id){
this.queryMsg.TCID = this.$route.query.id
}
var myDate = new Date()
var nowDate =
myDate.getFullYear() +
......
src/components/dmc/manager/tripsManager.vue
View file @ 0c687dfc
......@@ -410,6 +410,16 @@
<div class="TC_Content TravelControlList">
<div class="query-box">
<ul>
<li>
<span>
<em>线路</em>
<el-select v-model="queryMsg.LineId" class="w150" :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList(queryMsg.LineId,true)" filterable>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
......@@ -617,7 +627,7 @@
</template>
</tbody>
<tr v-show="queryMsg.noData">
<td colspan="6">{{$t('system.content_noData')}}</td>
<td colspan="6" style="text-align:center;height:40px;">{{$t('system.content_noData')}}</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
......@@ -650,7 +660,7 @@
queryMsg: {
pageIndex: 1,
pageSize: 5,
LineId: 14,
LineId: 0,
LineteamId: 0,
TCNUM: "",
StartGroupDate: "",
......@@ -755,23 +765,58 @@
getLineList() {
this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
let lineArr = res.data.data;
this.queryCommonData.LineList=[];
lineArr.forEach(x=>{
if(x.LineID==14||x.LineID==90){
this.queryCommonData.LineList.push(x);
}
})
let obj = {
LineName:'不限',
LineID:0
}
this.queryCommonData.LineList.unshift(obj);
}
});
},
//获取系列列表
getLineTeamList() {
this.queryMsg.LineteamId = 0;
//获取系列列表
getLineTeamList(lineId, isDefault) {
//查询线路名
if (isDefault) {
this.queryMsg.LineteamId = 0;
}
let msg = {
lineID: this.queryMsg.LineId,
lineID: lineId,
isTOOP: 1
};
var that = this;
//获取当前选中的对象
let obj = {};
obj = that.queryCommonData.LineList.find(item => {
return item.LineID === lineId;
});
this.apipost("team_post_GetList", msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data;
}
});
},
// //获取系列列表
// getLineTeamList() {
// this.queryMsg.LineteamId = 0;
// let msg = {
// lineID: this.queryMsg.LineId,
// isTOOP: 1
// };
// this.apipost("team_post_GetList", msg, res => {
// if (res.data.resultCode == 1) {
// this.queryCommonData.LineTeamList = res.data.data;
// }
// });
// },
//新获取列表数据
getControlList() {
this.loading = true;
......@@ -812,8 +857,9 @@
},
},
mounted() {
this.getLineList();
this.getCompanyList();
this.getLineTeamList();
this.getLineTeamList(0,true);
},
created() {
var myDate = new Date();
......
src/components/index.vue
View file @ 0c687dfc
......@@ -1851,15 +1851,10 @@
testApi() {
this.apipost(
"sellorder_post_GetMiniAppTravelOrderList", {
"MiniAppUserId": 113859,
pageIndex:1,
pageSize:5,
},
res => {
console.log("res",res.data);
if (res.data.resultCode == 1) {
}
}
);
},
......
src/components/leaderPay2.vue
View file @ 0c687dfc
......@@ -422,8 +422,9 @@
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 12">网订</span>
<span v-else></span>
</br>
<br/>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
......@@ -520,12 +521,12 @@
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else></span>
</br>
<br/>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 0c687dfc
......@@ -9,8 +9,7 @@
</template>
<template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="EditBtn" type="button" class="fr normalBtn mb30" value="保存"
@click="saveList(1)" />
<input v-if="EditBtn" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</template>
</li>
</ul>
......@@ -133,8 +132,8 @@
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='5'></el-option>
<el-option label='预付' value='4'></el-option>
<el-option label='网订' value='12'></el-option>
</el-select>
</td>
</tr>
<tr>
......@@ -161,7 +160,7 @@
export default {
data() {
return {
EditBtn:false,//房餐景点修改权限
EditBtn: false, //房餐景点修改权限
defaultSelectValue: 0,
DataList: [],
roomList: [],
......@@ -172,7 +171,7 @@
IsOperation: '',
//是否禁用按钮
IsDisabled: false,
LineId:0,//线路编号
LineId: 0, //线路编号
}
},
methods: {
......@@ -268,7 +267,7 @@
}, err => {})
},
CheckAuth() {
CheckAuth() {
var actionCode = this.$AuthCode.EditRoomDinnerTIcket;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
......@@ -281,9 +280,8 @@
this.CheckAuth();
this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal;
if(this.$route.query.LineId)
{
this.LineId=this.$route.query.LineId;
if (this.$route.query.LineId) {
this.LineId = this.$route.query.LineId;
}
this.GuestNum = this.$route.query.GuestNum;
this.getList();
......
src/components/scenicSpot/domesticScenicSpotInfoManage.vue
View file @ 0c687dfc
......@@ -721,7 +721,7 @@
<el-form-item :label="$t('scen.sc_resName')" prop="Name">
<el-input type="text" v-model="addMsg.Name" maxlength="100" class="w300"></el-input>
</el-form-item>
<el-form-item label="景区分类" prop="FoodType">
<!-- <el-form-item label="景区分类" prop="FoodType">
<el-cascader
style="width:300px"
@change="handleChange"
......@@ -737,6 +737,12 @@
}"
clearable>
</el-cascader>
</el-form-item> -->
<el-form-item label="景区分类" prop="FoodType">
<el-select v-model="addMsg.FoodType" class='w300' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in scenicList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否上架" prop="IsShelves">
<el-radio v-model="addMsg.IsShelves" :label="0">上架</el-radio>
......@@ -945,6 +951,12 @@
placeholder="选择时间">
</el-time-select>
</el-form-item>
<el-form-item label="免费">
<el-select v-model="addMsg.IsFree" class='multiple_input' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</template>
</div>
......@@ -1249,7 +1261,6 @@
StopTime:"",
}
],
FoodType:0,
IsShelves:0,
},
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 0c687dfc
......@@ -797,7 +797,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否免费">
<el-form-item label="免费">
<el-select v-model="addMsg.IsFree" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in IsFreeList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
......
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