Skip to content

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

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

parents 39f535bd 67810688
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 112 deletions
src/components/LeaderManagement/leaderTaskBoard.vue
View file @ 4d08b7e6
...@@ -344,8 +344,8 @@ ...@@ -344,8 +344,8 @@
</div> </div>
<div class="leaderInfo clearfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)"> <div class="leaderInfo clearfix" v-for="item in dataList" :key="item.subCode" @drop="drop($event,item.TCID,item.Id)" @dragover="allowDrop($event)">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="1"> <el-col :span="3">
<div class="leadersList"> <div class="leadersList" style="min-width:230px;height:70px;">
<div v-if="item.LeaderType==1"> <div v-if="item.LeaderType==1">
<div class="cirList" v-if="item.LeaderName!=''"> <div class="cirList" v-if="item.LeaderName!=''">
<div class="circleHeader"> <div class="circleHeader">
...@@ -398,10 +398,10 @@ ...@@ -398,10 +398,10 @@
<div class="forSaling notStart" v-if="item.TCType==2">{{$t('leader.leader_noStart')}}</div> <div class="forSaling notStart" v-if="item.TCType==2">{{$t('leader.leader_noStart')}}</div>
<div class="forSaling worked" v-if="item.TCType==3">{{$t('leader.leader_HasCompleted')}}</div> <div class="forSaling worked" v-if="item.TCType==3">{{$t('leader.leader_HasCompleted')}}</div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="1">
<div class="createName">{{$t('hotel.table_operater')}}</div> <div class="createName">{{$t('hotel.table_operater')}}</div>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="3">
<div> <div>
<div class="litCircle"> <div class="litCircle">
<img v-if="!item.CreateUrl" src="../../assets/img/default_head_img.jpg" alt=""> <img v-if="!item.CreateUrl" src="../../assets/img/default_head_img.jpg" alt="">
......
src/components/scenicSpot/ScenTicketOrder.vue
View file @ 4d08b7e6
...@@ -148,19 +148,24 @@ ...@@ -148,19 +148,24 @@
<div class="flexOne SalesHotelOrder"> <div class="flexOne SalesHotelOrder">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li>
<span><em>关键字</em>
<el-input v-model='msg.searchKey' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li> <li>
<span> <span>
<em>订单状态</em> <em>订单状态</em>
<el-select v-model='msg.B2BSelectOrderState' filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model='msg.status' filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in orderStatus" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in orderStatus" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<!-- <li> <li>
<span> <span>
<em>公司</em> <em>公司</em>
<el-select v-model="msg.RB_Branch_Id" placeholder="请选择公司" @change="getDepartmentMsg.RB_Branch_Id = msg.RB_Branch_Id, getDepartment(),msg.RB_Department_Id = 0,msg.CreateBy = 0"> <el-select v-model="msg.rbBranchId" placeholder="请选择公司" >
<el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in CompanyList' <el-option v-for='item in CompanyList'
:label='item.BName' :label='item.BName'
...@@ -169,7 +174,8 @@ ...@@ -169,7 +174,8 @@
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> --> </li>
<!-- -->
<!-- <li> <!-- <li>
<span> <span>
<em>部门</em> <em>部门</em>
...@@ -196,39 +202,21 @@ ...@@ -196,39 +202,21 @@
</el-select> </el-select>
</span> </span>
</li> --> </li> -->
<li>
<span><em>订单号</em>
<el-input v-model='msg.ProductName' :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li> <li>
<span> <span>
<em>游玩开始时间</em> <em>开始时间</em>
<el-date-picker type="date" v-model="msg.StartTime" <el-date-picker type="date" v-model="msg.startDate"
:picker-options="StartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="StartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>游玩结束时间</em> <em>结束时间</em>
<el-date-picker type="date" v-model="msg.EndTime" <el-date-picker type="date" v-model="msg.endDate"
:picker-options="EndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="EndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li>
<span>
<em>创建开始时间</em>
<el-date-picker type="date" v-model="msg.CStartTime"
:picker-options="CStartTimeBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>创建结束时间</em>
<el-date-picker type="date" v-model="msg.CEndTime"
:picker-options="CEndTimeAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li> <li>
<input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" /> <input type="button" class="hollowFixedBtn" @click="resetPageIndex();getList()" :value="$t('pub.searchBtn')" />
...@@ -239,39 +227,45 @@ ...@@ -239,39 +227,45 @@
<table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<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>
<th>创建时间</th> <th>创建时间</th>
<th>游玩时间</th> <th>游玩时间</th>
<th>取消费用</th> <th>门票名称</th>
<th>客户信息</th> <th>客户信息</th>
<th>创建人</th>
<th>结束时间</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tbody v-for="(item,index) in dataList"> <tbody v-for="(item,index) in dataList" :key="index+500">
<tr> <tr>
<td style="border-bottom:2px solid #333" rowspan="2">{{item.OrderID}}</td> <td style="border-bottom:2px solid #333" rowspan="2">{{item.id}}</td>
<td>{{item.Number}}</td> <td>{{item.purchaseQuantity}}</td>
<td>{{item.TotalPrice}}</td> <td>{{item.preferPrice}}</td>
<td>{{item.Income}}</td> <td>{{item.income}}</td>
<td>{{item.RedEnvelopeMoney}}</td> <td>
<td>{{item.DiscountMoney}}</td> <span v-if="item.reFund">{{item.reFund}}</span>
<td>{{item.DueinMoney}}</td> <span v-else>0</span>
</td>
<td>{{item.discountMoney}}</td>
<td>{{item.duein}}</td>
<td>
<span v-if="item.status==1">正常</span>
<span class="color_red_order" v-if="item.status==2">取消</span>
<span v-if="item.status==3">待付款</span>
</td>
<td>{{item.createDate}}</td>
<td>{{item.useDate}}</td>
<td>{{item.couponsName}}</td>
<td> <td>
<span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span> <p>中文姓名：{{item.contactCNName}}</p>
<p>英文姓名：{{item.contactENName}}</p>
<p>联系电话：{{item.contactEmail}}</p>
<p>邮箱：{{item.contactMobile}}</p>
</td> </td>
<td>{{item.CreateDateStr}}</td>
<td>{{item.CheckInStr}}</td>
<td>{{item.CancelFee}}</td>
<td>{{item.CustomerName}}/{{item.CustomerPhone}}</td>
<td>{{item.CreateByStr}}</td>
<td>{{item.EndTime}}</td>
<td> <td>
<el-row> <el-row>
<el-button-group> <el-button-group>
...@@ -291,7 +285,7 @@ ...@@ -291,7 +285,7 @@
<el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button> <el-button type="warning" icon="iconfont icon-guanlian" @click="TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"></el-button>
</el-tooltip> --> </el-tooltip> -->
<el-tooltip class="item" effect="dark" content="详情" placement="top-start"> <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
<el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></el-button> <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.id)"></el-button>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
</el-row> </el-row>
...@@ -312,25 +306,22 @@ ...@@ -312,25 +306,22 @@
<div class="SH_OrderDan"> <div class="SH_OrderDan">
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span v-for="subItem in item.FinanceList"> <span v-for="(subItem,index) in item.Revenue" :key="index+5000">
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span> <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem)" class="groupTourOrder_tickets_blue">{{subItem}} </span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span>
</span> </span>
<span v-if="item.FinanceList==0">暂无数据</span> <span v-if="item.Revenue==0">暂无数据</span>
</div> </div>
</div> </div>
<div class="SH_OrderDan"> <div class="SH_OrderDan">
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span v-for="subItem in item.RefundFinanceList"> <span v-for="(subItem,index) in item.expend" :key="index+1000">
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-if="subItem.ColorState===1" class="groupTourOrder_tickets_blue">{{subItem.FrID}}</span> <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem)" class="groupTourOrder_tickets_blue">{{subItem}} </span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem.FrID}}</span> <!-- <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem)" v-else-if="subItem.ColorState===2" class="groupTourOrder_tickets_green">{{subItem}} </span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem.FrID}}</span> <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem)" v-else-if="subItem.ColorState===3" class="groupTourOrder_tickets_red">{{subItem}} </span>
<span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem.FrID}}</span> <span @click="goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem)" v-else-if="subItem.ColorState===4" class="groupTourOrder_tickets_black">{{subItem}} </span> -->
</span> </span>
<span v-if="item.RefundFinanceList==0">暂无数据</span> <span v-if="item.expend==0">暂无数据</span>
</div> </div>
</div> </div>
...@@ -411,15 +402,11 @@ export default { ...@@ -411,15 +402,11 @@ export default {
msg: { msg: {
pageIndex:1, pageIndex:1,
pageSize:10, pageSize:10,
B2BSelectOrderState:0, searchKey:"",
RB_Branch_Id:-1, rbBranchId:-1,
RB_Department_Id:0, startDate:"",
CreateBy:0, endDate:"",
HotelName:'', status:0,
StartTime:'',
EndTime:'',
CStartTime:'',
CEndTime:''
}, },
TCID: '', TCID: '',
GLOrderID: '', GLOrderID: '',
...@@ -460,17 +447,14 @@ export default { ...@@ -460,17 +447,14 @@ export default {
}, },
orderStatus:[{ orderStatus:[{
Name:'全部', Name:'正常',
Id:0 Id:0
},{ },{
Name:'待支付', Name:'取消',
Id:1 Id:1
},{ },{
Name:'交易完成', Name:'待付款',
Id:2 Id:2
},{
Name:'取消',
Id:3
}], }],
dataList: [], dataList: [],
getCompanyMsg:{ // 公司 getCompanyMsg:{ // 公司
...@@ -593,7 +577,7 @@ export default { ...@@ -593,7 +577,7 @@ export default {
}, },
goOrderDetails(ID){ goOrderDetails(ID){
this.$router.push({ this.$router.push({
name: 'freeTravelOrderDetails', name: 'scenOrderDetails',
query: { query: {
ID: ID, ID: ID,
blank:'y', blank:'y',
...@@ -603,30 +587,16 @@ export default { ...@@ -603,30 +587,16 @@ export default {
getList() { getList() {
//获取列表 //获取列表
this.loading = true; this.loading = true;
this.apipost( this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => {
"sellorder_post_GetAllKKDayOrderList",
this.msg,
res => {
this.loading = false; this.loading = false;
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;
console.log(this.dataList,'datalist'); console.log(this.dataList,'datalist');
let userInfo = this.getLocalStorage(); this.total=res.data.data.count;
let EmployeeId = userInfo.EmployeeId;
this.dataList.forEach(x=>{
if((x.CreateBy == EmployeeId ||EmployeeId == 1 || EmployeeId == 5) && x.IsCanOrder == 0){
x.ShowBtn = true;
}else{
x.ShowBtn = false;
}
})
} else { } else {
this.Error(res.data.message); this.Error(res.data.message)
} }
}, }, null);
err => {}
);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
...@@ -684,8 +654,8 @@ export default { ...@@ -684,8 +654,8 @@ export default {
getShouKuan(obj){ getShouKuan(obj){
let TCIDARR = obj.TCID ? [obj.TCID] : []; let TCIDARR = obj.TCID ? [obj.TCID] : [];
let orderObj = { let orderObj = {
OrderID:obj.OrderID, OrderID:obj.id,
OrderSource: 15, OrderSource: 3,
Obj: {}, Obj: {},
SourceID:null, SourceID:null,
TCIDList: TCIDARR TCIDList: TCIDARR
...@@ -694,7 +664,7 @@ export default { ...@@ -694,7 +664,7 @@ export default {
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query:{
"Type":1, "Type":1,
"companyID":obj.RB_Branch_id, "companyID":obj.RbBranchId,
"path": "", "path": "",
'blank':'y', 'blank':'y',
'orderObj':JSON.stringify(orderObj), 'orderObj':JSON.stringify(orderObj),
...@@ -716,7 +686,7 @@ export default { ...@@ -716,7 +686,7 @@ export default {
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团 this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getDepartmentMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司 this.getDepartmentMsg.RB_Branch_Id = userInfo.RB_Branch_id; //公司
this.msg.CreateBy = userInfo.EmployeeId; this.msg.CreateBy = userInfo.EmployeeId;
// this.getCompanyList() this.getCompanyList()
// this.getDepartment() // this.getDepartment()
// this.getEmployee() // this.getEmployee()
this.getList(); this.getList();
......
src/router/config.js
View file @ 4d08b7e6
...@@ -1256,6 +1256,14 @@ export default { ...@@ -1256,6 +1256,14 @@ export default {
title: '票券订单' title: '票券订单'
}, },
}, },
{
path: '/scenOrderDetails', //票券订单
name: 'scenOrderDetails',
component: resolve => require(['@/components/scenicSpot/scenOrderDetails'], resolve),
meta: {
title: '票券订单详情'
},
},
{ {
path: '/admissionStatisticsDetails', //门票统计详情 path: '/admissionStatisticsDetails', //门票统计详情
name: 'admissionStatisticsDetails', name: 'admissionStatisticsDetails',
......
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