Skip to content

S
SuperMan
Commit bd7efaf5 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents b8831512 9c3e3e2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11752 additions and 1252 deletions
src/assets/common/lang/jp.js
View file @ bd7efaf5
......@@ -220,6 +220,7 @@ export const admin={ //行政
mane:'名前',
admin_group:'グループ名',
admin_company:'会社名',
CompanyTitle:"確認物の台頭",
admin_department:'部署名',
admin_departmentLevel:'部署ランク',
admin_parentdepartment:'上司',
......@@ -231,6 +232,8 @@ export const admin={ //行政
admin_operate:'オペレーション',
admin_leader:'担当者',
admin_isshow:'表示かどうか',
B2BShow:'B2Bが表示されるか否か',
IsParentCompany:"会社の種類",
admin_address:'アドレス',
admin_addGuide:'添乗員/ガイドを添加する',
admin_cpGuide:'会社専属ガイド',
......@@ -274,6 +277,18 @@ export const admin={ //行政
admin_lnLoginPwd:'登録パスワードを入力してください',
admin_Department:'部署',
admin_Post:'職位',
admin_Contract:'連絡先の名前',
admin_Mobile:'連絡先携帯',
admin_jieji:'受取人の名前',
admin_jieMobile:'受信者の携帯電話',
admin_chutuan:'出団通知名',
companyShow:'は本社',
departChushi:'クラス初期階層',
isServiceFei:'サービス料の有無',
fufei:'有料',
serviceFei:'サービス料金',
companyZhang:'会社確認章',
tripLogo:'ストロークロゴ',
}
//zk
export const hotel = {
......@@ -335,7 +350,8 @@ export const admin={ //行政
table_operater:'操作人',　　
table_operattime:'オペレーテイングタイム',　　
table_operat:'オペレーション',　　　　
product_name:'商品名',　　　
product_name:'商品名',　　
product_type_name:'部屋タイプ', 　
table_hotelname:'ホテル名',　　
table_Address:'ホテル住所',　　　　
table_areaDetail:'詳しい住所を記入してください',　　　
......@@ -466,7 +482,8 @@ export const admin={ //行政
res_homeFacility:'民宿',　　　　　　　　　　　　　　　　
res_SpringHotel:'温泉ホテル',　　　　　　　　　　　　　　
res_package:'コース',　　　　　　　　　　　　　　　　　　　　
res_packageName:'セットメニュー名',　　　　　　　　　　　　　
res_packageName:'セットメニュー名',　　
res_package_type_Name:'定食タイプ', 　　　　　　　　　　　
res_suplierName:'サプライヤー名',　　　　　　　　　　　　　
res_belongArea:'所在地域',　　　　　　　　　　　　　　　
res_Number:'数',　　　　　　　　　　　　　　　　　　　　
......@@ -510,6 +527,7 @@ export const admin={ //行政
sc_tel:'連絡先',
sc_mpzy:'入場券ソース',
sc_name:'入場券名称',
sc_type_name:'入場券タイプ',
sc_bjts:'見積個数',
sc_dj:'最低価格',
sc_gj:'最高価格',
......@@ -553,6 +571,7 @@ export const Airticket = {
Air_AddTickets:'エアチケット仕入れ追加',
Air_Airlines:'航空会社',
Air_positions:'ポジション',
Air_Status:'状态',
Air_TicketType:'チケットタイプ',
Air_TicketDeadLine:'発券期限',
Air_Number:'人数',
......
src/assets/common/lang/zh-tw.js
View file @ bd7efaf5
......@@ -220,6 +220,7 @@ export const admin={ //行政
mane:'名稱',
admin_group:'集團名稱',
admin_company:'公司名稱',
CompanyTitle:"確認件擡頭",
admin_department:'部門名稱',
admin_departmentLevel:'部門層級',
admin_parentdepartment:'上級部門',
......@@ -230,7 +231,9 @@ export const admin={ //行政
admin_linkman:'連絡人資訊',
admin_operate:'操作',
admin_leader:'負責人',
admin_isshow:'是否顯示',
admin_isshow:'是否顯示',
B2BShow:'B2B是否顯示',
IsParentCompany:"公司類型",
admin_address:'地址',
admin_addGuide:'添加領隊/導遊',
admin_cpGuide:'公司導遊',
......@@ -284,6 +287,18 @@ export const admin={ //行政
admin_Bindingposition:'綁定崗位',
admin_sort:'排序',
admin_level:'級',
admin_Contract:'連絡人姓名',
admin_Mobile:'連絡人手機',
admin_jieji:'接機人姓名',
admin_jieMobile:'接機人手機',
admin_chutuan:'出團通知名',
companyShow:'是否為總公司',
departChushi:'部門初始層級',
isServiceFei:'是否服務費收費',
fufei:'付費',
serviceFei:'服務費用',
companyZhang:'公司確認章',
tripLogo:'行程Logo',
}
//zk
export const hotel = {
......@@ -346,6 +361,7 @@ export const admin={ //行政
table_operattime:'操作時間',
table_operat:'操作',
product_name:'產品名稱',
product_type_name:'房間類型',
table_hotelname:'酒店名稱',
table_Address:'飯店地址',
table_areaDetail:'請輸入詳細地址',
......@@ -478,6 +494,7 @@ export const admin={ //行政
res_SpringHotel:'溫泉飯店',
res_package:'套餐',
res_packageName:'套餐名稱',
res_package_type_Name:'套餐類型',
res_suplierName:'供應商名稱',
res_belongArea:'所在區域',
res_Number:'數量',
......@@ -521,6 +538,7 @@ export const admin={ //行政
sc_tel:'聯繫電話',
sc_mpzy:'門票資源',
sc_name:'門票名稱',
sc_type_name:'門票類型',
sc_bjts:'報價條數',
sc_dj:'最低價格',
sc_gj:'最高價格',
......@@ -564,6 +582,7 @@ export const Airticket = {
Air_AddTickets:'新增採購機票',
Air_Airlines:'航空公司',
Air_positions:'倉位',
Air_Status:'狀態',
Air_TicketType:'機票類型',
Air_TicketDeadLine:'出票時限',
Air_Number:'人數',
......@@ -1847,7 +1866,7 @@ export const salesModule={
Yuefang:'近期約訪',
TotalVisit:'累計拜訪',
OntheBlackList:'已加入黑名單',
storeName:'門店名稱',
storeName:'同行名稱',
HouseNumber:'請輸入,精准到門牌號碼',
Belongbrand:'所屬品牌',
premises:'經營場所',
......
src/assets/common/lang/zh.js
View file @ bd7efaf5
......@@ -219,7 +219,8 @@ export const system = {
export const admin={ //行政
mane:'名称',
admin_group:'集团名称',
admin_company:'公司名称',
admin_company:'公司名称',
CompanyTitle:"确认件抬头",
admin_department:'部门名称',
admin_departmentLevel:'部门层级',
admin_parentdepartment:'上级部门',
......@@ -230,7 +231,9 @@ export const admin={ //行政
admin_linkman:'联系人信息',
admin_operate:'操作',
admin_leader:'负责人',
admin_isshow:'是否显示',
admin_isshow:'是否显示',
B2BShow:'B2B是否显示',
IsParentCompany:"公司类型",
admin_address:'地址',
admin_addGuide:'添加领队/导游',
admin_cpGuide:'公司导游',
......@@ -284,6 +287,18 @@ export const admin={ //行政
admin_Bindingposition:'绑定岗位',
admin_sort:'排序',
admin_level:'级',
admin_Contract:'联系人姓名',
admin_Mobile:'联系人手机',
admin_jieji:'接机人姓名',
admin_jieMobile:'接机人手机',
admin_chutuan:'出团通知名',
companyShow:'是否为总公司',
departChushi:'部门初始层级',
isServiceFei:'是否服务费收费',
fufei:'付费',
serviceFei:'服务费用',
companyZhang:'公司确认章',
tripLogo:'行程Logo',
}
//zk
export const hotel = {
......@@ -346,6 +361,7 @@ export const admin={ //行政
table_operattime:'操作时间',
table_operat:'操作',
product_name:'产品名称',
product_type_name:'房间类型',
table_hotelname:'酒店名称',
table_Address:'酒店地址',
table_areaDetail:'请输入详细地址',
......@@ -478,6 +494,7 @@ export const admin={ //行政
res_SpringHotel:'温泉酒店',
res_package:'套餐',
res_packageName:'套餐名称',
res_package_type_Name:'套餐类型',
res_suplierName:'供应商名称',
res_belongArea:'所在区域',
res_Number:'数量',
......@@ -521,6 +538,7 @@ export const admin={ //行政
sc_tel:'联系电话',
sc_mpzy:'门票资源',
sc_name:'门票名称',
sc_type_name:'门票类型',
sc_bjts:'报价条数',
sc_dj:'最低价格',
sc_gj:'最高价格',
......@@ -564,6 +582,7 @@ export const Airticket = {
Air_AddTickets:'新增采购机票',
Air_Airlines:'航空公司',
Air_positions:'仓位',
Air_Status:'状态',
Air_TicketType:'机票类型',
Air_TicketDeadLine:'出票时限',
Air_Number:'人数',
......
src/assets/common/lang/zh_REMOTE_6332.js
View file @ bd7efaf5
......@@ -544,6 +544,7 @@ export const Airticket = {
Air_AddTickets:'新增采购机票',
Air_Airlines:'航空公司',
Air_positions:'仓位',
Air_TicketType:'机票类型',
Air_TicketDeadLine:'出票时限',
Air_Number:'人数',
......
src/assets/utils/commonUtils.js
View file @ bd7efaf5
......@@ -37,8 +37,8 @@ var commonUtils = {
return {
Url: "",
Name: "",
VideoPath:"",
FileType:"",//文件类型
VideoPath: "",
FileType: "", //文件类型
}
},
//实现每三位一个逗号分隔并且保留两位小数
......@@ -350,6 +350,12 @@ var commonUtils = {
//返回年月日
return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
},
//格式化日期
getFormatDate(dateStr) {
var myDate = new Date(dateStr);
//返回年月日
return myDate.getFullYear() + '-' + parseInt(myDate.getMonth() + 1) + "-" + myDate.getDate()
},
//判断字符串是否为数字
isNumber: function (val) {
var regPos = /^\d+(\.\d+)?$/; //非负浮点数
......@@ -421,10 +427,10 @@ var commonUtils = {
var month = myDate.getMonth() + 1;
var strDate = myDate.getDate();
if (month >= 1 && month <= 9) {
month = "0" + month;
month = "0" + month;
}
if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate;
strDate = "0" + strDate;
}
var currentdate = year + seperator1 + month + seperator1 + strDate;
return currentdate;
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ bd7efaf5
......@@ -437,7 +437,6 @@ export default {
this.msg.CStartDate = '2019-01-01';
this.msg.QEndDate = '';
}
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Department_Id)this.msg.RB_Department_Id=0;
if(!this.msg.EnterID)this.msg.EnterID=0;
if(!this.msg.OrderId)this.msg.OrderId=0;
......
src/components/Hotel/HotelManagement.vue
View file @ bd7efaf5
......@@ -266,8 +266,7 @@
<el-option v-for="item in HotelTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
</li>
<li>
<span>
<em>{{$t('Operation.Op_price')}}</em>
......@@ -299,7 +298,6 @@
<div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
<img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
<img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
<!-- <div class="RemainingInventory">{{item.RemainingInventory}}</div> -->
<div class="resTypeList">
<span v-for="(items,index) in item.OpenPlatformList" :key="index"
:class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
......@@ -322,7 +320,7 @@
popper-class="max-w250">
<div class="hotelTitle fz12">{{$t('ground.zhenshimingcheng')}}: {{item.HotelRealName}}</div>
</el-tooltip>
<div class="brandList clearfix">
<div class="brandList clearfix" style="display:none;">
<div class="brand">
<i class="iconfont honor icon-img_biaozhi"></i>
{{item.ChainBrand}}
......@@ -349,8 +347,10 @@
</el-tooltip>
<div class="btnList">
<button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>
<button @click="CopyHotel(item.ID)" class="hotelBtnMan">复制</button>
<button v-if="IsHotelPriceStock==1" style="width:80px;" @click="goUrl('HotelProductManage2',item)"
<button @click="CopyHotel(item.ID)" class="hotelBtnMan" v-if="userInfo.RB_Group_id==QjGroupId()">复制</button>
<button @click="goproduct('HotelProductManage',item)" class="hotelBtnMan" v-if="userInfo.RB_Group_id!=QjGroupId()">房型</button>
<br/>
<button v-if="IsHotelPriceStock==1" style="width:80px;margin-top:10px;" @click="goUrl('HotelProductManage2',item)"
class="hotelBtnMan">{{$t('ground.baojiayukucun')}}</button>
</div>
</div>
......@@ -363,6 +363,7 @@
export default {
data() {
return {
userInfo:{},//登录用户信息
IsHotelPriceStock: 0, //1-有获取酒店库存与报价添加修改权限
countryList: "",
provinceList: "",
......@@ -529,6 +530,19 @@
}
});
},
//调整到房型列表
goproduct(path, item) {
this.$router.push({
path: path,
query: {
id: item.ID,
Country:item.Country,
IsSelfBook:item.IsSelfBook,
blank: 'y',
tab: '房型列表'
}
});
},
goSubInfo(path, id) {
this.$store.commit("pageConditionUpdate", this.msg);
this.$router.push({
......@@ -576,9 +590,8 @@
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage();
let msg = {
GroupId: userInfo.RB_Group_id,
GroupId: this.userInfo.RB_Group_id,
BranchId: "-1",
DepartmentId: "-1",
PostId: "-1",
......@@ -596,6 +609,7 @@
},
},
mounted() {
this.userInfo=this.getLocalStorage();
this.getEmployeeList();
this.GetHotelPirceStockAuth();
this.getCountryList();
......
src/components/Hotel/HotelProductManage.vue
View file @ bd7efaf5
......@@ -171,8 +171,11 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('hotel.product_name')" prop="HotelProductType">
<el-select filterable v-model='addMsg.HotelProductType' :placeholder="$t('pub.pleaseSel')">
<el-form-item :label="$t('hotel.product_name')">
<el-input class="w300" type="text" v-model="addMsg.Name" maxlength="20"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.product_type_name')" prop="HotelProductType" >
<el-select filterable v-model='addMsg.HotelProductType' :placeholder="$t('pub.pleaseSel')" class="w300">
<el-option v-for='item in HotelProductTypeList' :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
......@@ -231,7 +234,8 @@
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" @click="outerVisible = true,dialogTitle=$t('ground.xiugaijiudcp'),updateProduct(index,item.ID)"
<el-button type="primary"
@click="outerVisible = true,dialogTitle=$t('ground.xiugaijiudcp'),updateProduct(index,item.ID)"
icon="el-icon-edit" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('restaurant.res_bidManage')" placement="top-start">
......
src/components/Hotel/HotelProductManage2.vue
View file @ bd7efaf5
......@@ -177,7 +177,8 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item>
</el-col <el-col :span="6">
</el-col>
<el-col :span="6">
<el-form-item :label="$t('ground.biaozhunjiancb')">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
......
src/components/Hotel/HotelSalesBoard.vue
View file @ bd7efaf5
......@@ -365,8 +365,9 @@
},
methods: {
getBranchList() {
let userInfo = this.getLocalStorage();
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: '2',
RB_Group_Id: userInfo.RB_Group_id,
Status: 0,
}, res => {
if (res.data.resultCode == 1) {
......@@ -493,7 +494,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -588,7 +589,7 @@
this.GetHotelList();
this.initCalendar();
this.GetHoltelInventory();
this.getProvinceList(651, 1);
this.getProvinceList("651,1252", 1);
}
};
......
src/components/Hotel/HotelTotalStock.vue
View file @ bd7efaf5
......@@ -494,7 +494,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -556,7 +556,7 @@
this.msg.HotelId = this.$route.query.HotelId === undefined ? 0 : this.$route.query.HotelId;
this.initSupplier();
this.GetHotelList();
this.getProvinceList(651, 1);
this.getProvinceList("651,1252", 1);
this.getList();
},
}
......
src/components/Hotel/HotelWorkList.vue
View file @ bd7efaf5
This diff is collapsed.
src/components/Hotel/SupplierHandFee.vue
View file @ bd7efaf5
......@@ -137,13 +137,14 @@
export default {
data() {
return {
userInfo: {}, //用户信息
//请求
msg: {
QMonthStr: "",
Supplier: 0,
PageIndex: 1,
PageSize: 15,
IsSetOut:0,//0-正常发团，1-取消发团
IsSetOut: 0, //0-正常发团，1-取消发团
},
loading: false,
currentPage: 1,
......@@ -151,13 +152,13 @@
dataList: [],
//供应商
SupplierList: [],
totalJap:0,
rmbTotal:0
totalJap: 0,
rmbTotal: 0
}
},
mounted() {
this.userInfo = this.getLocalStorage();
this.initSupplier();
//this.getList();
},
filters: {},
methods: {
......@@ -200,7 +201,7 @@
TCID: item.TCIDS,
Supplier: that.msg.Supplier,
QMonthStr: that.msg.QMonthStr,
IsSetOut:that.msg.IsSetOut,
IsSetOut: that.msg.IsSetOut,
},
res => {
that.loading = false;
......@@ -258,12 +259,12 @@
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
this.totalJap=0;
this.rmbTotal=0;
this.dataList.forEach(x=>{
x.SubList.forEach(y=>{
this.totalJap+=y.SubtotalMoney;
this.rmbTotal+=y.RMBMoney;
this.totalJap = 0;
this.rmbTotal = 0;
this.dataList.forEach(x => {
x.SubList.forEach(y => {
this.totalJap += y.SubtotalMoney;
this.rmbTotal += y.RMBMoney;
})
})
} else {
......@@ -279,9 +280,16 @@
},
// 获取供应商
initSupplier() {
var qCountry = 0;
if (this.userInfo.RB_Group_id == 2) {
qCountry = 651;
}
if (this.userInfo.RB_Group_id == 91) {
qCountry = 1252;
}
this.apipost("supplier_post_GetAllList", {
Type: 1,
Country: 651, //日本供应商
Country: qCountry, //日本供应商
}, res => {
if (res.data.resultCode === 1) {
this.SupplierList = res.data.data;
......
src/components/Hotel/roomQuery.vue
View file @ bd7efaf5
......@@ -2,6 +2,17 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<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('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -229,6 +240,7 @@
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -244,7 +256,7 @@
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
LineId: 0,
PlaceID: 0,
LineteamId: 0,
//航空公司
......@@ -259,9 +271,6 @@
companyList: [],
//酒店类表
HotelList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
dataList: [],
queryCommonData: {
//公司数据
......@@ -295,25 +304,41 @@
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.Error(res.data.message);
}
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
);
})
},
goUrlR(path, obj, title) {
this.$router.push({
......@@ -390,7 +415,7 @@
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
Country: 651,
QCountry: "651,1252",
IsMoreThanZero: 1
},
res => {
......@@ -406,7 +431,7 @@
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.userInfo.EmployeeId
};
let fileName = this.$t('ground.dingfangcx') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
......@@ -414,34 +439,6 @@
this.loading = false;
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
})
},
//获取航空公司
getAirlineList() {
this.apipost(
......@@ -456,9 +453,8 @@
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
GroupId: this.userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
......@@ -476,12 +472,10 @@
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
RB_Group_Id: this.userInfo.RB_Group_id
}
this.apipost(
'admin_get_BranchGetList',
......@@ -496,6 +490,7 @@
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -514,7 +509,10 @@
} else {
this.msg.StartDate = nowDate;
}
this.getLinePlaceList();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCompanyList();
......
src/components/Hotel/roomReservations.vue
View file @ bd7efaf5
......@@ -2,6 +2,17 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<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('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
......@@ -107,7 +118,8 @@
</div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%" v-loading='loading'>
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" style="width:100%"
v-loading='loading'>
<tr>
<th width="120">{{$t('active.ad_xuhao')}}</th>
<th width="80">{{$t('ground.chufadi')}}</th>
......@@ -134,17 +146,13 @@
v-if="subItem.HotelOrderList.length>0">
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList">
<tr>
<td
:rowspan="outItem.rootRowspan"
v-if='index==0&&subIndex==0&&thirdIndex==0'>
<td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityNames}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w150">
{{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
......@@ -180,40 +188,36 @@
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>
{{$t('fnc.xiangqing')}}
</el-button>
</el-popover>
</div>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}})
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style="cursor:pointer;text-decoration:underline;">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
style="cursor:pointer;text-decoration:underline;">
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p>
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
{{item.CommonReport.HouseStatistics.RealityRoomNum}}
</td>
<td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')"
style="cursor:pointer;text-decoration:underline;">{{$t('fnc.xiangqing')}}</p>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<p @click="goRoomDetails(item,outItem,'订房详情')" style="cursor:pointer;text-decoration:underline;">
{{$t('fnc.xiangqing')}}</p>
</td>
<td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
{{subItem.UseTimeStr}}
......@@ -274,6 +278,7 @@
export default {
data() {
return {
userInfo: {}, //当前登录用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -289,7 +294,7 @@
DateStr: "",
//出团公司
OutBranchIds: [],
LineId: 14,
LineId: 0,
PlaceID: 0,
LineteamId: 0,
//航空公司
......@@ -351,7 +356,11 @@
}
})
},
goUrl(path, obj, outItem, title) {
goRoomDetails(obj, outItem, title) {
var path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
}
this.$router.push({
name: path,
query: {
......@@ -360,8 +369,8 @@
'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName':obj.LeaderName,
'GuideName':obj.GuideName,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
blank: 'y',
tab: title
}
......@@ -458,9 +467,8 @@
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
GroupId: this.userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
......@@ -478,8 +486,7 @@
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
var RB_Group_id = this.userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
......@@ -496,8 +503,20 @@
err => {}
)
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.Error(res.data.message);
}
});
},
},
mounted() {
this.userInfo = this.getLocalStorage();
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -521,8 +540,10 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
//this.msg.CombinationNum = "HP20190713TN07A1";
this.getLinePlaceList();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
this.getLineList();
this.getAirlineList();
this.getEmployeeList();
this.getCompanyList();
......
src/components/Hotel/roomReservationsDetails.1.vue
View file @ bd7efaf5
......@@ -129,7 +129,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">
:UseDate="item.UseTimeStr" :Country="651">
</comCheckHotel>
<el-button size="small" type="danger" :data-index="'comCheckHotel'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......
src/components/Hotel/roomReservationsDetails_swt.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/components/Restaurant/RestaurantPackage.vue
View file @ bd7efaf5
......@@ -73,9 +73,7 @@
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
/*! autoprefixer: off */
-webkit-box-orient: vertical;
/* autoprefixer: on */
-webkit-line-clamp: 2;
}
......@@ -105,8 +103,8 @@
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="getList(),resetPageIndex()" />
<input type="button" class="normalBtn" @click="resetId(),outerVisible = true,dialogTitle=$t('ground.tianjiataocan')"
:value="$t('pub.addBtn')" />
<input type="button" class="normalBtn"
@click="resetId(),outerVisible = true,dialogTitle=$t('ground.tianjiataocan')" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
......@@ -179,15 +177,16 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('restaurant.res_packageName')" prop="DiningMealType">
<el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')">
<el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
<el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
</el-form-item>
<el-form-item :label="$t('restaurant.res_package_type_Name')" prop="DiningMealType">
<el-select filterable v-model='addMsg.DiningMealType' :placeholder="$t('pub.pleaseSel')" class="w300">
<el-option v-for='item in DiningMealTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('restaurant.res_packageName')" prop="MealName">
<el-input class="w300" type="text" v-model="addMsg.MealName" maxlength="20"></el-input>
</el-form-item> -->
<el-form-item :label="$t('hotel.hotel_produceDes')" prop="MealDesc">
<el-input class="w300" type="textarea" v-model="addMsg.MealDesc" maxlength="200"></el-input>
</el-form-item>
......@@ -278,7 +277,8 @@
saveResource() {
this.DiningMealTypeList.forEach(item => {
if (this.addMsg.DiningMealType == item.ID) {
this.addMsg.MealName = item.Name
// HK 2020-05-06注释
//this.addMsg.MealName = item.Name
}
})
this.apipost(
......
src/components/Restaurant/RestaurantSalesBoard.vue
View file @ bd7efaf5
......@@ -278,6 +278,7 @@
DiningID: 0,
QStatus:0,
loading: false,
uid:0,
},
//餐厅列表
DinnerList: [],
......@@ -392,7 +393,7 @@
GetDinnerList() {
this.apipost(
"dining_post_GetList", {
QCountry: 651
QCountrys: "651,1252"
},
res => {
if (res.data.resultCode == 1) {
......@@ -408,6 +409,7 @@
this.Info(this.$t('sm.qxzcanting'));
return;
}
this.msg.uid=this.getLocalStorage().EmployeeId;
this.msg.loading = true;
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", this.msg, fileName,
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ bd7efaf5
......@@ -2,10 +2,34 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>{{$t('advmanager.v_xilie')}}</em>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<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('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_xilie')}}</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='-1'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -100,7 +124,8 @@
</tr>
</table>
<el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>{{$t('fnc.xiangqing')}}
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>
{{$t('fnc.xiangqing')}}
</el-button>
</el-popover>
</td>
......@@ -142,7 +167,7 @@
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80 link">
<p @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p>
<p @click="goDinnerDetails(item,outItem,'订餐详情')">{{$t('fnc.xiangqing')}}</p>
</div>
</td>
</tr>
......@@ -173,13 +198,15 @@
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
msg: {
pageIndex: 1,
pageSize: 5,
SelectType: 2,
LineId: 14,
LineteamId: "-1",
LineId: 0,
PlaceID: 0,
LineteamId: 0,
StartDate: '',
EndDate: '',
currentPage: 1,
......@@ -188,11 +215,12 @@
},
//餐厅列表
DiningList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
queryCommonData: {
PlaceList: [],
LineList: [],
LineTeamList: [],
},
DataList: [],
colspanTotal: 0,
boxHeight: 0,
}
},
......@@ -211,27 +239,41 @@
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
);
})
},
goUrlR(path, obj, title) {
this.$router.push({
......@@ -253,7 +295,11 @@
}
})
},
goUrl(path, obj, outItem, title) {
goDinnerDetails(obj, outItem, title) {
var path = "bookDinnerStatisticsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "bookDinnerStatisticsDetails_SWT";
}
this.$router.push({
name: path,
query: {
......@@ -309,7 +355,7 @@
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
QCountrys: "651,1252"
},
res => {
if (res.data.resultCode == 1) {
......@@ -318,12 +364,12 @@
}
);
},
//餐厅下载
//餐厅下载
DownLoadDinner() {
this.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
uid: this.userInfo.EmployeeId
};
let fileName = this.$t('ground.cantxiazai') + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
......@@ -333,6 +379,10 @@
}
},
mounted() {
this.userInfo = this.getLocalStorage();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -345,6 +395,7 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
this.offsetwidth = width;
this.getLineList();
this.GetDinnerList();
this.getList();
},
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ bd7efaf5
......@@ -87,7 +87,7 @@
<span style="color:green">{{subItem.NewDiningRealName}}</span><br/>
<el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
<comCheckDinner :ref="'comCheckDinner'+index+subIndex+''" :UseDate="item.UseTimeStr"
v-on:childDinner="childDinnerList">
v-on:childDinner="childDinnerList" :Country="651">
</comCheckDinner>
<el-button size="small" type="danger" :data-index="'comCheckDinner'+index+subIndex+''"
slot="reference" style="cursor:pointer;"
......
src/components/Restaurant/bookDinnerStatisticsDetails_SWT.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/components/SalesModule/MyCustomer.vue
View file @ bd7efaf5
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ bd7efaf5
......@@ -253,7 +253,6 @@
</el-checkbox-group>
</span>
</div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>
......@@ -457,17 +456,34 @@
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
<template v-if="item.UseFlightType==0">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template>
<template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
{{subItem.aName}} {{subItem.Departure_time}}
-
{{subItem.dName}} {{subItem.Arrival_time}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template>
</div>
</el-popover>
</div>
......@@ -922,7 +938,8 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="CurrentUserInfo.RB_Group_id==2" @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
<el-button v-if="CurrentUserInfo.RB_Group_id==2"
@click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button>
......@@ -938,11 +955,12 @@
v-if="item.b2b&&item.GroupRecommendType==0&&CurrentUserInfo.RB_Group_id==2">
{{$t('op.Setjingpin')}}
</el-dropdown-item>
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
v-if="item.b2b&&item.GroupRecommendType==1&&CurrentUserInfo.RB_Group_id==2">
{{$t('op.CancelSetjp')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi" @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi"
@click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">
......@@ -956,7 +974,8 @@
{{$t('Operation.Op_xiajia')}}
</el-dropdown-item>
<!--酒店下架-->
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)" @click.native="RemoveHotelJourneyOrder(item.TCID)">
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)"
@click.native="RemoveHotelJourneyOrder(item.TCID)">
{{$t('op.HotelXJ')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
......@@ -977,17 +996,20 @@
直客版预览
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun" @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun"
@click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest" >
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest">
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>
{{$t('op.LookPassengerSurvey')}}
</div>
......
src/components/busManagement/AreaandType.vue
View file @ bd7efaf5
<style>
.BusAddArea{
.AreaandType .BusAddArea{
width:100%;
text-align: right;
margin-bottom:25px;
}
.AreaTypeTable td, .AreaTypeTable th{
.AreaandType .AreaTypeTable td, .AreaTypeTable th{
text-align: center!important;
}
</style>
......
src/components/busManagement/busPriceConfig.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ bd7efaf5
......@@ -2,10 +2,34 @@
<div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li><span><em>系列</em>
<li>
<span>
<em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<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('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('advmanager.v_xilie')}}</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option>
</el-select>
</span>
......@@ -216,6 +240,7 @@
export default {
data() {
return {
userInfo: {}, //用户信息
loading: false,
currentPage: 1,
total: 0,
......@@ -223,30 +248,34 @@
pageIndex: 1,
pageSize: 10,
SelectType: 4,
LineId: 14,
LineteamId: "-1",
LineId: 0,
PlaceID: 0,
LineteamId: 0,
StartDate: '',
EndDate: '',
PriceStatus: "0",
CombinationNum: ""
},
LineList: [],
LineTeamList: [],
queryCommonData: {
PlaceList: [],
LineList: [],
LineTeamList: [],
},
thLengthTitle: [],
DataList: [],
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj: {
showPrice: false,//是否显示价格
showPay: false,//是否显示支付方式
showZhan: false,//占房时间
showBtnList: false,//是否下载、确认按钮
showPrice: false, //是否显示价格
showPay: false, //是否显示支付方式
showZhan: false, //占房时间
showBtnList: false, //是否下载、确认按钮
ShowTaxType: false, //显示税入税别
ShowRebateRatio: false, //显示返佣比列
ShowSupplier:false,//是否显示供应商
showCaozuoTime:false,//操作时间
colspanLength:6//跨行
ShowSupplier: false, //是否显示供应商
showCaozuoTime: false, //操作时间
colspanLength: 6 //跨行
}
}
},
......@@ -257,12 +286,42 @@
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
});
},
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表
getLineTeamList() {
this.msg.LineteamId = 0
let msg = {
lineID: this.msg.LineId,
placeID: this.msg.PlaceID,
isTOOP: 1
}
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineTeamList = res.data.data
}
})
},
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
......@@ -276,22 +335,7 @@
});
return totalPrice;
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: 14,
isTOOP: 1
},
res => {
if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1";
this.LineTeamList = res.data.data;
}
}
);
},
GetPeiChe(obj) { //配车信息
let jieji = "";
let songji = "";
......@@ -437,6 +481,10 @@
},
},
mounted() {
this.userInfo = this.getLocalStorage();
if (this.userInfo.RB_Group_id == 2) {
this.msg.LineId = 14;
}
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -445,13 +493,13 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-08-12';
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width;
this.getList();
this.getLineTeamList();
this.getLineList();
},
}
......
src/components/busManagement/busUsePrice.vue
View file @ bd7efaf5
......@@ -218,11 +218,14 @@
<th>
{{$t('ground.btbj')}}
</th>
<th>
公里价格
</th>
<th>
{{$t('ground.qtgs')}}
</th>
<th>
{{$t('ground.jsgs')}}
{{$t('ground.jsgs')}}
</th>
<th>
{{$t('ground.qtchadai')}}
......@@ -262,6 +265,9 @@
<td>
{{item.HalfDayPrice}}
</td>
<td>
{{item.KMPrice}}
</td>
<td>
{{item.AllDayHighSpeedFee}}
</td>
......@@ -272,12 +278,13 @@
<td>{{item.PickUpChaDaiFee}}</td>
<td>
<el-popover width="590" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr style="text-align:center;">
<th width="70">{{$t('ground.yuefen')}}</th>
<th width="80">{{$t('ground.jsPrice')}}</th>
<th width="80">{{$t('ground.AllDayPrice')}}</th>
<th width="80">{{$t('ground.btbj')}}</th>
<th width="80">公里价格</th>
<th width="80">{{$t('ground.qtgs')}}</th>
<th width="80">{{$t('ground.jsgs')}}</th>
<th width="80">{{$t('ground.qtchadai')}}</th>
......@@ -296,6 +303,9 @@
<td>
{{fItem.S_HalfDayPrice}}
</td>
<td>
{{fItem.S_KMPrice}}
</td>
<td>
{{fItem.S_AllDayHighSpeedFee}}
</td>
......@@ -332,14 +342,14 @@
</td>
</tr>
<tr>
<td colspan="13">
<td colspan="14">
{{$t('pub.pubRemark')}}: {{item.Remark}}
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="13">
<td colspan="14">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
......@@ -377,8 +387,8 @@
</el-col>
<el-col :span="5">
<el-form-item :label="$t('sm.zuoweishu')" prop="UseNum">
<el-input :placeholder="$t('sm.zuoweishu')" v-model="addMsg.UseNum" @keyup.native="checkInteger(addMsg,'UseNum')"
class="busUsePeople">
<el-input :placeholder="$t('sm.zuoweishu')" v-model="addMsg.UseNum"
@keyup.native="checkInteger(addMsg,'UseNum')" class="busUsePeople">
<template slot="append">座</template>
</el-input>
</el-form-item>
......@@ -389,7 +399,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('ground.songjiBj')" style="display:none;">
<el-form-item :label="$t('ground.songjiBj')" style="display:none;">
<el-input v-model="addMsg.SendPrice" @keyup.native="checkPrice(addMsg,'SendPrice')"></el-input>
</el-form-item>
</el-col>
......@@ -404,13 +414,19 @@
</el-form-item>
</el-col>
<el-col :span="5" style="display:none;">
<el-form-item label="小时报价" >
<el-form-item label="小时报价">
<el-input v-model="addMsg.HourPrice" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="公里报价">
<el-input v-model="addMsg.KMPrice" @keyup.native="checkPrice(addMsg,'KMPrice')"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item :label="$t('ground.qtgs')" prop="AllDayHighSpeedFee">
<el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'HourPrice')"></el-input>
<el-input v-model="addMsg.AllDayHighSpeedFee" @keyup.native="checkPrice(addMsg,'AllDayHighSpeedFee')">
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -517,6 +533,7 @@
PickUpChaDaiFee: 0, //接送茶代费
BusImage: '', //车辆图片
ShowBusImage: "",
KMPrice: 0, //公里价格
},
//表单验证
rules: {
......@@ -675,8 +692,7 @@
})
return AreaName;
},
getBusTypeStr(busType)
{
getBusTypeStr(busType) {
var AreaName = '';
this.BusTypeList.forEach(item => {
if (item.Id == busType) {
......@@ -685,7 +701,7 @@
})
return AreaName;
},
/*获取车辆类型列表*/
/*获取车辆类型列表*/
getBusTypeList() {
this.apipost(
"bus_get_GetBusTypeList",
......@@ -723,7 +739,7 @@
null
);
},
//币种下拉获取汇率
getRate(ID) {
this.currencyTypeList.forEach(x => {
......@@ -761,7 +777,8 @@
PickUpHighSpeedFee: 0,
AllDayChaDaiFee: 0,
PickUpChaDaiFee: 0,
BusImage: ''
BusImage: '',
KMPrice: 0
};
},
submitForm(addMsg) {
......
src/components/commonPage/comCheckDinner.vue
View file @ bd7efaf5
......@@ -85,7 +85,7 @@
</template>
<script>
export default {
props: ["UseDate"],
props: ["UseDate","Country"],
data() {
return {
loading:false,
......@@ -106,7 +106,7 @@
this.dataList = [];
this.apipost('dining_post_GetDinnerList_V2Service', {
//1-只查询有库存的酒店
Country: "651",
Country: this.Country,
Province: this.qMsg.ProvinceId,
Name:this.qMsg.Name,
sDate: this.UseDate
......@@ -154,7 +154,7 @@
//获取日本下面的市->下拉框用
getProvinceList() {
let msg = {
Id: 651
Id: this.Country
};
this.apipost("dict_post_Destination_GetChildList", msg, res => {
if (res.data.resultCode == 1) {
......
src/components/commonPage/comCheckHotel.vue
View file @ bd7efaf5
This diff is collapsed.
src/components/dmc/manager/dmcTotalTable_swt.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/components/dmc/manager/swtBaoJiaConfig.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/components/magiContract.vue
View file @ bd7efaf5
......@@ -478,9 +478,7 @@ export default {
Id:this.$route.query.Id
}
this.apipost("viitto_get_GetEntityService",msg,res => {
console.log(res,'来了');
if (res.data.resultCode == 1) {
//this.Success('保存成功');
let myData = res.data.data;
this.msg.CustomerName = myData.CustomerName;
if(myData.SignDate!=null){
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ bd7efaf5
......@@ -54,7 +54,7 @@
<TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice3>
<TravelPrice4 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
<TravelPrice4 @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
v-if="TeamType==3" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:TeamType="TeamType"></TravelPrice4>
......
src/components/scenicSpot/admissionStatisticsDetails_SWT.vue 0 → 100644
View file @ bd7efaf5
This diff is collapsed.
src/router/config.js
View file @ bd7efaf5
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