Commit 0ebe348b authored by 华国豪's avatar 华国豪 🙄
parents 518d1042 30593e80
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_b8jianjuawm.css"; @import "//at.alicdn.com/t/font_635492_ea4o8lkzm2b.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
......
This diff is collapsed.
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
font-size:18px; font-size:18px;
color:#333333; color:#333333;
} }
.Summary_login_Div .icon-login-name,.icon-login-password{ .Summary_login_Div .icon-login-name, .Summary_login_Div .icon-login-password{
width:16px; width:16px;
height:15px; height:15px;
display:inline-block; display:inline-block;
......
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
</select> </select>
</span> </span>
<span class="ql-formats" v-if="toolbar.fontColor||toolbar.fontBackgroundColor"> <span class="ql-formats" v-if="toolbar.fontColor||toolbar.fontBackgroundColor">
<span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor"> <span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor" style="display:none">
<span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-35"> <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-35">
<svg viewbox="0 0 18 18"> <svg viewbox="0 0 18 18">
<line class="ql-color-label ql-stroke ql-transparent" x1="3" x2="15" y1="15" y2="15"></line> <line class="ql-color-label ql-stroke ql-transparent" x1="3" x2="15" y1="15" y2="15"></line>
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span> tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
</span> </span>
<select class="ql-color" style="display: none;" v-if="toolbar.fontColor"> <select class="ql-color" v-if="toolbar.fontColor">
<option selected="selected"></option> <option selected="selected"></option>
<option value="#e60000"></option> <option value="#e60000"></option>
<option value="#ff9900"></option> <option value="#ff9900"></option>
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
<option value="#002966"></option> <option value="#002966"></option>
<option value="#3d1466"></option> <option value="#3d1466"></option>
</select> </select>
<span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor"> <span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor" style="display:none;">
<span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-36"> <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-36">
<svg viewbox="0 0 18 18"> <svg viewbox="0 0 18 18">
<g class="ql-fill ql-color-label"> <g class="ql-fill ql-color-label">
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span> tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
</span> </span>
<select class="ql-background" style="display: none;" v-if="toolbar.fontBackgroundColor"> <select class="ql-background" v-if="toolbar.fontBackgroundColor">
<option value="#000000"></option> <option value="#000000"></option>
<option value="#e60000"></option> <option value="#e60000"></option>
<option value="#ff9900"></option> <option value="#ff9900"></option>
......
...@@ -1623,7 +1623,7 @@ export default { ...@@ -1623,7 +1623,7 @@ export default {
let allMoney = 0 let allMoney = 0
this.payMsgList.forEach(x=>{ this.payMsgList.forEach(x=>{
allMoney+= x.allMoney; allMoney+= x.allMoney;
// x.allMoney=(Math.round(x.allMoney * 100)) / 100; x.allMoney=(Math.round(x.allMoney * 100)) / 100;
}) })
if(allMoney.toString().split(".")[1]){ if(allMoney.toString().split(".")[1]){
let num=allMoney.toString().split(".")[1].length; let num=allMoney.toString().split(".")[1].length;
......
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span> <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span>
<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
</p> </p>
<p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}</span>{{GetDetail.FrID}}</p> <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}</span>{{GetDetail.FrID}}</p>
</div> </div>
......
...@@ -842,6 +842,14 @@ export default { ...@@ -842,6 +842,14 @@ export default {
if(this.$route.query.Type){ if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+''; this.msg.Type = this.$route.query.Type+'';
} }
if(this.$route.query.rec){
this.msg.AccountType=15;
this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=14;
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
}
},components: { },components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
...@@ -949,7 +957,7 @@ export default { ...@@ -949,7 +957,7 @@ export default {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
// this.msg.TCID= this.msg.TCID==0?this.msg.TCID:''; // this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
this.queryInfoInit(); // this.queryInfoInit();
this.currentPage = parseInt(this.msg.pageIndex); this.currentPage = parseInt(this.msg.pageIndex);
},err=>{}) },err=>{})
}, },
...@@ -1049,7 +1057,6 @@ export default { ...@@ -1049,7 +1057,6 @@ export default {
}, },
getAccountList(i,t){ //收款账户 getAccountList(i,t){ //收款账户
let accountList = []; let accountList = [];
this.msg.BankID="";
if(t==1){ // 银行 if(t==1){ // 银行
this.apipost('bankaccount_post_GetList',{TypeId:i}, res => { this.apipost('bankaccount_post_GetList',{TypeId:i}, res => {
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
......
...@@ -614,6 +614,7 @@ tr._item_list td:last-child { ...@@ -614,6 +614,7 @@ tr._item_list td:last-child {
</div> </div>
</template> </template>
<script> <script>
import moment from 'moment'
import Vue from "vue"; import Vue from "vue";
import XLSX from "xlsx"; import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy"; import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
...@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", { ...@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span> <span style="cursor: pointer" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
</div>`, </div>`,
props: { props: {
rowData: { rowData: {
...@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", { ...@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
} }
}, },
methods: { methods: {
goRec(path,rowData){
let BankID="";
let StartDate="";
if(rowData.DataType===6){
BankID=14;
}
if(rowData.DataType===7){
BankID=15;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
this.$router.push({
path: "/" + path,
query: {'rec':'rec','StartDate':StartDate,"BankID":BankID,blank: "y"}
});
},
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/" + path,
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-form-item :label="$t('fnc.fkduixiang')"> <el-form-item :label="$t('fnc.fkduixiang')">
<el-select filterable v-model='msg.ClientID' > <el-select filterable v-model='msg.ClientID' >
<el-option v-for='item in ClientAccountList' <el-option v-for='item in ClientAccountList'
:label='item.AccountAlias' :label='`${item.AccountAlias}(${item.AccountHolder})`'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
......
...@@ -127,16 +127,6 @@ ...@@ -127,16 +127,6 @@
酒店选择 酒店选择
</el-button> </el-button>
</el-popover> </el-popover>
<!-- <el-select class='w120 sel' v-model='subItem.NewHotelId' filterable
:placeholder="$t('pub.pleaseSel')" @visible-change='getHotelList(subItem)'
@change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
<span style="float: left">{{itemHotel.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select> -->
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -234,6 +224,19 @@ ...@@ -234,6 +224,19 @@
<tr> <tr>
<td colspan="2" style="height:5px;"></td> <td colspan="2" style="height:5px;"></td>
</tr> </tr>
<tr>
<td width="70" style="text-align:right;">税入/税别</td>
<td>
<el-select class='w135 sel' v-model='subItem.TaxType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='税入' :value='1'></el-option>
<el-option label='税别' :value='2'></el-option>
</el-select>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr> <tr>
<td width="70" style="text-align:right;">付款方式:</td> <td width="70" style="text-align:right;">付款方式:</td>
<td> <td>
...@@ -264,7 +267,19 @@ ...@@ -264,7 +267,19 @@
<td width="70" style="text-align:right;">订团号:</td> <td width="70" style="text-align:right;">订团号:</td>
<td> <td>
<el-input class='w135' v-model='subItem.ReserveNo'></el-input> <el-input class='w135' v-model='subItem.ReserveNo'></el-input>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">提醒供应商:</td>
<td>
<el-select class='w135 sel' v-model='subItem.SupplierHotelStatus' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='一般提醒' :value='1'></el-option>
<el-option label='重要提醒' :value='2'></el-option>
</el-select>
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID"> <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
<input type="button" value="新增" class="normalBtn" @click="addhouse()" /> <input type="button" value="新增房间" class="normalBtn" @click="addhouse()" title="需要拼房,但没有双人间(半间)的点击新增房间"/>
</el-form-item> </el-form-item>
</li> </li>
<li> <li>
......
...@@ -1723,9 +1723,12 @@ ...@@ -1723,9 +1723,12 @@
<div <div
@click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'> @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>
申请优惠</div> 申请优惠</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==0"
@click='deleteItem(item)'>取消 @click='deleteItem(item)'>取消
</div> </div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
订单已确认,取消请联系OP
</div>
</div> </div>
<el-button slot="reference" type="primary" <el-button slot="reference" type="primary"
......
...@@ -1735,7 +1735,10 @@ ...@@ -1735,7 +1735,10 @@
</div> </div>
<div v-if="item.orderState==2" @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>申请优惠</div> <div v-if="item.orderState==2" @click='Discount(item.tcid),SOMsg.OrderId = item.orderId,SOMsg.OrderUnitPrice = item.unit_Price'>申请优惠</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div> <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')&& item.isCanClear==0" @click='deleteItem(item)'>取消</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3') && item.isCanClear==1" title="如需取消订单清联系OP" style="color:red;">
订单已确认,取消请联系OP
</div>
</div> </div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button> <el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
</el-popover> </el-popover>
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</tbody> </tbody>
<tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo"> <tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo">
<tr> <tr>
<td colspan="17" class="">暂无数据</td> <td colspan="18" class="">暂无数据</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -699,7 +699,7 @@ ...@@ -699,7 +699,7 @@
<i class="iconfont icon-huidaodingbu"></i> <i class="iconfont icon-huidaodingbu"></i>
</div> </div>
<!-- @click="submitForm(1)" --> <!-- @click="submitForm(1)" -->
<div class="DTSaveBtn" @click="SaveVisaProduct('addMsg')">保存</div> <div v-show="saveBtn" class="DTSaveBtn" @click="SaveVisaProduct('addMsg')">保存</div>
<!-- <div class="DTSaveBtn">提交</div> --> <!-- <div class="DTSaveBtn">提交</div> -->
<!-- <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">预览</div> --> <!-- <div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">预览</div> -->
</div> </div>
...@@ -733,6 +733,7 @@ export default { ...@@ -733,6 +733,7 @@ export default {
}, },
data() { data() {
return { return {
saveBtn:true,
fileList:[], fileList:[],
checkList:[], checkList:[],
...@@ -837,7 +838,9 @@ export default { ...@@ -837,7 +838,9 @@ export default {
}; };
}, },
mounted() { mounted() {
if(this.$route.query.save){
this.saveBtn=false;
}
if(this.$route.query.Id){ if(this.$route.query.Id){
this.Pid=this.$route.query.Id; this.Pid=this.$route.query.Id;
this.GetVisaProductDetails(this.Pid); this.GetVisaProductDetails(this.Pid);
......
...@@ -300,10 +300,10 @@ ...@@ -300,10 +300,10 @@
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th width="10%">产品名称</th> <th width="10%">产品名称</th>
<th width="8%">签证类型</th> <th width="5%">签证类型</th>
<th width="8%">价格有效日期</th> <th width="12%">价格有效日期</th>
<th width="8%">成本价</th> <th width="8%">成本价</th>
<th width="8%">同业价</th> <th width="7%">同业价</th>
<th width="8%">直客价</th> <th width="8%">直客价</th>
<th width="6%">状态</th> <th width="6%">状态</th>
<th width="6%">订单数</th> <th width="6%">订单数</th>
...@@ -320,7 +320,14 @@ ...@@ -320,7 +320,14 @@
<span v-else class="tuanqian">团签</span> <span v-else class="tuanqian">团签</span>
</td> </td>
<td> <td>
<span class="fbold">{{item.SendVisaDate}}</span> <p>
结束日期:<span class="fbold">{{item.SendVisaDate}}</span>
</p>
<p>
开始日期:<span class="fbold">{{item.EffectiveStartDate}}</span>
</p>
</td> </td>
<td> <td>
<span class="totalPrice fbold" style="color: #47BF8C;">{{moneyFormat(item.CostPrice)}}</span> <span class="totalPrice fbold" style="color: #47BF8C;">{{moneyFormat(item.CostPrice)}}</span>
...@@ -409,6 +416,7 @@ ...@@ -409,6 +416,7 @@
@click="getDetail(item)" @click="getDetail(item)"
></el-button> ></el-button>
</el-tooltip> --> </el-tooltip> -->
<div style="display:inline-block">
<el-tooltip <el-tooltip
class="item" class="item"
effect="dark" effect="dark"
...@@ -423,6 +431,21 @@ ...@@ -423,6 +431,21 @@
@click="EditVisaProduct(item)" @click="EditVisaProduct(item)"
></el-button> ></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="查看详情"
placement="top-start"
v-else
>
<el-button
style="background:#E95252; border-color:#E95252;color:#fff"
icon="iconfont icon-chakan"
@click="ChaKan(item)"
></el-button>
</el-tooltip>
</div>
<el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1"> <el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
<el-button <el-button
type="primary" type="primary"
...@@ -677,6 +700,18 @@ export default { ...@@ -677,6 +700,18 @@ export default {
}, },
methods: { methods: {
// 只能查看,不能修改
ChaKan(item){
this.$router.push({
name: "ModifyVisaProduct",
query: {
Id:item.Id,
blank: "y",
save:false,
tab: "配置签证产品"
}
});
},
// 修改签证产品 // 修改签证产品
EditVisaProduct(item){ EditVisaProduct(item){
this.$router.push({ this.$router.push({
......
This diff is collapsed.
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
padding-top: 10px; padding-top: 10px;
} }
.PassengerList .el-input__inner { .pmyTable .el-input__inner {
height: 23px !important; height: 23px !important;
padding: 0 5px; padding: 0 5px;
} }
...@@ -113,6 +113,10 @@ ...@@ -113,6 +113,10 @@
.singeRowTable .redTr td{ .singeRowTable .redTr td{
color: #E95252; color: #E95252;
} }
.pg_checkModule{
margin-top:20px;
font-size:14px;
}
</style> </style>
<template> <template>
...@@ -203,7 +207,7 @@ ...@@ -203,7 +207,7 @@
</el-pagination> </el-pagination>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center> <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable pmyTable">
<tr> <tr>
<td colspan="6" style="text-align:left;font-weight:bold;padding-left:5px">票务航班信息</td> <td colspan="6" style="text-align:left;font-weight:bold;padding-left:5px">票务航班信息</td>
</tr> </tr>
...@@ -282,6 +286,13 @@ ...@@ -282,6 +286,13 @@
</tbody> </tbody>
</table> </table>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<span class="pg_checkModule" v-if="isShowSelect">
选择模板
<el-select v-model="checkModule" filterable :placeholder="$t('system.ph_buxian')" class="w180">
<el-option label="代理模板" :value="0"></el-option>
<el-option label="航空公司B2B模板" :value="1"></el-option>
</el-select>
</span>
<button class="normalBtn" type="primary" @click="getIsSure()">确认航班信息</button> &nbsp; <button class="normalBtn" type="primary" @click="getIsSure()">确认航班信息</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
...@@ -328,6 +339,8 @@ ...@@ -328,6 +339,8 @@
checkedGJzd: false, checkedGJzd: false,
checkedshuijin: false, checkedshuijin: false,
checkedsc: false, checkedsc: false,
isShowSelect:false,
checkModule:0
}; };
}, },
methods: { methods: {
...@@ -443,7 +456,8 @@ ...@@ -443,7 +456,8 @@
//导出报表 //导出报表
exportExcel() { exportExcel() {
let msg = { let msg = {
AirTicketId: this.msg.AirTicketId AirTicketId: this.msg.AirTicketId,
Type:this.checkModule
}; };
var fileName = this.$route.query.flightdate //this.QueryMsg.nowDate; var fileName = this.$route.query.flightdate //this.QueryMsg.nowDate;
var TempfileName = "" var TempfileName = ""
...@@ -550,6 +564,12 @@ ...@@ -550,6 +564,12 @@
}, },
mounted() { mounted() {
this.QueryMsg.AirTicketId = this.$route.query.id; this.QueryMsg.AirTicketId = this.$route.query.id;
var alcode = this.$route.query.alcode;
if(alcode=='HO'){
this.isShowSelect = true;
}else{
this.isShowSelect = false;
}
this.msg.AirTicketId = this.$route.query.id; this.msg.AirTicketId = this.$route.query.id;
if (this.$route.query.isFromTk != undefined) { if (this.$route.query.isFromTk != undefined) {
this.isShowGuoji = this.$route.query.isFromTk; this.isShowGuoji = this.$route.query.isFromTk;
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
<tr> <tr>
<th width='80'>商品编号</th> <th width='80'>商品编号</th>
<th>商品名称</th> <th>商品名称</th>
<th>商品数量</th>
<th>购买等级要求</th> <th>购买等级要求</th>
<th>价格</th> <th>价格</th>
<th>市场价</th> <th>市场价</th>
...@@ -66,6 +67,7 @@ ...@@ -66,6 +67,7 @@
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.id}}</td> <td>{{item.id}}</td>
<td>{{item.name}}</td> <td>{{item.name}}</td>
<td>{{item.storeNum}}</td>
<td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td> <td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td>
<td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td> <td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
<td>{{item.marketPrice}}</td> <td>{{item.marketPrice}}</td>
......
...@@ -194,6 +194,9 @@ ...@@ -194,6 +194,9 @@
.addIntegralMall .bottom_sub { .addIntegralMall .bottom_sub {
padding-top: 25px; padding-top: 25px;
} }
.addIntegralMall .ql-editor{
min-height: 200px;
}
</style> </style>
<template> <template>
<el-row class="addIntegralMall"> <el-row class="addIntegralMall">
...@@ -240,6 +243,9 @@ ...@@ -240,6 +243,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="商品数量" prop="storeNum">
<el-input v-model="addMsg.storeNum" class="w217"/>
</el-form-item>
<el-form-item label="商品状态"> <el-form-item label="商品状态">
<el-select filterable v-model="addMsg.state"> <el-select filterable v-model="addMsg.state">
<el-option label="上架" :value="1" :key="1"></el-option> <el-option label="上架" :value="1" :key="1"></el-option>
...@@ -313,8 +319,11 @@ ...@@ -313,8 +319,11 @@
</div> </div>
<p class="tips tips2">最多上传5张图片</p> <p class="tips tips2">最多上传5张图片</p>
<span class="resource-lititle resource-lititle2">商品描述</span> <span class="resource-lititle resource-lititle2">商品描述</span>
<quill-editor :options="editorOption" v-model="addMsg.description"></quill-editor>
<span class="resource-lititle resource-lititle2">图片介绍</span> <my-edit v-on:edit-value="addMsg.description = arguments[0]" v-bind:editValue="addMsg.description"
v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
<!-- <span class="resource-lititle resource-lititle2">图片介绍</span>
<div class="resource-imglist clearfix"> <div class="resource-imglist clearfix">
<div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index"> <div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index">
<img v-if="!item" src="../../assets/img/bg_c3@3x.png"> <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
...@@ -361,7 +370,7 @@ ...@@ -361,7 +370,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div> -->
</div> </div>
<div class="bottom_sub"> <div class="bottom_sub">
<button <button
...@@ -378,9 +387,23 @@ ...@@ -378,9 +387,23 @@
</template> </template>
<script> <script>
import { setInterval, setTimeout } from "timers"; import { setInterval, setTimeout } from "timers";
import MyEdit from "../EditTemplate.vue";
export default { export default {
data() { data() {
return { return {
toolbar: {
clean: true,
font: false, //字体
narrative: false, //叙述,
image:true,
bold: true, //加粗
underline: true, //下划线
header1: true, //H1
header2: true, //H2
fontColor: true, //字体颜色
fontBackgroundColor: true, //背景颜色
},
placeholder: "请输入内容",
editorOption: { editorOption: {
modules: { modules: {
toolbar: [ toolbar: [
...@@ -410,6 +433,7 @@ export default { ...@@ -410,6 +433,7 @@ export default {
quota: 0, quota: 0,
ishot: 0, ishot: 0,
descripImg: '', descripImg: '',
storeNum:''
}, },
MenberList: [], MenberList: [],
GoodsTypeList: [], GoodsTypeList: [],
...@@ -431,7 +455,8 @@ export default { ...@@ -431,7 +455,8 @@ export default {
tradePeopleReq: [ tradePeopleReq: [
{ required: true, message: "交易人头数要求", trigger: "blur" } { required: true, message: "交易人头数要求", trigger: "blur" }
], ],
remark: [{ required: true, message: "请输入备注", trigger: "blur" }] remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
}, },
//上传的文件数组 //上传的文件数组
DiningImageArray: [], DiningImageArray: [],
...@@ -446,6 +471,9 @@ export default { ...@@ -446,6 +471,9 @@ export default {
GoodsSeriesList: [], GoodsSeriesList: [],
}; };
}, },
components: {
"my-edit": MyEdit
},
methods: { methods: {
getGoodsSeries() { getGoodsSeries() {
this.loading = true; this.loading = true;
......
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">支持儿童出游 :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14" <el-checkbox style="display:none;" v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
:false-label="UnCheckedVaule">订团 :false-label="UnCheckedVaule">订团
</el-checkbox> </el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule" <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<th>{{$t('restaurant.res_ContactNumber')}}</th> <th>{{$t('restaurant.res_ContactNumber')}}</th>
<th>{{$t('admin.admin_status')}}</th> <th>{{$t('admin.admin_status')}}</th>
<th>{{$t('admin.admin_isshow')}}</th> <th>{{$t('admin.admin_isshow')}}</th>
<th>B2B是否显示</th>
<th>公司类型</th> <th>公司类型</th>
<th width="200">{{$t('admin.admin_operate')}}</th> <th width="200">{{$t('admin.admin_operate')}}</th>
</tr> </tr>
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
<td>{{item.MobilePhone}}</td> <td>{{item.MobilePhone}}</td>
<td>{{item.Status==0? $t('pub.openSel'): $t('pub.closeSel')}}</td> <td>{{item.Status==0? $t('pub.openSel'): $t('pub.closeSel')}}</td>
<td>{{item.is_show==0?'显示':'不显示'}}</td> <td>{{item.is_show==0?'显示':'不显示'}}</td>
<td>{{item.B2BShow==0?'显示':'不显示'}}</td>
<td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td> <td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td> <td>
<el-row> <el-row>
...@@ -152,6 +154,9 @@ ...@@ -152,6 +154,9 @@
</el-form-item> </el-form-item>
<el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show"> <el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show">
<el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch> <el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='B2B是否显示' prop="B2BShow">
<el-switch v-model="addMsg.B2BShow" active-value="0" inactive-value="1"></el-switch>
</el-form-item> </el-form-item>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany"> <el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
<el-switch v-model="addMsg.IsParentCompany" active-value="1" inactive-value="2"></el-switch> <el-switch v-model="addMsg.IsParentCompany" active-value="1" inactive-value="2"></el-switch>
...@@ -305,6 +310,7 @@ ...@@ -305,6 +310,7 @@
AirportServicePerson: '', AirportServicePerson: '',
AirportServicePhone: '', AirportServicePhone: '',
is_show: '0', is_show: '0',
B2BShow:'0',
BranchManager: '', BranchManager: '',
IsParentCompany:'1', IsParentCompany:'1',
BeginTier:'', BeginTier:'',
...@@ -411,6 +417,7 @@ ...@@ -411,6 +417,7 @@
this.getCityList(this.addMsg.Province,2); this.getCityList(this.addMsg.Province,2);
this.addMsg.Status=this.addMsg.Status.toString(); this.addMsg.Status=this.addMsg.Status.toString();
this.addMsg.is_show=this.addMsg.is_show.toString(); this.addMsg.is_show=this.addMsg.is_show.toString();
this.addMsg.B2BShow=this.addMsg.B2BShow.toString();
this.addMsg.IsParentCompany=this.addMsg.IsParentCompany.toString(); this.addMsg.IsParentCompany=this.addMsg.IsParentCompany.toString();
this.imageUrl = this.addMsg.ConfirmationSignet; this.imageUrl = this.addMsg.ConfirmationSignet;
this.imageUrlLogo=this.addMsg.TravelLogo; this.imageUrlLogo=this.addMsg.TravelLogo;
......
This diff is collapsed.
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