Skip to content

C
CRM
Commit e4323fce authored by 罗超's avatar 罗超
Browse files
Options

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

# Conflicts:
#	src/components/customerManage/orderDetailsDrawer.vue
#	src/components/customerManage/orderList.vue
parents 59d305cf 2385084b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1066 additions and 1130 deletions
src/components/contractManagement/contractManagement.vue
View file @ e4323fce
......@@ -186,7 +186,7 @@
</div>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......
src/components/customerManage/customerOrder.vue
View file @ e4323fce
......@@ -200,7 +200,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -214,6 +214,24 @@
},
data() {
return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
superManage:"订单统计",
StatModel:{},// 合计
loading:false,
......@@ -351,6 +369,18 @@
});
};
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(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
......
src/components/customerManage/myCustomerOrder.vue
View file @ e4323fce
......@@ -183,7 +183,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList>
<div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
:page-sizes="[15, 30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
@size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
......@@ -197,6 +197,24 @@
},
data() {
return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
StatModel:{},// 合计
loading:false,
total:0,
......@@ -332,6 +350,18 @@
});
};
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(this.MultipleChoiceList[i])
}
}
}
}
})
this.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel
......
src/components/customerManage/orderDetailsDrawer.vue
View file @ e4323fce
......@@ -19,13 +19,14 @@
flex-direction: column;
}
.orderDetails-body .order-info {
height: 115px;
padding: 30px;
box-sizing: border-box;
font-size: 12px;
background-color: #f6f4fc;
}
.orderDetails-body .order-info .order-lable-box {
.order-lable-box {
display: flex;
justify-content: space-between;
color: #999999;
}
.orderDetails-content {
......@@ -35,6 +36,19 @@
.no-relative .el-tabs__content {
position: unset !important;
}
.order-lable-box:last-child {
margin-top: 20px;
}
.order-lable {
display: flex;
flex-direction: column;
}
.order-lable span:last-child {
font-size: 18px;
font-weight: bold;
color: #333;
margin-top: 5px;
}
</style>
<template>
<div class="orderDetails-box">
......@@ -49,14 +63,14 @@
<div class="orderDetails-body">
<div class="order-info">
<div class="order-lable-box">
<div><span class="order-lable">关联销售：</span><span>5555</span></div>
<div><span class="order-lable">订单号：</span><span >111</span></div>
<div><span class="order-lable">客户姓名：</span><span>1</span></div>
<div class="order-lable"><span>关联销售：</span><span>5555</span></div>
<div class="order-lable"><span>订单号：</span><span >111</span></div>
<div class="order-lable"><span>客户姓名：</span><span>1</span></div>
</div>
<div>
<div><span class="order-lable">性质：</span><span>1</span></div>
<div><span class="order-lable">形成概述：</span><span>111</span></div>
<div><span class="order-lable">状态：</span><span>1</span></div>
<div class="order-lable-box">
<div class="order-lable"><span>性质：</span><span>1</span></div>
<div class="order-lable"><span>形成概述：</span><span>111</span></div>
<div class="order-lable"><span>状态：</span><span>1</span></div>
</div>
</div>
<div class="orderDetails-content">
......
src/components/customerManage/orderList.vue
View file @ e4323fce
This diff is collapsed.
src/components/guestManagement/finance.vue
View file @ e4323fce
......@@ -41,6 +41,10 @@
.income_2{
color: #3FC4FF;
}
.finance-content{
height: 600px;
overflow-y: scroll;
}
</style>
<template>
<div class="Business">
......@@ -82,6 +86,7 @@
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
:height="dataList.length > 0 ? '600' : '660'"
row-class-name="font-size-12">
<el-table-column
fixed
......@@ -154,7 +159,7 @@
</div>
<div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange"
:page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next"
: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>
......@@ -183,7 +188,7 @@ export default {
loading: false,
msg: {
pageIndex: 1,
pageSize: 30,
pageSize: 10,
FrID:"0",
Type:"-1",
Status: "-1",
......
src/components/guestManagement/ticketOrder.vue
View file @ e4323fce
......@@ -507,7 +507,7 @@
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item">
<el-form-item label="出行概述" prop="StartCityName">
<el-input placeholder="请输入出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
<el-input placeholder="出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
</el-form-item>
</div>
</el-col>
......@@ -1064,7 +1064,7 @@
ground:{
title:"地接",
WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费
OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[
......@@ -1096,7 +1096,7 @@
airTickets:{
title:"机票",
WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费
OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"",
detailList:[
......@@ -1213,7 +1213,7 @@
}, ],
StartCityName: [{
required: true,
message: "请输入出现时间、出发地、目的地",
message: "请输入出发时间、出发地、目的地",
trigger: "blur"
}, ],
// EndCityName: [
......@@ -1458,7 +1458,7 @@
OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID
GuestId:this.obj.GuestId,//客人ID
RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[],
detailList:[]
......@@ -2003,10 +2003,6 @@
this.$message.warning('请输入机票单价');
return
}
if(item.Remark==""){
this.$message.warning('请输入机票备注');
return
}
})
this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{
if(!item.CostTypeId){
......@@ -2021,10 +2017,6 @@
this.$message.warning('请输入签证单价');
return
}
if(item.Remark==""){
this.$message.warning('请输入签证备注');
return
}
})
this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{
if(!item.CostTypeId){
......@@ -2131,6 +2123,9 @@
}
this.msgList.push(this.BillMaking)
}
// console.log(this.msgList,'=====')
// return
this.clickShow = true
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{
if (res.data.resultCode == 1) {
this.clickShow = false
......@@ -2147,6 +2142,7 @@
});
} else {
this.msgList=[]
this.clickShow = false
this.$message.error(res.data.message);
}
......@@ -2195,7 +2191,6 @@
});
}
if(this.name=='制单'){
this.clickShow = true
this.Financial_post_SetFinanceInfoForCRMIn()
}
......
src/components/planeTicketOrder/index.vue
View file @ e4323fce
......@@ -319,16 +319,10 @@
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[30, 60,90,100]"
:page-size="msg.pageSize"
layout="total,prev,sizes,pager,next"
:total="total"
style="margin-top: 12px; float: right">
<div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" :page-sizes="[30, 60, 90, 100]" :page-size="msg.pageSize" layout="total, sizes, prev, pager, next" @size-change="handleSizeChange" :total="total">
</el-pagination>
</div>
</div>
</div>
......
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