Skip to content

S
SuperMan
Commit 37af1d17 authored by youjie's avatar youjie
Browse files
Options

no message

parent 88bcb4cd
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 4 deletions
src/components/myOrdersAllType/components/allList.vue
View file @ 37af1d17
......@@ -128,7 +128,51 @@
<el-input clearable type="" v-model="msg.TCNUM" placeholder="请输入团号" class="w200"/>
</span>
</li>
<li v-if="Title!='销售'&&Title!='申请'&&Title!='审核'">
<template v-if="Title=='审核'">
<li>
<span>
<em>公司</em>
<el-select filterable v-model='msg2.RB_Branch_Id' class="w200" clearable>
<el-option value="-1" label="不限"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>业务员</em>
<el-select filterable v-model='msg2.EnterId' class="w200" clearable>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出发时间</em>
<el-date-picker
style="height: 34px;"
value-format="yyyy-MM-dd"
v-model="DatelistUse"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker>
</span>
</li>
</template>
<li v-if="Title=='OP'">
<span>
<em>业务员</em>
<el-select filterable v-model='msg.EnterId' class="w200" clearable>
......@@ -353,7 +397,7 @@
</el-pagination>
<el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle=='审核'" background
@current-change="handleCurrentChange2" :current-page.sync="currentPage2"
layout="total,prev, pager, next, jumper" :page-size="msg2.pagesize" :total=total2>
layout="total,prev, pager, next, jumper" :page-size="msg2.pageSize" :total=total2>
</el-pagination>
</div>
......@@ -365,9 +409,18 @@
components: { OrderList },
data() {
return {
companyList:[],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
total2:0,
currentPage2: 1,
msg2:{
DepartSTime: '', //出发时间
DepartETime: '',
EnterId: '',//销售
RB_Branch_Id: '-1',//公司
OrderId: '',
OrderState: '1',
OrderType: '0',
......@@ -487,7 +540,8 @@
{ Name: "待申请", Id: "1" },
{ Name: "已申请", Id: "2" },
],
changePriceOuterVisible: true
changePriceOuterVisible: true,
};
},
watch: {
......@@ -503,6 +557,8 @@
if(val.DepartSTime&&val.DepartSTime){
this.msg.DepartSTime = val.DepartSTime;
this.msg.DepartETime = val.DepartSTime;
this.msg2.DepartSTime = val.DepartSTime;
this.msg2.DepartETime = val.DepartSTime;
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
}
this.GetList()
......@@ -524,6 +580,14 @@
this.currentPage2=1,
this.GetList()
},
// 公司
getCompany(){
this.apipost('admin_get_BranchGetList',{},res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
exportExcel() { //导出
if (!this.msg.StartTime || !this.msg.EndTime) {
this.$message.info('请选择开始时间、结束时间！')
......@@ -604,9 +668,13 @@
if(this.DatelistUse){
this.msg.DepartSTime = this.DatelistUse[0]
this.msg.DepartETime = this.DatelistUse[1]
this.msg2.DepartSTime = this.DatelistUse[0]
this.msg2.DepartETime = this.DatelistUse[1]
}if(!this.DatelistUse){
this.msg.DepartSTime = ''
this.msg.DepartETime = ''
this.msg2.DepartSTime = ''
this.msg2.DepartETime = ''
}
},
getDates(){
......@@ -672,6 +740,7 @@
res => {
if (res.data.resultCode == 1) {
this.changePriceOuterVisible = true
// 数据统计
if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){
this.getSummaryData()
}
......@@ -744,6 +813,8 @@
if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){
this.msg.DepartSTime = '2023-04-01';//[year,month,1].join('-')
this.msg.DepartETime = [year,month,monthLast].join('-');
this.msg2.DepartSTime = '2023-04-01';//[year,month,1].join('-')
this.msg2.DepartETime = [year,month,monthLast].join('-');
// this.msg.DepartSTime = this.getBeforeDate(200, new Date())
// this.msg.DepartETime = this.getBeforeDate(0, new Date())
}
......@@ -760,6 +831,8 @@
if(this.$route.query.DepartSTime){
this.msg.DepartSTime=this.$route.query.DepartSTime
this.msg.DepartETime=this.$route.query.DepartETime
this.msg2.DepartSTime=this.$route.query.DepartSTime
this.msg2.DepartETime=this.$route.query.DepartETime
this.msg.CommissionType = this.$route.query.CommissionType
this.msg.StartTime = ''
this.msg.EndTime = ''
......@@ -770,8 +843,11 @@
},
mounted() {
this.Title = this.pagesTitle
if(this.Title=='OP'){
if(this.Title=='OP'||this.Title=='审核'){
this.getEmployee()
if(this.Title=='审核'){
this.getCompany()
}
}
// this.GetOrderStatusEnumList()//订单状态
// this.GetTicketStatusEnumList()//出票状态
......
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