Skip to content

C
CRM
Commit c6dd9192 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

parents a4a52c8e 12c434eb
Show whitespace changes
Inline Side-by-side
Showing with 671 additions and 566 deletions
src/components/Home.vue
View file @ c6dd9192
......@@ -5,19 +5,38 @@
<el-card class="rank-card" shadow="never">
<div slot="header" class="clearfix">
<el-row>
<el-col :span="12">
<el-col :span="4">
<span>排行榜</span>
</el-col>
<el-col :span="12" class="option-item" style="display:flex;align-items:center;flex-direction: row-reverse;">
<el-col :span="20" class="option-item" style="display:flex;align-items:center;flex-direction: row-reverse;">
<el-select v-model="rankMsg.RankType" size="mini" style="width:120px;" placeholder="请选择"
@change="GetRankingList">
<el-option v-for="(x,i) in rankTypeList" :key="i" :label="x.name" :value="x.id"></el-option>
</el-select>
<div style="width:235px;margin-right:25px;">
<div v-if="diyDateRange==''">
<el-button plain size="mini" class="hide_input_time" style="margin:0 25px;">自定义日期
<el-date-picker
v-model="diyDateRange"
type="daterange"
align="right"
unlink-panels
ref="diydateRef"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="setDiyDateRange"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions">
</el-date-picker>
</el-button>
</div>
<div style="width:235px;" v-if="diyDateRange==''">
<el-tabs v-model="currentRankRange" @tab-click="changeRankTypeHandler" class="hide-tabs-content">
<el-tab-pane v-for="(x,i) in dataRangeList" :key="i" :label="x.name" :name="x.id.toString()"></el-tab-pane>
</el-tabs>
</div>
<el-tag class="f12" size="medium" @close="clearDiyDateRange" closable v-if="diyDateRange!=''" style="margin-right:25px;">自定义日期：{{diyDateRange[0]}} 至 {{diyDateRange[1]}}</el-tag>
</el-col>
</el-row>
</div>
......@@ -390,6 +409,37 @@ export default {
},
data() {
return {
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
rankType: 1,
rankType2: "1",
RankingList: [],
......@@ -443,6 +493,7 @@ export default {
type: "3",
},
],
diyDateRange: "",
currentRankType: {},
currentRankRange: "2",
rankMsg: {
......@@ -514,6 +565,18 @@ export default {
this.dataRangeList[3].startTime = this.formatDate(date, "YYYY", 0);
this.dataRangeList[3].endTime = this.dataRangeList[3].startTime;
},
clearDiyDateRange() {
this.diyDateRange = "";
this.changeRankTypeHandler();
},
setDiyDateRange() {
if (this.diyDateRange != "") {
this.rankMsg.QueryType = 1;
this.rankMsg.StartDay = this.diyDateRange[0];
this.rankMsg.EndDay = this.diyDateRange[1];
this.GetRankingList();
}
},
changeRankTypeHandler() {
this.clearRankMsgHandler();
let temp = this.dataRangeList.find(
......@@ -1050,4 +1113,13 @@ export default {
.hide-tabs-content .el-tabs__nav-wrap::after {
background: none !important;
}
.hide_input_time {
position: relative !important;
}
.hide_input_time .el-date-editor {
position: absolute;
top: 0;
left: 0;
opacity: 0;
}
</style>
src/components/customerManage/customerOrder.vue
View file @ c6dd9192
......@@ -293,8 +293,9 @@
VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态
StartTime:"",
EndTime:""
StartTime:"",//订单开始时间
EndTime:"",//订单结束时间
OrderType:"",//订单类型
},
ticketingStatusList:[],// 出票状态
OrderStatusList:[],
......
src/components/customerManage/myCustomerOrder.vue
View file @ c6dd9192
......@@ -275,8 +275,9 @@
VisaStatus:"0",//出签状态
OrderStatus:"0",//订单状态
Q_IsCollect:"0",//收款状态
StartTime:"2022-04-28",
EndTime:""
StartTime:"",//订单开始时间
EndTime:"",//订单结束时间
OrderType:"",//订单类型
},
ticketingStatusList:[],// 出票状态
OrderStatusList:[],
......
src/components/guestManagement/Agreement.vue
View file @ c6dd9192
......@@ -21,7 +21,8 @@
padding: 5px;
color: #409eff;
}
.numIcon:hover{
.numIcon:hover {
cursor: pointer;
}
......@@ -72,57 +73,69 @@
color: #2961FE;
cursor: pointer;
}
.agreement-IncomeMoney-box{
.agreement-IncomeMoney-box {
/* position: relative; */
}
.agreement-IncomeMoney-box .numIcon{
.agreement-IncomeMoney-box .numIcon {
position: relative;
}
.agreement-IncomeMoney-pop{
.agreement-IncomeMoney-pop {
position: absolute;
top: -15px;
left: 30px;
z-index: 1;
background: #fff;
padding: 10px 19px 10px 19px;
Box-shadow:5px 5px 10px 5px #ccc;
Box-shadow: 5px 5px 10px 5px #ccc;
}
/deep/.Agreement-Business .el-table .cell{
/deep/.Agreement-Business .el-table .cell {
overflow: initial !important;
}
.agreement-Cancel{
.agreement-Cancel {
text-align: right;
color: #409eff;
}
.agreement-Cancel span:first-child{
.agreement-Cancel span:first-child {
color: #999999;
margin-right: 20px;
}
.agreement-Cancel span:hover{
.agreement-Cancel span:hover {
cursor: pointer;
}
.float-flag-shape{
.float-flag-shape {
position: absolute;
top:20px;
top: 20px;
border: 1px solid #fff;
height: 0;
width: 0;
border-left: 4px solid rgba(0,0,0,0);
border-left: 4px solid rgba(0, 0, 0, 0);
border-right: 4px solid #fff;
border-top: 3px solid rgba(0,0,0,0);
border-top: 3px solid rgba(0, 0, 0, 0);
border-bottom: 3px solid #fff;
left:-8px;
left: -8px;
}
/deep/.el-table .cell.el-tooltip{
/deep/.el-table .cell.el-tooltip {
overflow: hidden !important;
}
/deep/.classorder .Agreement-Business table th{
text-indent:0 !important;
/deep/.classorder .Agreement-Business table th {
text-indent: 0 !important;
}
/deep/.el-table th>.cell{
/deep/.el-table th>.cell {
text-align: left !important;
}
.OrderType-text-box{
.OrderType-text-box {
word-break: break-word;
word-wrap: break-word;
white-space: -moz-pre-wrap;
......@@ -133,17 +146,20 @@
white-space: pre-wrap;
white-space: pre-line;
}
.text-underline{
.text-underline {
font-size: 16px;
color: rgb(41, 97, 254);
margin-right: 10px;
font-weight: bold;
cursor: pointer;
}
.OrderType-text-box .text-underline:hover{
.OrderType-text-box .text-underline:hover {
text-decoration: underline;
}
.OrderType-text{
.OrderType-text {
font-size: 10px;
font-weight: 100;
margin-left: 5px;
......@@ -152,32 +168,39 @@
padding: 0 1px;
margin-bottom: 2px;
}
.OrderType-text-box .OrderType-text:nth-child(2){
.OrderType-text-box .OrderType-text:nth-child(2) {
margin-left: 0;
}
.OrderType-text.one{
.OrderType-text.one {
color: rgb(41, 97, 254);
background-color: rgba(41, 97, 254,.2);
background-color: rgba(41, 97, 254, .2);
}
.OrderType-text.two{
.OrderType-text.two {
color: rgb(242, 140, 29);
background-color: rgba(242, 140, 29,.2);
background-color: rgba(242, 140, 29, .2);
}
.OrderType-text.three{
.OrderType-text.three {
color: rgb(63, 196, 255);
background-color: rgba(63, 196, 255,.2);
background-color: rgba(63, 196, 255, .2);
}
.OrderType-text.four{
color: rgb(255,111,0);
background-color: rgba(255,111,0,.2);
.OrderType-text.four {
color: rgb(255, 111, 0);
background-color: rgba(255, 111, 0, .2);
}
.OrderType-text.five{
color: rgb(33,186,69);
background-color: rgba(33,186,69,.2);
.OrderType-text.five {
color: rgb(33, 186, 69);
background-color: rgba(33, 186, 69, .2);
}
.Order-list-Status.six{
color: rgb(102,187,106);
background-color: rgba(102,187,106,.2);
.Order-list-Status.six {
color: rgb(102, 187, 106);
background-color: rgba(102, 187, 106, .2);
}
</style>
<template>
......@@ -193,20 +216,17 @@
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">出票状态：</span>
<el-select size="mini" width="200" v-model="msg.TicketStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in ticketingStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
<el-option v-for="item in ticketingStatusList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option>
</el-select>
</div>
</el-col>
<el-col :span="5">
<div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">出签状态：</span>
<el-select size="mini" width="200" v-model="msg.VisaStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in VisaList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
<el-select size="mini" width="200" v-model="msg.VisaStatus" placeholder="请选择" @change="getList">
<el-option v-for="item in VisaList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
</el-col>
......@@ -215,33 +235,23 @@
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单状态：</span>
<el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择"
@change="getList">
<el-option
v-for="item in OrderStatusList"
:key="item.Id" :label="item.Name" :value="item.Id"></el-option>
<el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option>
</el-select>
</div>
</el-col>
</el-row>
<el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
<el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">
创建订单</el-button>
</div>
<div class="page-content">
<el-table
v-loading="loading"
stripe
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12">
<el-table-column
fixed
label="订单号" :width="110">
<el-table v-loading="loading" stripe ref="multipleTable" :data="dataList" tooltip-effect="dark"
style="width: 100%" :height="dataList.length > 0 ? '600' : '660'" row-class-name="font-size-12">
<el-table-column fixed label="订单号" :width="110">
<template slot-scope="scope">
<div class="OrderType-text-box" @click="clickSingleNumber(scope.row)">
<p class="text-underline">{{scope.row.OrderId}}</p>
<span class="OrderType-text"
:class="[items.Id==1?'one':
<span class="OrderType-text" :class="[items.Id==1?'one':
(items.Id==2?'two':
(items.Id==3?'three':
(items.Id==4?'four':
......@@ -265,8 +275,10 @@
</el-table-column>
<el-table-column label="应收" show-overflow-tooltip>
<template slot-scope="scope">
<p @click="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?editOrderAmount(scope.row):''" class="cp"
:class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">{{scope.row.Money}}</p>
<p @click="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?editOrderAmount(scope.row):''"
class="cp"
:class="scope.row.TicketStatus==1&&scope.row.OrderStatus==1?'font-color-link':''">
{{scope.row.Money}}</p>
</template>
</el-table-column>
<el-table-column label="实收" :width="120">
......@@ -274,8 +286,7 @@
<div class="agreement-IncomeMoney-box">
{{scope.row.IncomeMoney}}
<i v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
@click="makeAdocument(scope.row,scope.$index,1)"
class="iconfont iconjia- numIcon">
@click="makeAdocument(scope.row,scope.$index,1)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
<el-checkbox-group v-model="scope.row.checkList"
......@@ -309,7 +320,8 @@
@click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
<div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
<div class="float-flag-shape"></div>
<el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)">
<el-radio-group v-model="scope.row.selectedType"
@change="clickMultipleChoice(scope.row,scope.$index,3)">
<el-radio v-for="(item,index) in scope.row.MultipleChoiceList" :key="index"
:label="item.Id">{{item.Name}}</el-radio>
</el-radio-group>
......@@ -337,9 +349,7 @@
</el-table-column>
<el-table-column label="出票状态" :width="90">
<template slot-scope="scope">
<span @click="modifyStatus(scope.row)"
class="cp tatusText"
:class="scope.row.TicketStatus==1?'grey':
<span @click="modifyStatus(scope.row)" class="cp tatusText" :class="scope.row.TicketStatus==1?'grey':
(scope.row.TicketStatus==2?'success':
(scope.row.TicketStatus==3?'error':
(scope.row.TicketStatus==4?'Black':'')))">
......@@ -348,14 +358,13 @@
<i v-if="scope.row.TicketStatus!=1&&
scope.row.TicketVoucherList!=[]&&
scope.row.CancelVoucherList!=[]&&
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials"
@click="viewCredentials(scope.row)"></i>
</template>
</el-table-column>
<el-table-column label="出签状态" :width="90">
<template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText"
:class="scope.row.VisaStatus==1?'grey'+' cp':
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''" class="tatusText" :class="scope.row.VisaStatus==1?'grey'+' cp':
(scope.row.VisaStatus==2?'success':
(scope.row.VisaStatus==0?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
......@@ -382,8 +391,7 @@
<el-table-column label="收入单据" show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.IncomeFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
:class="item.Status==1?'income_1':'income_2'" @click="openDetails(item.FrID)">
{{item.FrID}}
</p>
</template>
......@@ -391,8 +399,7 @@
<el-table-column label="退款单据" show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.BackFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
:class="item.Status==1?'income_1':'income_2'" @click="openDetails(item.FrID)">
{{item.FrID}}
</p>
</template>
......@@ -400,8 +407,7 @@
<el-table-column label="成本单据" show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.PayFinance" :key="index"
:class="item.Status==1?'income_1':'income_2'"
@click="openDetails(item.FrID)">
:class="item.Status==1?'income_1':'income_2'" @click="openDetails(item.FrID)">
{{item.FrID}}
</p>
</template>
......@@ -412,23 +418,15 @@
<template slot-scope="scope">
<div class="item-but-box">
<div class="enedit-box">
<el-tooltip
v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5"
class="item-but" effect="dark" content="编辑订单" placement="top">
<el-tooltip v-if="scope.row.OrderStatus!=2&&scope.row.OrderStatus!=5" class="item-but"
effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
<div>
<el-select style="width:70px" class="select-right"
clearable
size="mini"
v-model="scope.row.More" placeholder="更多"
@change="chooseMore(scope.row)">
<el-option
v-for="items in scope.row.MoreList"
v-show="items.show"
:key="items.Id"
:label="items.Name"
:value="items.Id">
<el-select style="width:70px" class="select-right" clearable size="mini"
v-model="scope.row.More" placeholder="更多" @change="chooseMore(scope.row)">
<el-option v-for="items in scope.row.MoreList" v-show="items.show"
:key="items.Id" :label="items.Name" :value="items.Id">
</el-option>
</el-select>
</div>
......@@ -441,11 +439,14 @@
</el-table>
</div>
<div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[10, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
<!-- 单号抽屉 -->
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true" :visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<el-drawer @closed="closeOrderDrawerHandler" :with-header="false" size='70%' :append-to-body="true"
:visible.sync="orderDrawer" direction="rtl" :before-close="handleClose">
<orderDetailsDrawer v-if="currentOrder" :orderId="currentOrder.OrderId" />
</el-drawer>
</div>
......@@ -459,10 +460,18 @@
props: ["ID", "BusinessType"],
data() {
return {
VisaList:[
{ Name: "不限", Id: "0" },
{ Name: "未出签", Id: "1" },
{ Name: "已出签", Id: "2" },
VisaList: [{
Name: "不限",
Id: "0"
},
{
Name: "未出签",
Id: "1"
},
{
Name: "已出签",
Id: "2"
},
],
MultipleChoiceList: [ //多选项目
{
......@@ -487,7 +496,7 @@
show: false
}
],
checkList:[],
checkList: [],
MoreList: [{
Name: '取消订单',
Id: '1'
......@@ -498,13 +507,14 @@
{
Name: "修改出票状态",
Id: "4",
},{
}, {
Name: '完结',
Id: '5'
}, {
Name: '操作日志',
Id: '3'
}, ],
},
],
OrderStatusList: [], //订单状态
ticketingStatusList: [], // 出票状态
dataList: [],
......@@ -515,7 +525,7 @@
OrderId: "",
GuestId: "",
TicketStatus: '0',
VisaStatus:"0",//出签状态
VisaStatus: "0", //出签状态
OrderStatus: "0",
StartCityName: "",
EndCityName: "",
......@@ -524,7 +534,7 @@
},
total: 0,
currentOrder: null,
orderDrawer:false,
orderDrawer: false,
};
},
watch: {
......@@ -541,11 +551,11 @@
this.GetTicketStatusEnumList()
this.GetOrderStatusEnumList() //订单状态枚举
let $this = this
$this.MsgBus.$on("closeGetList", function() {
$this.MsgBus.$on("closeGetList", function () {
$this.getList()
});
$this.MsgBus.$on("closeBillMaking", function() {
for(let i=0;i<$this.dataList.length;i++){
$this.MsgBus.$on("closeBillMaking", function () {
for (let i = 0; i < $this.dataList.length; i++) {
$this.dataList[i].checkList = []
$this.dataList[i].selectedType = ""
$this.dataList[i].actuallyReceived = false
......@@ -567,23 +577,23 @@
done();
},
// 取消
popCancelClick(row, index, num){
this.dataList.forEach(item=>{
popCancelClick(row, index, num) {
this.dataList.forEach(item => {
item.checkList = []
item.selectedType = ''
item.actuallyReceived =false
item.cost =false
item.actuallyReceived = false
item.cost = false
})
},
// 确定弹窗
popClick(row, index, num){
if(!row.selectedType){
popClick(row, index, num) {
if (!row.selectedType) {
this.$message.warning('请选择类型!');
return
}
this.makeAdocumentFun(row, index, num)
this.dataList[index].actuallyReceived =false
this.dataList[index].cost =false
this.dataList[index].actuallyReceived = false
this.dataList[index].cost = false
},
// 查看出票凭据
......@@ -636,7 +646,7 @@
}
},
// 订单收损完结
endOfLoss(row){
endOfLoss(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
......@@ -644,7 +654,7 @@
}
},
endOfLossfun(row){
endOfLossfun(row) {
let tips = '一旦确认订单收损完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
......@@ -657,7 +667,7 @@
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.MsgBus.$emit("closeGetList");
}else{
} else {
this.$message.warning(res.data.message);
}
})
......@@ -670,14 +680,14 @@
});
},
// 收损
lossOperation(row){
lossOperation(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.lossOperationfun(row)
}
},
lossOperationfun(row){
lossOperationfun(row) {
this.MsgBus.$emit(
"lossOrderBoxOpen",
row.GuestId,
......@@ -686,14 +696,14 @@
);
},
// 订单完结
orderCompleted(row){
orderCompleted(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
} else {
this.orderCompletedfun(row)
}
},
orderCompletedfun(row){
orderCompletedfun(row) {
let tips = '一旦确认订单完结，你将无法对订单执行任何操作，包括订单相关的财务单据。'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
......@@ -706,7 +716,7 @@
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList()
}else{
} else {
this.$message.warning(res.data.message);
}
})
......@@ -722,11 +732,11 @@
convertOrder(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator();
}else{
} else {
this.convertOrderfun(row)
}
},
convertOrderfun(row){
convertOrderfun(row) {
if (row.OrderStatus != '2') {
this.MsgBus.$emit(
"convertOrderTicketOrderBoxOpen",
......@@ -734,7 +744,7 @@
row,
true
);
}else{
} else {
this.$confirm('抱歉,该订单已取消,不能转交', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -756,12 +766,12 @@
},
// 多选发生变化
clickMultipleChoice(row, index, num) {
if(num == 1){
if (num == 1) {
row.selectedType = row.checkList.join(',')
}
},
// 删除套餐值
delType(row,item) {
delType(row, item) {
for (let i = 0; i < row.checkList.length; i++) {
if (row.checkList[i] == item) {
row.checkList.splice(i, 1)
......@@ -770,47 +780,47 @@
},
// 制作单据
makeAdocument(row, index, num) {
let list = row.OrderType&&row.OrderType.split(',')
if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{
let list = row.OrderType && row.OrderType.split(',')
if (list != null && list.length > 1 && num == 1) {
this.dataList.forEach(item => {
return item.cost = false
})
this.dataList.forEach(item=>{
this.dataList.forEach(item => {
return item.actuallyReceived = false
})
this.dataList[index].actuallyReceived = true
}
else if(list!=null&&list.length>1&&num==3){
this.dataList.forEach(item=>{
} else if (list != null && list.length > 1 && num == 3) {
this.dataList.forEach(item => {
return item.actuallyReceived = false
})
this.dataList.forEach(item=>{
this.dataList.forEach(item => {
return item.cost = false
})
this.dataList[index].cost = true
}else{
} else {
this.makeAdocumentFun(row, index, num)
}
},
makeAdocumentFun(row, index, num){
makeAdocumentFun(row, index, num) {
let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href
let url = this.domainManager().erpRoutingUrl
let data
let list = row.OrderType&&row.OrderType.split(',')
let list = row.OrderType && row.OrderType.split(',')
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator()
} else {
if (row.OrderStatus != '2') {
if(list&&list.length>1){
if (list && list.length > 1) {
let typeList = row.selectedType.split(',')
if(num=='1'&&typeList.length>=2){
if (num == '1' && typeList.length >= 2) {
let $this = this;
row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(typeList.length==1&&num=='1'||num=='3'){
}
if (typeList.length == 1 && num == '1' || num == '3') {
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
......@@ -820,15 +830,17 @@
GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON
.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
for (let i = 0; i < this.dataList.length; i++) {
this.dataList[i].checkList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
this.dataList[i].cost = false
}
}if(num=='2'){
}
if (num == '2') {
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
......@@ -837,9 +849,10 @@
ReFinanceId2: num,
GuestId: row.GuestId,
}]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON
.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
for (let i = 0; i < this.dataList.length; i++) {
this.dataList[i].checkList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
......@@ -847,8 +860,8 @@
}
}
}else{
if(num==1||num==2){
} else {
if (num == 1 || num == 2) {
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
......@@ -859,7 +872,7 @@
RelevanceFrId: row.OrderType, // 单据类型
}]
}
if(num==3){
if (num == 3) {
data = [{
path: 'ChoiceAddFinancialDocuments',
type: type,
......@@ -869,9 +882,10 @@
GuestId: row.GuestId,
}]
}
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON
.stringify(data)
window.open(href);
for(let i=0;i<this.dataList.length;i++){
for (let i = 0; i < this.dataList.length; i++) {
this.dataList[i].checkList = []
this.dataList[i].selectedType = ""
this.dataList[i].actuallyReceived = false
......@@ -890,18 +904,18 @@
this.MsgBus.$emit("logTicketOrderBoxOpen", $this.ID, row, true);
},
// 修改签证状态
AmendVisa(row){
AmendVisa(row) {
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator()
} else {
this.AmendVisafun(row);
}
},
AmendVisafun(row){
AmendVisafun(row) {
this.MsgBus.$emit("AmendVisaOrderBoxOpen", row.GuestId, row, true);
},
// 出签凭证详情
CheckOutDetails(row){
CheckOutDetails(row) {
let $this = this;
this.MsgBus.$emit(
"CheckOutDetailsOrderBoxOpen",
......@@ -934,7 +948,8 @@
if (this.userInfo.EmName != row.EnterName) {
this.ValidateOperator()
} else {
if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row.PayFinance.length == 0) {
if (row.OrderStatus != '2' && row.IncomeFinance.length == 0 && row.BackFinance.length == 0 && row
.PayFinance.length == 0) {
let tips = '此操作将取消该订单，是否继续取消?'
this.$confirm(tips, '提示', {
confirmButtonText: '确定',
......@@ -1043,13 +1058,14 @@
// 获取订单列表
getList() {
this.loading = true;
this.msg.GuestId = this.ID;
this.apipost(
"/api/Order/GetGuestOrderPageList",
this.msg,
(res) => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData;
let addList = function(arr) {
let addList = function (arr) {
arr.forEach(item => {
item.More = ''
item.actuallyReceived = false
......@@ -1057,11 +1073,11 @@
item.selectedType = ''
item.checkList = []
item.MultipleChoiceList = []
item.MoreList = [
{
item.MoreList = [{
Name: "取消订单",
Id: "1",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false,
show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
item.OrderStatus != 6 ? true : false,
},
{
Name: "订单转交",
......@@ -1071,32 +1087,43 @@
{
Name: "修改订单金额",
Id: "3",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&(item.TicketStatus==1||item.VisaStatus==1)?true:false,
show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
item.OrderStatus != 6 && (item.TicketStatus == 1 ||
item.VisaStatus == 1) ? true : false,
},
{
Name: "修改出票状态",
Id: "4",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.TicketStatus<3?true:false,
show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
item.OrderStatus != 6 && item.TicketStatus < 3 ?
true : false,
},
{
Name: "修改出签状态",
Id: "5",
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6&&item.VisaStatus==1?true:false,
show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
item.OrderStatus != 6 && item.VisaStatus == 1 ?
true : false,
},
{
Name: '订单收损',
Id: '8',
show: item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
show: item.OrderStatus != 2 && item.OrderStatus != 5 &&
item.OrderStatus != 6 ? true : false
},
{
Name: '收损完结',
Id: '9',
show: (item.OrderStatus==3||item.OrderStatus==4)&&item.DueinMoney==0&&item.OrderStatus!=2&&item.OrderStatus!=5&&item.OrderStatus!=6?true:false
show: (item.OrderStatus == 3 || item.OrderStatus ==
4) && item.DueinMoney == 0 && item.OrderStatus !=
2 && item.OrderStatus != 5 && item.OrderStatus !=
6 ? true : false
},
{
Name: '订单完结',
Id: '6',
show: item.OrderStatus==1&&item.DueinMoney==0?true:false
show: item.OrderStatus == 1 && item.DueinMoney == 0 ?
true : false
},
{
Name: "操作日志",
......@@ -1107,23 +1134,24 @@
});
};
addList(data);
data.forEach(item=>{
if(item.OrderType){
let list = item.OrderType&&item.OrderType.split(',')
for(let j=0;j<list.length;j++){
for(let i=0;i<this.MultipleChoiceList.length;i++){
if(list[j]==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this.MultipleChoiceList[i])))
data.forEach(item => {
if (item.OrderType) {
let list = item.OrderType && item.OrderType.split(',')
for (let j = 0; j < list.length; j++) {
for (let i = 0; i < this.MultipleChoiceList.length; i++) {
if (list[j] == this.MultipleChoiceList[i].Id) {
item.MultipleChoiceList.push(JSON.parse(JSON.stringify(this
.MultipleChoiceList[i])))
}
}
}
}
if(item.LossList.length>0){
if (item.LossList.length > 0) {
let LossList = item.LossList
for(let h=0;h<LossList.length;h++){
for(let i=0;i<item.MultipleChoiceList.length;i++){
if(LossList[h].OrderType==this.MultipleChoiceList[i].Id){
item.MultipleChoiceList[i].show=true
for (let h = 0; h < LossList.length; h++) {
for (let i = 0; i < item.MultipleChoiceList.length; i++) {
if (LossList[h].OrderType == this.MultipleChoiceList[i].Id) {
item.MultipleChoiceList[i].show = true
}
}
}
......
src/components/planeTicketOrder/index.vue
View file @ c6dd9192
......@@ -197,6 +197,13 @@
</div>
</template>
</el-table-column>
<el-table-column fixed prop="EnterName" label="引流人员">
<template slot-scope="scope">
<div>
{{scope.row.CreateByName}}
</div>
</template>
</el-table-column>
<el-table-column fixed prop="OrderId" label="订单号">
<template slot-scope="scope">
<div v-if="scope.row.OrderId === 0">
......@@ -661,7 +668,7 @@ export default {
},
//改变状态背景颜色
columenStyle({columnIndex}){
if(columnIndex == 6 ){
if(columnIndex == 7 ){
return "background:#f0f5fb"
}
},
......
src/views/workstatistics/dayStatistics.vue
View file @ c6dd9192
<template>
<div class="customerManage">
<div class="customerManage" style="height:100%;">
<div class="tools">
<div class="tools-item">
<h1>每日引流统计</h1>
......@@ -20,8 +20,8 @@
</el-dropdown>
</div>
</div>
<div class="page-content" style="padding-bottom:20px;">
<el-table :data="tableData" tooltip-effect="dark" v-loading="loading" style="width: 100%;height:100%;" border
<div class="page-content" style="padding-bottom:20px;height:calc(100% - 61px);box-sizing:border-box;">
<el-table :data="tableData" tooltip-effect="dark" v-loading="loading" style="width: 100%;" height="100%" border
:cell-class-name="tableCellClassName" :row-class-name="tableRowClassName">
<el-table-column>
<template slot-scope="scope">
......@@ -74,16 +74,16 @@
</template>
<script>
import clueComponent from "@/components/clueManagement/clueComponent";
export default {
import clueComponent from "@/components/clueManagement/clueComponent";
export default {
components: {
clueComponent
clueComponent,
},
data() {
return {
queryTime: {
StartTime: '',
EndTime: ''
StartTime: "",
EndTime: "",
},
drawer: false,
isDrawer: true,
......@@ -116,9 +116,9 @@
var currentY = this.msg.YearStr;
var currentM = this.msg.MonthStr;
var MonthDayNum = new Date(currentY, currentM, 0).getDate(); //计算当月的天数
this.queryTime.StartTime = this.msg.YearStr + '-' + row.DateStr
this.queryTime.EndTime = this.msg.YearStr + '-' + row.DateStr
this.drawer = true
this.queryTime.StartTime = this.msg.YearStr + "-" + row.DateStr;
this.queryTime.EndTime = this.msg.YearStr + "-" + row.DateStr;
this.drawer = true;
},
init() {
if (this.loading) return;
......@@ -135,9 +135,7 @@
}
);
},
tableRowClassName({
row
}) {
tableRowClassName({ row }) {
let cname = "font-size-12";
if (
row.DateStr == "总数" ||
......@@ -150,12 +148,10 @@
}
return cname;
},
tableCellClassName({
row,
column
}) {
tableCellClassName({ row, column }) {
if (
row[column.property] && row[column.property].toString().indexOf("-") != -1 &&
row[column.property] &&
row[column.property].toString().indexOf("-") != -1 &&
column.property != "DateStr"
) {
return "warning-col";
......@@ -192,33 +188,33 @@
);
},
},
};
};
</script>
<style>
@import "../../assets/css/customerManage.css";
@import "../../assets/css/customerManage.css";
.el-table__fixed-body-wrapper table {
.el-table__fixed-body-wrapper table {
padding-bottom: 8px !important;
}
}
.el-table .xiaoji-row {
.el-table .xiaoji-row {
background: #ffff00;
}
}
.el-table .sum-row {
.el-table .sum-row {
background: #00b0f0;
}
}
.el-table .warning-col {
.el-table .warning-col {
background: red;
}
}
.pointer {
.pointer {
cursor: pointer;
}
}
.pointer:hover {
.pointer:hover {
color: #00b0f0;
}
}
</style>
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