Skip to content

C
CRM
Commit 3ea55118 authored by youjie's avatar youjie
Browse files
Options

no message

parent e43ae008
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 12 deletions
src/components/guestManagement/ticketOrder.vue
View file @ 3ea55118
...@@ -591,14 +591,14 @@ ...@@ -591,14 +591,14 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div class="MultipleChoice-right-box" <!-- <div class="MultipleChoice-right-box"
:class="visaShow?'active':''"> :class="visaShow?'active':''">
<el-form-item label="签证金额" prop="VisaMoney"> <el-form-item label="签证金额" prop="VisaMoney">
<el-input placeholder="请输入签证金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" <el-input placeholder="请输入签证金额" onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"
v-model="form.VisaMoney" v-model="form.VisaMoney"
:disabled="visaShow"></el-input> :disabled="visaShow"></el-input>
</el-form-item> </el-form-item>
</div> </div> -->
<div class="MultipleChoice-right-box" <div class="MultipleChoice-right-box"
:class="groundShow?'active':''"> :class="groundShow?'active':''">
<el-form-item label="地接金额" prop="DiJieMoney"> <el-form-item label="地接金额" prop="DiJieMoney">
...@@ -671,13 +671,13 @@ ...@@ -671,13 +671,13 @@
</div> </div>
</div> </div>
<div class="combo-box" v-if="obj.OrderType.indexOf(2) != -1"> <div class="combo-box" v-if="obj.OrderType.indexOf(2) != -1">
<div class="combo-center" <!-- <div class="combo-center"
:class="visaShow?'active':''"> :class="visaShow?'active':''">
<el-form-item label="签证金额" prop=""> <el-form-item label="签证金额" prop="">
<br/> <br/>
{{form.VisaMoney}} {{form.VisaMoney}}
</el-form-item> </el-form-item>
</div> </div> -->
<div class="combo-center" <div class="combo-center"
:class="visaShow?'active':''"> :class="visaShow?'active':''">
<el-form-item label="收损金额" prop="LossVisaMoney"> <el-form-item label="收损金额" prop="LossVisaMoney">
...@@ -1494,10 +1494,12 @@ ...@@ -1494,10 +1494,12 @@
{ {
Name: '机票', Name: '机票',
Id: '1' Id: '1'
}, { },
Name: '签证', // {
Id: '2' // Name: '签证',
}, { // Id: '2'
// },
{
Name: '地接', Name: '地接',
Id: '3' Id: '3'
}, { }, {
......
src/components/myOrdersAllType/components/allList.vue
View file @ 3ea55118
...@@ -96,12 +96,36 @@ ...@@ -96,12 +96,36 @@
> >
</el-option> </el-option>
</el-select> </el-select>
</el-col>
<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
>
<el-select size="mini" v-model="msg.LureEmpId" @change="getList">
<el-option
v-for="(item, index) in EmployeeList"
:key="index"
:label="item.EmName"
:value="item.EmployeeId"
>
</el-option>
</el-select>
</el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">商品名称</span>
<el-input size="mini" class="w210" v-model="msg.ProductName" placeholder="商品名称" clearable
@change="getList" @keyup.enter.native="getList"></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="getList" @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :xs="7" :sm="6" :md="5" :lg="4" :xl="3">
<span class="font-size-12" style="padding-right: 10px">团号/单号</span>
<el-input size="mini" class="w210" v-model="msg.TCNUM" placeholder="团号/单号" clearable
@change="getList" @keyup.enter.native="getList"></el-input>
</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
...@@ -254,6 +278,14 @@ ...@@ -254,6 +278,14 @@
</div> </div>
<div class="query-box"> <div class="query-box">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :xs="12" :sm="12" :md="12" :lg="8" :xl="8">
<span class="font-size-12" style="padding-right: 10px">线路</span>
<el-select size="mini" v-model="msg.LineId" @change="getList">
<el-option v-for="(item,index) in LineList"
:key="index"
:label="item.LineName" :value="item.LineID"> </el-option>
</el-select>
</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="getList">
...@@ -270,7 +302,6 @@ ...@@ -270,7 +302,6 @@
v-model="msg.FinishSTime" v-model="msg.FinishSTime"
@change="getList" @change="getList"
size="mini" size="mini"
style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
...@@ -286,7 +317,6 @@ ...@@ -286,7 +317,6 @@
v-model="msg.FinishETime" v-model="msg.FinishETime"
@change="getList" @change="getList"
size="mini" size="mini"
style="width: 100%"
format="yyyy-MM-dd" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
...@@ -369,8 +399,8 @@ ...@@ -369,8 +399,8 @@
TCNUM: "",//团号 TCNUM: "",//团号
ProductName: "",//商品名称 ProductName: "",//商品名称
CustomerName: "",//客户名称 CustomerName: "",//客户名称
LureEmpId: 0,//引流人员 LureEmpId: "0",//引流人员
LineId: 0,//线路 LineId: "0",//线路
TravelType: 0,//跟团类型 1跟团 2当地游 TravelType: 0,//跟团类型 1跟团 2当地游
OrderType: "0",//订单类型 OrderType: "0",//订单类型
IsSelectCRM: 1,//1来源crm IsSelectCRM: 1,//1来源crm
...@@ -394,6 +424,7 @@ ...@@ -394,6 +424,7 @@
], ],
EmployeeList: [], // 业务员数据 EmployeeList: [], // 业务员数据
userInfo: {}, userInfo: {},
LineList: [],
}; };
}, },
watch: { watch: {
...@@ -424,6 +455,7 @@ ...@@ -424,6 +455,7 @@
let data = JSON.parse(this.$route.query.erpOrderObj); let data = JSON.parse(this.$route.query.erpOrderObj);
this.msg.OrderId = data.OrderId; this.msg.OrderId = data.OrderId;
} }
this.getLineList();//线路
this.Employee(); //业务员 this.Employee(); //业务员
this.getSummaryData() this.getSummaryData()
this.GetOrderTypeEnumList(); //订单状态枚举 this.GetOrderTypeEnumList(); //订单状态枚举
...@@ -443,6 +475,25 @@ ...@@ -443,6 +475,25 @@
this.getList(); this.getList();
}, },
methods: { methods: {
getLineList() {
this.apipost2(
"line_post_GetAllList_V2", {
LineDirection: 0,
},
(res) => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
let data = {
LineName: "不限",
LineID: "0",
};
this.LineList.unshift(data);
} else {
this.$message.error(res.data.message);
}
}
);
},
// 清空下拉 // 清空下拉
emptyMore() { emptyMore() {
this.dataList.forEach(item => { this.dataList.forEach(item => {
......
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