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 Hide 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 @@ ...@@ -186,7 +186,7 @@
</div> </div>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <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"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
......
src/components/customerManage/customerOrder.vue
View file @ e4323fce
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList> <orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore" :superManage="superManage"></orderList>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <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"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -214,6 +214,24 @@ ...@@ -214,6 +214,24 @@
}, },
data() { data() {
return { return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
superManage:"订单统计", superManage:"订单统计",
StatModel:{},// 合计 StatModel:{},// 合计
loading:false, loading:false,
...@@ -351,6 +369,18 @@ ...@@ -351,6 +369,18 @@
}); });
}; };
addList(data); 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.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count; this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel this.StatModel = res.data.data.StatModel
......
src/components/customerManage/myCustomerOrder.vue
View file @ e4323fce
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
<orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList> <orderList :dataList="dataList" :loading="loading" @emptyMore="emptyMore"></orderList>
<div> <div>
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <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"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -197,6 +197,24 @@ ...@@ -197,6 +197,24 @@
}, },
data() { data() {
return { return {
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
StatModel:{},// 合计 StatModel:{},// 合计
loading:false, loading:false,
total:0, total:0,
...@@ -332,6 +350,18 @@ ...@@ -332,6 +350,18 @@
}); });
}; };
addList(data); 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.dataList = res.data.data.Data.pageData;
this.total = res.data.data.Data.count; this.total = res.data.data.Data.count;
this.StatModel = res.data.data.StatModel this.StatModel = res.data.data.StatModel
......
src/components/customerManage/orderDetailsDrawer.vue
View file @ e4323fce
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
flex-direction: column; flex-direction: column;
} }
.orderDetails-body .order-info { .orderDetails-body .order-info {
height: 115px;
padding: 30px; padding: 30px;
box-sizing: border-box; box-sizing: border-box;
font-size: 12px; font-size: 12px;
background-color: #f6f4fc; background-color: #f6f4fc;
} }
.orderDetails-body .order-info .order-lable-box { .order-lable-box {
display: flex;
justify-content: space-between;
color: #999999; color: #999999;
} }
.orderDetails-content { .orderDetails-content {
...@@ -35,6 +36,19 @@ ...@@ -35,6 +36,19 @@
.no-relative .el-tabs__content { .no-relative .el-tabs__content {
position: unset !important; 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> </style>
<template> <template>
<div class="orderDetails-box"> <div class="orderDetails-box">
...@@ -49,14 +63,14 @@ ...@@ -49,14 +63,14 @@
<div class="orderDetails-body"> <div class="orderDetails-body">
<div class="order-info"> <div class="order-info">
<div class="order-lable-box"> <div class="order-lable-box">
<div><span class="order-lable">关联销售：</span><span>5555</span></div> <div class="order-lable"><span>关联销售：</span><span>5555</span></div>
<div><span class="order-lable">订单号：</span><span >111</span></div> <div class="order-lable"><span>订单号：</span><span >111</span></div>
<div><span class="order-lable">客户姓名：</span><span>1</span></div> <div class="order-lable"><span>客户姓名：</span><span>1</span></div>
</div> </div>
<div> <div class="order-lable-box">
<div><span class="order-lable">性质：</span><span>1</span></div> <div class="order-lable"><span>性质：</span><span>1</span></div>
<div><span class="order-lable">形成概述：</span><span>111</span></div> <div class="order-lable"><span>形成概述：</span><span>111</span></div>
<div><span class="order-lable">状态：</span><span>1</span></div> <div class="order-lable"><span>状态：</span><span>1</span></div>
</div> </div>
</div> </div>
<div class="orderDetails-content"> <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 @@ ...@@ -41,6 +41,10 @@
.income_2{ .income_2{
color: #3FC4FF; color: #3FC4FF;
} }
.finance-content{
height: 600px;
overflow-y: scroll;
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -75,86 +79,87 @@ ...@@ -75,86 +79,87 @@
</el-row> </el-row>
</div> </div>
<div class="page-content"> <div class="page-content">
<el-table <el-table
v-loading="loading" v-loading="loading"
stripe stripe
ref="multipleTable" ref="multipleTable"
:data="dataList" :data="dataList"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
row-class-name="font-size-12"> :height="dataList.length > 0 ? '600' : '660'"
<el-table-column row-class-name="font-size-12">
fixed <el-table-column
label="单号" fixed
show-overflow-tooltip> label="单号"
<template slot-scope="scope"> show-overflow-tooltip>
<p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p> <template slot-scope="scope">
</template> <p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p>
</el-table-column> </template>
<el-table-column </el-table-column>
label="单据类型" <el-table-column
show-overflow-tooltip> label="单据类型"
<template slot-scope="scope"> show-overflow-tooltip>
<p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p> <template slot-scope="scope">
</template> <p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
</el-table-column> </template>
<el-table-column </el-table-column>
label="费用类型" <el-table-column
show-overflow-tooltip> label="费用类型"
<template slot-scope="scope"> show-overflow-tooltip>
<p v-for="(item,index) in scope.row.CostTypeList" :key="index"> <template slot-scope="scope">
{{item}} <p v-for="(item,index) in scope.row.CostTypeList" :key="index">
</p> {{item}}
</template> </p>
</el-table-column> </template>
<el-table-column </el-table-column>
label="交易方式" <el-table-column
show-overflow-tooltip width="200"> label="交易方式"
<template slot-scope="scope"> show-overflow-tooltip width="200">
<div class="_TradeWayList" <template slot-scope="scope">
v-for="(item,index) in scope.row.TradeWayList" <div class="_TradeWayList"
:key="index" v-for="(item,index) in scope.row.TradeWayList"
style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px"> :key="index"
<p><span style="font-weight: bold;color:#333333">{{item.Alias}}</span> style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
<span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':item.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{item.AccountType==""?'无':item.AccountType}}</span> </p> <p><span style="font-weight: bold;color:#333333">{{item.Alias}}</span>
<p style="color:#333333">{{item.BankNo}}</p> <span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':item.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{item.AccountType==""?'无':item.AccountType}}</span> </p>
</div> <p style="color:#333333">{{item.BankNo}}</p>
</template> </div>
</el-table-column> </template>
<el-table-column </el-table-column>
label="金额" width="150"> <el-table-column
<template slot-scope="scope"> label="金额" width="150">
<p>{{scope.row.Type==1?'应收：':(scope.row.Type==2?'应付：':'')}}{{scope.row.Money}}</p> <template slot-scope="scope">
<p>{{scope.row.Type==1?'实收：':(scope.row.Type==2?'实付：':'')}}{{scope.row.PayMoney}}</p> <p>{{scope.row.Type==1?'应收：':(scope.row.Type==2?'应付：':'')}}{{scope.row.Money}}</p>
</template> <p>{{scope.row.Type==1?'实收：':(scope.row.Type==2?'实付：':'')}}{{scope.row.PayMoney}}</p>
</el-table-column> </template>
<el-table-column </el-table-column>
label="付款对象" <el-table-column
show-overflow-tooltip width="260"> label="付款对象"
<template slot-scope="scope"> show-overflow-tooltip width="260">
{{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}} <template slot-scope="scope">
</template> {{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}}
</el-table-column> </template>
<el-table-column </el-table-column>
label="制单人员" <el-table-column
show-overflow-tooltip> label="制单人员"
<template slot-scope="scope"> show-overflow-tooltip>
{{scope.row.EmName}} <template slot-scope="scope">
</template> {{scope.row.EmName}}
</el-table-column> </template>
<el-table-column </el-table-column>
fixed="right" <el-table-column
label="当前状态" fixed="right"
show-overflow-tooltip width="110"> label="当前状态"
<template slot-scope="scope"> show-overflow-tooltip width="110">
{{scope.row.StatusStr}} <template slot-scope="scope">
</template> {{scope.row.StatusStr}}
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div> </div>
<div v-if="total>0"> <div v-if="total>0">
<el-pagination class="Mypagination" background @current-change="handleCurrentChange" <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"> @size-change="handleSizeChange" :total="total">
</el-pagination> </el-pagination>
</div> </div>
...@@ -183,7 +188,7 @@ export default { ...@@ -183,7 +188,7 @@ export default {
loading: false, loading: false,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 30, pageSize: 10,
FrID:"0", FrID:"0",
Type:"-1", Type:"-1",
Status: "-1", Status: "-1",
......
src/components/guestManagement/ticketOrder.vue
View file @ e4323fce
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'"> <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
<div class="MyEditForm-item"> <div class="MyEditForm-item">
<el-form-item label="出行概述" prop="StartCityName"> <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> </el-form-item>
</div> </div>
</el-col> </el-col>
...@@ -1064,7 +1064,7 @@ ...@@ -1064,7 +1064,7 @@
ground:{ ground:{
title:"地接", title:"地接",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
...@@ -1096,7 +1096,7 @@ ...@@ -1096,7 +1096,7 @@
airTickets:{ airTickets:{
title:"机票", title:"机票",
WBMoney:0,//原币总金额 WBMoney:0,//原币总金额
OriginalFee:"",//原币手续费 OriginalFee:0,//原币手续费
RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"1",//订单类型 1机票 2签证 3地接 4套餐 5其他
TotalCost:"", TotalCost:"",
detailList:[ detailList:[
...@@ -1213,7 +1213,7 @@ ...@@ -1213,7 +1213,7 @@
}, ], }, ],
StartCityName: [{ StartCityName: [{
required: true, required: true,
message: "请输入出现时间、出发地、目的地", message: "请输入出发时间、出发地、目的地",
trigger: "blur" trigger: "blur"
}, ], }, ],
// EndCityName: [ // EndCityName: [
...@@ -1458,7 +1458,7 @@ ...@@ -1458,7 +1458,7 @@
OtherType:this.BillMaking.OtherType,//默认=55 OtherType:this.BillMaking.OtherType,//默认=55
ReFinanceId:this.obj.OrderId,//订单ID ReFinanceId:this.obj.OrderId,//订单ID
ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款 ReFinanceId2:this.obj.ReFinanceId2,//类型 1收款
GuestId:this.GuestId,//客人ID GuestId:this.obj.GuestId,//客人ID
RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他 RelevanceFrId:"",//订单类型 1机票 2签证 3地接 4套餐 5其他
vorcherInos:[], vorcherInos:[],
detailList:[] detailList:[]
...@@ -2003,10 +2003,6 @@ ...@@ -2003,10 +2003,6 @@
this.$message.warning('请输入机票单价'); this.$message.warning('请输入机票单价');
return return
} }
if(item.Remark==""){
this.$message.warning('请输入机票备注');
return
}
}) })
this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{ this.obj.checkList.indexOf('2')!=-1&&this.visa.detailList.forEach(item=>{
if(!item.CostTypeId){ if(!item.CostTypeId){
...@@ -2021,10 +2017,6 @@ ...@@ -2021,10 +2017,6 @@
this.$message.warning('请输入签证单价'); this.$message.warning('请输入签证单价');
return return
} }
if(item.Remark==""){
this.$message.warning('请输入签证备注');
return
}
}) })
this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{ this.obj.checkList.indexOf('3')!=-1&&this.ground.detailList.forEach(item=>{
if(!item.CostTypeId){ if(!item.CostTypeId){
...@@ -2131,6 +2123,9 @@ ...@@ -2131,6 +2123,9 @@
} }
this.msgList.push(this.BillMaking) this.msgList.push(this.BillMaking)
} }
// console.log(this.msgList,'=====')
// return
this.clickShow = true
this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{ this.apipost2("Financial_post_SetFinanceInfoForCRMIn",this.msgList,(res)=>{
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.clickShow = false this.clickShow = false
...@@ -2147,6 +2142,7 @@ ...@@ -2147,6 +2142,7 @@
}); });
} else { } else {
this.msgList=[]
this.clickShow = false this.clickShow = false
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -2195,7 +2191,6 @@ ...@@ -2195,7 +2191,6 @@
}); });
} }
if(this.name=='制单'){ if(this.name=='制单'){
this.clickShow = true
this.Financial_post_SetFinanceInfoForCRMIn() this.Financial_post_SetFinanceInfoForCRMIn()
} }
......
src/components/planeTicketOrder/index.vue
View file @ e4323fce
...@@ -319,16 +319,10 @@ ...@@ -319,16 +319,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div v-if="total>0">
<el-pagination <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">
@size-change="handleSizeChange" </el-pagination>
@current-change="handleCurrentChange" </div>
:page-sizes="[30, 60,90,100]"
:page-size="msg.pageSize"
layout="total,prev,sizes,pager,next"
:total="total"
style="margin-top: 12px; float: right">
</el-pagination>
</div> </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