Skip to content

S
SuperMan
Commit f5bb4aa4 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

解决冲突

parents efb8bb26 26a6bcde
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1414 additions and 1088 deletions
src/App.vue
View file @ f5bb4aa4
...@@ -108,7 +108,7 @@ export default { ...@@ -108,7 +108,7 @@ export default {
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_a59svrd6x1.css"; @import "//at.alicdn.com/t/font_635492_uyefzcxpu3.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";
......
src/assets/common/lang/zh.js
View file @ f5bb4aa4
...@@ -37,6 +37,9 @@ export const pub={ ...@@ -37,6 +37,9 @@ export const pub={
returnBack:'返回', returnBack:'返回',
allday:'全天', allday:'全天',
clickToView:'点击查看', clickToView:'点击查看',
man:'男',
woman:'女',
} }
export const login = { export const login = {
...@@ -1156,4 +1159,31 @@ export const rule = { ...@@ -1156,4 +1159,31 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户', qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人', qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门', qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
qsrbdgangwei:"请选择绑定岗位",
qsrzqdbmdianhua:"请输入正确的部门电话",
qszhengshu:"请输整数",
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
}
export const adm={
adm_xzbumen:"新增部门",
adm_sxjg:"树形结构",
adm_fhlb:"返回列表",
adm_jggl:"结构管理",
adm_addzibumen:"添加子部门",
adm_addbumen:"添加部门",
adm_addyuangong:"添加员工",
adm_edityuangong:"员工修改",
adm_xueli:"学历",
adm_rzshijain:"入职时间",
} }
\ No newline at end of file
src/components/FinancialModule/CapitalAllocation.vue
View file @ f5bb4aa4
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.page_CapitalAllocation .page_CapitalAllocation_list { .page_CapitalAllocation .page_CapitalAllocation_list {
width: 100%; width: 100%;
} }
.page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.edit{ .page_CapitalAllocation i.icon-sousuo,.page_CapitalAllocation i.editedit{
width: 30px; width: 30px;
height: 30px; height: 30px;
display: inline-block; display: inline-block;
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/> <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="goURL('addCapitalAllocation')"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="method5()"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -142,9 +143,9 @@ ...@@ -142,9 +143,9 @@
<tr> <tr>
<th>单号</th> <th>单号</th>
<th>金额</th> <th>金额</th>
<th>实付</th> <!-- <th>实付</th> -->
<!-- <th>原币金额</th> --> <!-- <th>原币金额</th> -->
<th>交易日期</th> <!-- <th>交易日期</th> -->
<th>创建时间</th> <th>创建时间</th>
<th>创建人</th> <th>创建人</th>
<!-- <th>备注</th> --> <!-- <th>备注</th> -->
...@@ -152,11 +153,11 @@ ...@@ -152,11 +153,11 @@
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item, index) in dataList"> <tr v-for="(item, index) in dataList">
<td>{{item.FrID}}</td> <td style="cursor:pointer" @click="goDetail('CapitalAllocationDetail', item.FrID)">{{item.FrID}}</td>
<td>{{item.Money}}</td> <td>{{item.Money}}</td>
<td>{{item.PayMoney}}</td> <!-- <td>{{item.PayMoney}}</td> -->
<!-- <td>{{item.OriginalMoney}}</td> --> <!-- <td>{{item.OriginalMoney}}</td> -->
<td>{{item.TradeDate}}</td> <!-- <td>{{item.TradeDate}}</td> -->
<td>{{item.CreateDate}}</td> <td>{{item.CreateDate}}</td>
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<!-- <td>{{item.Description}}</td> --> <!-- <td>{{item.Description}}</td> -->
...@@ -199,6 +200,16 @@ ...@@ -199,6 +200,16 @@
</tr> </tr>
</table> </table>
<div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div> <div class="noDataNotice" v-if="dataList.length<1"><i class="iconfont icon-kong"></i> <p>没有找到你需要的数据</p></div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize
:total=total>
</el-pagination>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -209,7 +220,7 @@ export default { ...@@ -209,7 +220,7 @@ export default {
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
FrID: '', FrID: '0',
UpdateBy: '-1', UpdateBy: '-1',
RB_Branch_Id: -1, RB_Branch_Id: -1,
RB_Depart_Id: -2, RB_Depart_Id: -2,
...@@ -218,6 +229,7 @@ export default { ...@@ -218,6 +229,7 @@ export default {
Status: '-1', Status: '-1',
sTradeDate: '', sTradeDate: '',
eTradeDate: '', eTradeDate: '',
EmployeeId:0
}, },
getCompanyMsg:{ // 公司 getCompanyMsg:{ // 公司
RB_Group_Id:'0', RB_Group_Id:'0',
...@@ -265,7 +277,8 @@ export default { ...@@ -265,7 +277,8 @@ export default {
this.loading= true this.loading= true
this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{ this.apipost('Financial_get_GetFundTransferPageList', this.msg, res=>{
if (res.data.resultCode===1){ if (res.data.resultCode===1){
this.dataList = res.data.data.pageData this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
...@@ -275,6 +288,23 @@ export default { ...@@ -275,6 +288,23 @@ export default {
this.loading= false this.loading= false
}, null) }, null)
}, },
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex(){ // 重置页码
this.msg.pageIndex=1;
this.currentPage = 1;
},
//导出
method5: function() {
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
this.msg.EmployeeId=this.EmId;
this.GetLocalFile("Financial_get_OutToFundTransfer", this.msg,"资金调拨报表.xls");} ,
getCompanyList: function () { //获取公司列表 getCompanyList: function () { //获取公司列表
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{ this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ f5bb4aa4
...@@ -161,6 +161,8 @@ ...@@ -161,6 +161,8 @@
<el-option key="0" value="0" label="不限"></el-option> <el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option> <el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option> <el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="5" label="应收"></el-option>
<el-option key="2" value="6" label="应付"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option> <el-option key="2" value="4" label="资金调拨"></el-option>
</el-select> </el-select>
</span> </span>
...@@ -589,6 +591,12 @@ ...@@ -589,6 +591,12 @@
<template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0"> <template v-else-if="item.OrderSource==10 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p> <p class="_TCIDAndTCNUMList">签证编号：{{item.SourceID}}</p>
</template> </template>
<template v-else-if="item.OrderSource==11 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">投诉编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==12 && item.TCIDAndTCNUMList.length==0">
<p class="_TCIDAndTCNUMList">散卖机票编号：{{item.SourceID}}</p>
</template>
<template v-else-if="item.OrderSource==0"> <template v-else-if="item.OrderSource==0">
<p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p> <p class="_TCIDAndTCNUMList">{{ item.BranchName }}-{{item.DepartName}} </p>
</template> </template>
...@@ -619,7 +627,15 @@ ...@@ -619,7 +627,15 @@
<p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p> <p>{{item.Type==1?'实收':'实付'}}：<span class="">{{moneyFormat(item.PayMoney)}}</span></p>
</td> </td>
<td> <td>
<span class="_color_gar">{{item.Type==2?item.ClientTypeName+'：':'汇款人：'}}</span><span>{{item.RemitterName}}</span> <template v-if='item.Type===1'>
<span class="_color_gar">汇款人：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===2'>
<span class="_color_gar">付款对象：</span><span>{{item.RemitterName}}</span>
</template>
<template v-if='item.Type===4'>
<span class="_color_gar">无</span>
</template>
</td> </td>
<td valign="middle"> <td valign="middle">
<img class="_head_img" :src="item.EmPhoto" alt=""> <img class="_head_img" :src="item.EmPhoto" alt="">
...@@ -658,7 +674,8 @@ ...@@ -658,7 +674,8 @@
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i> <i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type==1?'addReceivablesDocuments':'addFinancialDocuments',item.Type,item.FrID,true,active,msg.pageIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<i class="iconfont icon-sousuo" @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i> <i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
<i class="iconfont icon-sousuo" v-if='item.Type===4' @click="goUrl('CapitalAllocationDetail',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="审核" placement="top"> <el-tooltip class="item" effect="dark" content="审核" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i> <i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
...@@ -1343,7 +1360,7 @@ export default { ...@@ -1343,7 +1360,7 @@ export default {
pageSize:6, pageSize:6,
FrID:this.msg.FrID==0?'':this.msg.FrID, FrID:this.msg.FrID==0?'':this.msg.FrID,
sDate:this.msg.sDate, sDate:this.msg.sDate,
eDate:this.msg.sDate, eDate:this.msg.eDate,
Status:this.msg.Status, Status:this.msg.Status,
TemplateId:this.msg.TemplateId, TemplateId:this.msg.TemplateId,
RB_Branch_Id:this.msg.RB_Branch_Id, RB_Branch_Id:this.msg.RB_Branch_Id,
......
src/components/Hotel/roomReservations.vue
View file @ f5bb4aa4
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<tr> <tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div> <div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>1' class="w100">合团号：{{outItem.NewCombinationNum}}</div> <div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
</td> </td>
<td> <td>
<div class="w80"> <div class="w80">
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
</td> </td>
<td> <td>
<div class="w80 link"> <div class="w80 link">
<p @click="goUrl('roomReservationsDetails',item,'订房详情')">详情</p> <p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div> </div>
</td> </td>
</tr> </tr>
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
} }
}) })
}, },
goUrl(path, obj, title) { goUrl(path, obj,outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
'TCNUM': obj.TCNUMS, 'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat, 'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum, 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
} }
......
src/components/SalesModule/groupInquiry.vue
View file @ f5bb4aa4
...@@ -747,7 +747,8 @@ export default { ...@@ -747,7 +747,8 @@ export default {
//航班配置 //航班配置
FlightState:0, FlightState:0,
TCVisaStatus: '-1', TCVisaStatus: '-1',
IsShowUnion:1 IsShowUnion:1,
QueryType:1,//查询类型 1:签证
}, },
remarkMsg: { remarkMsg: {
TCID: 0, TCID: 0,
......
src/components/busManagement/BusInfo.vue
View file @ f5bb4aa4
...@@ -82,7 +82,9 @@ ...@@ -82,7 +82,9 @@
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.BusTyleFirst .w150{
margin-right:22px;
}
</style> </style>
<template> <template>
<div class="flexOne busInfo"> <div class="flexOne busInfo">
...@@ -192,11 +194,14 @@ ...@@ -192,11 +194,14 @@
</div> </div>
</td> </td>
<td> <td>
<div class="w180"> <div class="w180" :class="{'BusTyleFirst':index==0}">
<el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" :disabled="forbidInput" @change='getBusPrice(item)'> <el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" :disabled="forbidInput" @change='getBusPrice(item)'>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id"> <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="index!=0" @click="getBeforeInfo(index)"></i>
</el-tooltip>
</div> </div>
</td> </td>
<td> <td>
...@@ -515,6 +520,7 @@ export default { ...@@ -515,6 +520,7 @@ export default {
x.BookGroup = this.$route.query.NewCombinationNum; x.BookGroup = this.$route.query.NewCombinationNum;
} }
}) })
console.log(this.PlanTableData,'plandata');
} }
}, },
null null
...@@ -695,6 +701,29 @@ export default { ...@@ -695,6 +701,29 @@ export default {
2 2
); );
this.PostData.CostPrice = CoastPrice; this.PostData.CostPrice = CoastPrice;
},
//获取同上信息
getBeforeInfo(index){
let oldPlanData = this.PlanTableData[index-1];
let newPlanData = this.PlanTableData[index];
newPlanData.PlanDateStr = oldPlanData.PlanDateStr;
newPlanData.HotelName = oldPlanData.HotelName;
newPlanData.IsHavearking = oldPlanData.IsHavearking;
newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
newPlanData.UseType = oldPlanData.UseType;
newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.AccommodationType = oldPlanData.AccommodationType;
newPlanData.AccommodationRemark = oldPlanData.AccommodationRemark;
newPlanData.BusType = oldPlanData.BusType;
// newPlanData.UseNum = oldPlanData.UseNum;
// newPlanData.BusNum = oldPlanData.BusNum;
// newPlanData.BusCompany = oldPlanData.BusCompany;
// newPlanData.ParkExplain = oldPlanData.ParkExplain;
// newPlanData.CostPrice = oldPlanData.CostPrice;
// newPlanData.TransferNum = oldPlanData.TransferNum;
} }
}, },
mounted() { mounted() {
......
src/components/platformModule/companyManagement.vue
View file @ f5bb4aa4
...@@ -23,22 +23,22 @@ ...@@ -23,22 +23,22 @@
</span> </span>
</li>--> </li>-->
<li> <li>
<span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" placeholder="请输入内容"></el-input></span> <span><em>{{$t('admin.admin_company')}}</em><el-input @keyup.enter.native="getList" v-model="msg.BName" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li> </li>
<li> <li>
<span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" placeholder="请输入内容"></el-input></span> <span><em>{{$t('admin.admin_domain')}}</em><el-input @keyup.enter.native="getList" v-model="msg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input></span>
</li> </li>
<li> <li>
<span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" placeholder="不限"> <span><em>{{$t('admin.admin_status')}}</em><el-select v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option label='不限' value=''></el-option> <el-option :label="$t('pub.unlimitedSel')" value=''></el-option>
<el-option label='开启' value='0'></el-option> <el-option :label="$t('pub.openSel')" value='0'></el-option>
<el-option label='关闭' value='1'></el-option> <el-option :label="$t('pub.closeSel')" value='1'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="resetPageIndex(),getList()" /> &nbsp; <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> &nbsp;
<input type="button" class="normalBtn" value="新增" @click="outerVisible = true,dialogTitle='新增公司'" /> <input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增公司'" />
</li> </li>
</ul> </ul>
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<th width="300">{{$t('admin.admin_company')}}</th> <th width="300">{{$t('admin.admin_company')}}</th>
<!-- <th>{{$t('admin.admin_domain')}}</th> --> <!-- <th>{{$t('admin.admin_domain')}}</th> -->
<!-- <th>{{$t('admin.admin_leader')}}</th> --> <!-- <th>{{$t('admin.admin_leader')}}</th> -->
<th>联系人</th> <th>{{$t('hotel.suplier_contact')}}</th>
<th>联系电话</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>公司类型</th> <th>公司类型</th>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<!-- <td>{{item.BranchManagerName}}</td> --> <!-- <td>{{item.BranchManagerName}}</td> -->
<td>{{item.ContactPersion}}</td> <td>{{item.ContactPersion}}</td>
<td>{{item.MobilePhone}}</td> <td>{{item.MobilePhone}}</td>
<td>{{item.Status==0?'开启':'关闭'}}</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.IsParentCompany=='1'?'总公司':'分公司'}}</td> <td>{{item.IsParentCompany=='1'?'总公司':'分公司'}}</td>
<td> <td>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<!-- <el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain"> <!-- <el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain">
<el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item label="省份" prop="Province"> <el-form-item :label="$t('system.table_pvrg')" prop="Province">
<el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province" @change="getCityList(addMsg.Province,1)"> <el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.Province" @change="getCityList(addMsg.Province,1)">
<el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
<el-option v-for='item in ProvinceList' <el-option v-for='item in ProvinceList'
...@@ -147,10 +147,10 @@ ...@@ -147,10 +147,10 @@
<el-input type="text" v-model="addMsg.GatheringAddress" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input type="text" v-model="addMsg.GatheringAddress" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> --> </el-form-item> -->
<el-form-item class='w400' label='状态' prop="Status" > <el-form-item class='w400' :label='$t("admin.admin_status")' prop="Status" >
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch> <el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item> </el-form-item>
<el-form-item class='w400' label='是否显示' 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>
<el-form-item class='w400' label='是否为总公司' prop="IsParentCompany"> <el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
...@@ -159,9 +159,9 @@ ...@@ -159,9 +159,9 @@
<el-form-item class='w400' label='部门初始层级' prop="BeginTier"> <el-form-item class='w400' label='部门初始层级' prop="BeginTier">
<el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
<el-form-item class='w400' label='负责人' prop="BranchManager"> <el-form-item class='w400' :label='$t("admin.admin_leader")' prop="BranchManager">
<el-select filterable clearable v-model='addMsg.BranchManager' placeholder="请选择"> <el-select filterable clearable v-model='addMsg.BranchManager' :placeholder="$t('pub.pleaseSel')">
<el-option label='不限' value='0'></el-option> <el-option :label="$t('admin.unlimitedSel')" value='0'></el-option>
<el-option v-for='item in employeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId"> <el-option v-for='item in employeeList' :key="item.EmployeeId" :label="item.EmName" :value="item.EmployeeId">
</el-option> </el-option>
</el-select> </el-select>
...@@ -197,9 +197,9 @@ ...@@ -197,9 +197,9 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button> <button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
&nbsp; &nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button> <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -221,10 +221,10 @@ ...@@ -221,10 +221,10 @@
return { return {
options: [{ options: [{
value: '0', value: '0',
label: '开启' label: this.$t('pub.openSel')
}, { }, {
value: '1', value: '1',
label: '关闭' label: this.$t('pub.closeSel')
}], }],
ProvinceList:[], ProvinceList:[],
CityList:[], CityList:[],
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ f5bb4aa4
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="120">定团号</th>
<th width="120">游览时间</th> <th width="120">游览时间</th>
<th width="200">景点名称</th> <th width="200">景点名称</th>
<th width="100">总人数</th> <th width="100">总人数</th>
...@@ -34,9 +33,6 @@ ...@@ -34,9 +33,6 @@
<td :rowspan="list.length" v-if="index==0"> <td :rowspan="list.length" v-if="index==0">
<div class="w120">{{TCNUM}}</div> <div class="w120">{{TCNUM}}</div>
</td> </td>
<td :rowspan="list.length" v-if="index==0">
<div class="w120">{{NewCombinationNum}}</div>
</td>
<td> <td>
<div class="w120"> <div class="w120">
{{item.UseTimeStr}} {{item.UseTimeStr}}
...@@ -158,7 +154,6 @@ ...@@ -158,7 +154,6 @@
TCNUM: '', TCNUM: '',
flightTotal: 0, flightTotal: 0,
GuestNum: 0, GuestNum: 0,
NewCombinationNum: ''
} }
}, },
methods: { methods: {
...@@ -197,6 +192,9 @@ ...@@ -197,6 +192,9 @@
item.ScenicStatisticsList.forEach(x => { item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString(); x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x); this.calculationPrice(x);
if(x.CombinationNum==''||x.CombinationNum==null){
x.CombinationNum = this.$route.query.NewCombinationNum;
}
}) })
}) })
} else { } else {
...@@ -232,7 +230,6 @@ ...@@ -232,7 +230,6 @@
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal; this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum; this.GuestNum = this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList() this.getList()
}, },
} }
......
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