Commit e7f1cdcf authored by 沈良进's avatar 沈良进

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

parents 4676e6d0 34e082fa
...@@ -70,17 +70,17 @@ ...@@ -70,17 +70,17 @@
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单号</span> <span class="font-size-12" style="padding-right: 10px">订单号</span>
<el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">客人姓名</span> <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
<el-input size="mini" class="w210" v-model="msg.GuestName" placeholder="客人姓名" clearable <el-input size="mini" class="w210" v-model="msg.GuestName" placeholder="客人姓名" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出行概述</span> <span class="font-size-12" style="padding-right: 10px">出行概述</span>
<el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">业务员</span> <span class="font-size-12" style="padding-right: 10px">业务员</span>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
size="mini" size="mini"
filterable filterable
v-model="msg.EnterID" v-model="msg.EnterID"
@change="getList" @change="handleCurrentChange(1)"
clearable clearable
placeholder="业务员"> placeholder="业务员">
<el-option <el-option
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
size="mini" size="mini"
filterable filterable
v-model="msg.CreateBy" v-model="msg.CreateBy"
@change="getList" @change="handleCurrentChange(1)"
clearable clearable
placeholder="引流人员"> placeholder="引流人员">
<el-option <el-option
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出票状态</span> <span class="font-size-12" style="padding-right: 10px">出票状态</span>
<el-select size="mini" v-model="msg.TicketStatus" @change="getList"> <el-select size="mini" v-model="msg.TicketStatus" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in ticketingStatusList" <el-option v-for="(item,index) in ticketingStatusList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>出签状态</span >出签状态</span
> >
<el-select size="mini" v-model="msg.VisaStatus" @change="getList"> <el-select size="mini" v-model="msg.VisaStatus" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in VisaList" v-for="(item, index) in VisaList"
:key="index" :key="index"
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in OrderStatusList" <el-option v-for="(item,index) in OrderStatusList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">收款状态</span> <span class="font-size-12" style="padding-right: 10px">收款状态</span>
<el-select size="mini" v-model="msg.Q_IsCollect" @change="getList"> <el-select size="mini" v-model="msg.Q_IsCollect" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in QIsCollectList" <el-option v-for="(item,index) in QIsCollectList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<span class="font-size-12" style="padding-right: 10px">报名开始</span> <span class="font-size-12" style="padding-right: 10px">报名开始</span>
<el-date-picker <el-date-picker
v-model="msg.StartTime" v-model="msg.StartTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<span class="font-size-12" style="padding-right: 10px">报名结束</span> <span class="font-size-12" style="padding-right: 10px">报名结束</span>
<el-date-picker <el-date-picker
v-model="msg.EndTime" v-model="msg.EndTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishSTime" v-model="msg.FinishSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishETime" v-model="msg.FinishETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartSTime" v-model="msg.DepartSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartETime" v-model="msg.DepartETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
......
...@@ -70,21 +70,21 @@ ...@@ -70,21 +70,21 @@
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单号</span> <span class="font-size-12" style="padding-right: 10px">订单号</span>
<el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">客人姓名</span> <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
<el-input size="mini" class="w210" v-model="msg.GuestName" placeholder="客人姓名" clearable <el-input size="mini" class="w210" v-model="msg.GuestName" placeholder="客人姓名" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出行概述</span> <span class="font-size-12" style="padding-right: 10px">出行概述</span>
<el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="出行概述" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">出票状态</span> <span class="font-size-12" style="padding-right: 10px">出票状态</span>
<el-select size="mini" v-model="msg.TicketStatus" @change="getList"> <el-select size="mini" v-model="msg.TicketStatus" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in ticketingStatusList" <el-option v-for="(item,index) in ticketingStatusList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>出签状态</span >出签状态</span
> >
<el-select size="mini" v-model="msg.VisaStatus" @change="getList"> <el-select size="mini" v-model="msg.VisaStatus" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in VisaList" v-for="(item, index) in VisaList"
:key="index" :key="index"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in OrderStatusList" <el-option v-for="(item,index) in OrderStatusList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">收款状态</span> <span class="font-size-12" style="padding-right: 10px">收款状态</span>
<el-select size="mini" v-model="msg.Q_IsCollect" @change="getList"> <el-select size="mini" v-model="msg.Q_IsCollect" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in QIsCollectList" <el-option v-for="(item,index) in QIsCollectList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<span class="font-size-12" style="padding-right: 10px">报名开始</span> <span class="font-size-12" style="padding-right: 10px">报名开始</span>
<el-date-picker <el-date-picker
v-model="msg.StartTime" v-model="msg.StartTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<span class="font-size-12" style="padding-right: 10px">报名结束</span> <span class="font-size-12" style="padding-right: 10px">报名结束</span>
<el-date-picker <el-date-picker
v-model="msg.EndTime" v-model="msg.EndTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishSTime" v-model="msg.FinishSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishETime" v-model="msg.FinishETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartSTime" v-model="msg.DepartSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartETime" v-model="msg.DepartETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
......
...@@ -91,8 +91,56 @@ ...@@ -91,8 +91,56 @@
<el-table-column <el-table-column
prop="OrderId" prop="OrderId"
label="订单号" label="订单号"
show-overflow-tooltip></el-table-column>
<el-table-column
prop="OrderTypeName"
label="订单类型"
show-overflow-tooltip></el-table-column>
<el-table-column
prop="TCNUM"
label="团号"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
{{scope.row.TCNUM?scope.row.TCNUM:'-'}}
</template></el-table-column>
<el-table-column
prop="OutBranchName"
label="出团公司"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.OutBranchName?scope.row.OutBranchName:'-'}}
</template>
</el-table-column>
<el-table-column
prop="LineName"
label="线路"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.LineName?scope.row.LineName:'-'}}
</template></el-table-column>
<el-table-column
prop="PeopleNum"
label="人数"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.PeopleNum?scope.row.PeopleNum:'-'}}
<template v-if="scope.row.TCID>0">/{{scope.row.TCGuestNum}}</template>
</template></el-table-column>
<el-table-column
prop="TCProfit"
label="团利润"
show-overflow-tooltip>
<template slot-scope="scope">
<template v-if="scope.row.TCID>0">{{scope.row.TCProfit?scope.row.TCProfit:'-'}}</template>
<template v-else>-</template>
</template></el-table-column>
<el-table-column
prop="Way"
label="提成方式"
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.Way==1?'销售额':'利润比'}}
</template></el-table-column>
<el-table-column <el-table-column
prop="OrderProfit" prop="OrderProfit"
label="订单利润" label="订单利润"
......
...@@ -213,12 +213,12 @@ ...@@ -213,12 +213,12 @@
<el-row :gutter="22"> <el-row :gutter="22">
<el-col :span="8"> <el-col :span="8">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID" <el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID"
@keyup.native="getList"></el-input> @keyup.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div style="display: flex;flex-direction: row;align-items: center;"> <div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单类型:</span> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单类型:</span>
<el-select size="mini" width="200" v-model="msg.OrderType" placeholder="请选择" @change="getList"> <el-select size="mini" width="200" v-model="msg.OrderType" placeholder="请选择" @change="handleCurrentChange(1)">
<el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in OrderTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
<div style="display: flex;flex-direction: row;align-items: center;"> <div style="display: flex;flex-direction: row;align-items: center;">
<span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单状态:</span> <span class="font-size-12" style="padding-right: 10px;flex-shrink: 0;">订单状态:</span>
<el-select size="mini" width="200" v-model="msg.OrderState" placeholder="请选择" <el-select size="mini" width="200" v-model="msg.OrderState" placeholder="请选择"
@change="getList"> @change="handleCurrentChange(1)">
<el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name" <el-option v-for="item in OrderStatusList" :key="item.Id" :label="item.Name"
:value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
......
...@@ -78,13 +78,13 @@ ...@@ -78,13 +78,13 @@
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">客人姓名</span> <span class="font-size-12" style="padding-right: 10px">客人姓名</span>
<el-input size="mini" class="w210" v-model="msg.CustomerName" placeholder="客人姓名" clearable <el-input size="mini" class="w210" v-model="msg.CustomerName" placeholder="客人姓名" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col v-if="pagesTitle!='销售'" :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col v-if="pagesTitle!='销售'" :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>业务员</span >业务员</span
> >
<el-select size="mini" v-model="msg.EnterId" @change="getList"> <el-select size="mini" v-model="msg.EnterId" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in EmployeeList" v-for="(item, index) in EmployeeList"
:key="index" :key="index"
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>引流人</span >引流人</span
> >
<el-select size="mini" v-model="msg.LureEmpId" @change="getList"> <el-select size="mini" v-model="msg.LureEmpId" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in EmployeeList" v-for="(item, index) in EmployeeList"
:key="index" :key="index"
...@@ -111,23 +111,23 @@ ...@@ -111,23 +111,23 @@
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">商品名称</span> <span class="font-size-12" style="padding-right: 10px">商品名称</span>
<el-input size="mini" class="w210" v-model="msg.ProductName" placeholder="商品名称" clearable <el-input size="mini" class="w210" v-model="msg.ProductName" placeholder="商品名称" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单号</span> <span class="font-size-12" style="padding-right: 10px">订单号</span>
<el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable <el-input size="mini" class="w210" v-model="msg.OrderId" placeholder="订单号" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">团号/单号</span> <span class="font-size-12" style="padding-right: 10px">团号/单号</span>
<el-input size="mini" class="w210" v-model="msg.TCNUM" placeholder="团号/单号" clearable <el-input size="mini" class="w210" v-model="msg.TCNUM" placeholder="团号/单号" clearable
@change="getList" @keyup.enter.native="getList"></el-input> @change="handleCurrentChange(1)" @keyup.enter.native="handleCurrentChange(1)"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>订单类型</span >订单类型</span
> >
<el-select size="mini" v-model="msg.OrderType" @change="getList"> <el-select size="mini" v-model="msg.OrderType" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in OrderTypeList" v-for="(item, index) in OrderTypeList"
:key="index" :key="index"
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">订单状态</span> <span class="font-size-12" style="padding-right: 10px">订单状态</span>
<el-select size="mini" v-model="msg.OrderState" @change="getList"> <el-select size="mini" v-model="msg.OrderState" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in OrderStatusList" <el-option v-for="(item,index) in OrderStatusList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">收款状态</span> <span class="font-size-12" style="padding-right: 10px">收款状态</span>
<el-select size="mini" v-model="msg.Q_IsCollect" @change="getList"> <el-select size="mini" v-model="msg.Q_IsCollect" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in QIsCollectList" <el-option v-for="(item,index) in QIsCollectList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<span class="font-size-12" style="padding-right: 10px">报名开始</span> <span class="font-size-12" style="padding-right: 10px">报名开始</span>
<el-date-picker <el-date-picker
v-model="msg.StartTime" v-model="msg.StartTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<span class="font-size-12" style="padding-right: 10px">报名结束</span> <span class="font-size-12" style="padding-right: 10px">报名结束</span>
<el-date-picker <el-date-picker
v-model="msg.EndTime" v-model="msg.EndTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%;" style="width: 100%;"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartSTime" v-model="msg.DepartSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartETime" v-model="msg.DepartETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8"> <el-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
<span class="font-size-12" style="padding-right: 10px">线路</span> <span class="font-size-12" style="padding-right: 10px">线路</span>
<el-select size="mini" v-model="msg.LineId" @change="getList"> <el-select size="mini" v-model="msg.LineId" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in LineList" <el-option v-for="(item,index) in LineList"
:key="index" :key="index"
:label="item.LineName" :value="item.LineID"> </el-option> :label="item.LineName" :value="item.LineID"> </el-option>
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
</el-col> </el-col>
<el-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8"> <el-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
<span class="font-size-12" style="padding-right: 10px">团队类型</span> <span class="font-size-12" style="padding-right: 10px">团队类型</span>
<el-select size="mini" v-model="msg.TravelType" @change="getList"> <el-select size="mini" v-model="msg.TravelType" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in TravelTypeList" <el-option v-for="(item,index) in TravelTypeList"
:key="index" :key="index"
:label="item.Name" :value="item.Id"> </el-option> :label="item.Name" :value="item.Id"> </el-option>
...@@ -298,7 +298,7 @@ ...@@ -298,7 +298,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishSTime" v-model="msg.FinishSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishETime" v-model="msg.FinishETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
row-class-name="font-size-12" row-class-name="font-size-12"
:default-sort = "{prop: 'Money', order: 'null'}" :default-sort = "{prop: 'null', order: 'null'}"
:sort-by="['Money','Income','PlatformTax','Refund','CostMoney','DueInMoney']"> :sort-by="['Money','Income','PlatformTax','Refund','CostMoney','DueInMoney']">
<el-table-column <el-table-column
width="200" width="200"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
v-model="msg.OrderId" v-model="msg.OrderId"
placeholder="订单号" placeholder="订单号"
clearable clearable
@change="getList" @change="handleCurrentChange(1)"
@keyup.enter.native="getList" @keyup.enter.native="handleCurrentChange(1)"
></el-input> ></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
v-model="msg.GuestName" v-model="msg.GuestName"
placeholder="客人姓名" placeholder="客人姓名"
clearable clearable
@change="getList" @change="handleCurrentChange(1)"
@keyup.enter.native="getList" @keyup.enter.native="handleCurrentChange(1)"
></el-input> ></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3"> <el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
size="mini" size="mini"
filterable filterable
v-model="msg.CreateBy" v-model="msg.CreateBy"
@change="getList" @change="handleCurrentChange(1)"
clearable clearable
placeholder="引流人员"> placeholder="引流人员">
<el-option <el-option
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
v-model="msg.StartCityName" v-model="msg.StartCityName"
placeholder="出行概述" placeholder="出行概述"
clearable clearable
@change="getList" @change="handleCurrentChange(1)"
@keyup.enter.native="getList" @keyup.enter.native="handleCurrentChange(1)"
></el-input> ></el-input>
</el-col> </el-col>
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
size="mini" size="mini"
filterable filterable
v-model="msg.EnterID" v-model="msg.EnterID"
@change="getList" @change="handleCurrentChange(1)"
clearable clearable
placeholder="业务员" placeholder="业务员"
> >
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>出票状态</span >出票状态</span
> >
<el-select size="mini" v-model="msg.TicketStatus" @change="getList"> <el-select size="mini" v-model="msg.TicketStatus" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in ticketingStatusList" v-for="(item, index) in ticketingStatusList"
:key="index" :key="index"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>出签状态</span >出签状态</span
> >
<el-select size="mini" v-model="msg.VisaStatus" @change="getList"> <el-select size="mini" v-model="msg.VisaStatus" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in VisaList" v-for="(item, index) in VisaList"
:key="index" :key="index"
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>订单状态</span >订单状态</span
> >
<el-select size="mini" v-model="msg.OrderStatus" @change="getList"> <el-select size="mini" v-model="msg.OrderStatus" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in OrderStatusList" v-for="(item, index) in OrderStatusList"
:key="index" :key="index"
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<span class="font-size-12" style="padding-right: 10px" <span class="font-size-12" style="padding-right: 10px"
>收款状态</span >收款状态</span
> >
<el-select size="mini" v-model="msg.Q_IsCollect" @change="getList"> <el-select size="mini" v-model="msg.Q_IsCollect" @change="handleCurrentChange(1)">
<el-option <el-option
v-for="(item, index) in QIsCollectList" v-for="(item, index) in QIsCollectList"
:key="index" :key="index"
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.StartTime" v-model="msg.StartTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.EndTime" v-model="msg.EndTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishSTime" v-model="msg.FinishSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.FinishETime" v-model="msg.FinishETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartSTime" v-model="msg.DepartSTime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
> >
<el-date-picker <el-date-picker
v-model="msg.DepartETime" v-model="msg.DepartETime"
@change="getList" @change="handleCurrentChange(1)"
size="mini" size="mini"
style="width: 100%" style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
Domain: "fcrmyx.oytour.com", Domain: "fcrmyx.oytour.com",
}; };
if (!this.isOnline()) { if (!this.isOnline()) {
msg.Domain = "www.test.com";//www.test.com localhost msg.Domain = "localhost";
} }
this.apipost("/api/Login/UserLogin", msg, (res) => { this.apipost("/api/Login/UserLogin", msg, (res) => {
var jsonData = res.data; var jsonData = res.data;
......
This diff is collapsed.
...@@ -5,26 +5,20 @@ ...@@ -5,26 +5,20 @@
<h1>月度引流统计</h1> <h1>月度引流统计</h1>
</div> </div>
<div class="flex"> <div class="flex">
<div style="margin-right: 20px"> <div style="margin-right: 20px">
<el-date-picker v-model="msg.month" type="year" icon="el-icon-date" slot="append" class="input-with-select" <el-date-picker v-model="msg.month" type="year" icon="el-icon-date" slot="append" class="input-with-select"
format="yyyy 年" @change="changeMonthHandler" placeholder="选择查询的月份"> format="yyyy 年" @change="changeMonthHandler" placeholder="选择查询的月份">
</el-date-picker> </el-date-picker>
</div>
<div>
<span class="font-size-12" style="padding-right: 10px">业务员</span>
<el-select style="width: 220px;" filterable multiple clearable v-model="msg.QEmployeeIdsArr"
@change="changeEmployee">
<el-option v-for="(item, index) in EmployeeList" :key="index" :label="item.EmName" :value="item.EmployeeId">
</el-option>
</el-select>
</div>
</div> </div>
<div>
<span class="font-size-12" style="padding-right: 10px"
>业务员</span
>
<!-- height: 40px; overflow: auto -->
<el-select style="width: 220px;" filterable multiple clearable v-model="msg.QEmployeeIdsArr" @change="changeEmployee">
<el-option
v-for="(item, index) in EmployeeList"
:key="index"
:label="item.EmName"
:value="item.EmployeeId"
>
</el-option>
</el-select>
</div></div>
<div class="rightmenu"> <div class="rightmenu">
<el-dropdown @command="handleCommand"> <el-dropdown @command="handleCommand">
<el-button class="crm-btn crm-btn-more easy-btn margin-right0"> <el-button class="crm-btn crm-btn-more easy-btn margin-right0">
...@@ -238,7 +232,7 @@ ...@@ -238,7 +232,7 @@
selfParams: { selfParams: {
queryTime: {}, queryTime: {},
}, },
EmployeeList: [] EmployeeList: []
}; };
}, },
provide() { provide() {
...@@ -254,40 +248,39 @@ ...@@ -254,40 +248,39 @@
mounted() { mounted() {
this.init(); this.init();
this.initRate(); this.initRate();
this.Employee() this.Employee()
}, },
methods: { methods: {
changeEmployee() { changeEmployee() {
this.msg.QEmployeeIds =this.msg.QEmployeeIdsArr.join(',') this.msg.QEmployeeIds = this.msg.QEmployeeIdsArr.join(',')
this.init(); this.init();
}, },
// 获取业务员 // 获取业务员
Employee() { Employee() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let msg = { let msg = {
RB_Group_id: userInfo.RB_Group_id, RB_Group_id: userInfo.RB_Group_id,
BranchId: -1, BranchId: 1245,
DepartmentId: 0, DepartmentId: 0,
PostId: 0, PostId: 0,
IsLeave: 0, IsLeave: 0,
}; };
this.apipost2( this.apipost2(
"admin_get_EmployeeGetList", "admin_get_EmployeeGetList",
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
// let data = { // let data = {
// EmName: "不限", // EmName: "不限",
// EmployeeId: "0", // EmployeeId: "0",
// }; // };
// this.EmployeeList.unshift(data); // this.EmployeeList.unshift(data);
} else { } else {}
} },
}, (err) => {}
(err) => {} );
); },
},
handleClose(done) { handleClose(done) {
done(); done();
}, },
......
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