Skip to content

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

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

# Conflicts:
#	src/components/customerManage/orderList.vue
parents 56a0d4a5 b88e2eb4
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 29 deletions
src/components/customerManage/customerOrder.vue
View file @ 7db7672b
...@@ -26,11 +26,10 @@ ...@@ -26,11 +26,10 @@
} }
.statistics-box{ .statistics-box{
flex: 1; flex: 1;
padding: 10px 20px; padding: 7px 16px;
background-color: #DDDEE0; background-color: #DDDEE0;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center;
border-radius: 5px; border-radius: 5px;
margin-right: 10px; margin-right: 10px;
} }
...@@ -82,11 +81,6 @@ ...@@ -82,11 +81,6 @@
<el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="请输入客人姓名" <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="请输入客人姓名"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4">
<span class="font-size-12" style="padding-right: 10px">客人id</span>
<el-input size="mini" class="w210" v-model="msg.GuestId" placeholder="请输入客人id"
@keyup.enter.native="getList"></el-input>
</el-col>
<el-col :span="4"> <el-col :span="4">
<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="请输入出发城市" <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="请输入出发城市"
...@@ -98,7 +92,7 @@ ...@@ -98,7 +92,7 @@
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<span class="font-size-12" style="padding-right: 10px">业务员id</span> <span class="font-size-12" style="padding-right: 10px">业务员</span>
<el-input size="mini" class="w210" v-model="msg.EnterID" placeholder="请输入业务员id" <el-input size="mini" class="w210" v-model="msg.EnterID" placeholder="请输入业务员id"
@keyup.enter.native="getList"></el-input> @keyup.enter.native="getList"></el-input>
</el-col> </el-col>
......
src/components/customerManage/orderList.vue
View file @ 7db7672b
...@@ -5,7 +5,9 @@ ...@@ -5,7 +5,9 @@
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="8.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="8.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
...@@ -13,18 +15,15 @@ ...@@ -13,18 +15,15 @@
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" />
<col width="6.5%" />
<col width="6.5%" />
<col width="100px"/> <col width="100px"/>
</colgroup> </colgroup>
<thead> <thead>
<tr class="fix_th"> <tr class="fix_th">
<th width="12%">单号</th> <th width="12%">单号</th>
<th width="6.5%">客人</th> <th width="8.5%">客人</th>
<th width="6.5%">人数</th> <th width="6.5%">人数</th>
<th width="6.5%">起始城市</th> <th width="8.5%">起始城市</th>
<th width="6.5%">应收</th> <th width="6.5%">应收</th>
<th width="6.5%">实收</th> <th width="6.5%">实收</th>
<th width="6.5%">退款</th> <th width="6.5%">退款</th>
...@@ -33,7 +32,6 @@ ...@@ -33,7 +32,6 @@
<th width="6.5%">待收</th> <th width="6.5%">待收</th>
<th width="6.5%">出票状态</th> <th width="6.5%">出票状态</th>
<th width="6.5%">订单状态</th> <th width="6.5%">订单状态</th>
<th width="6.5%">创建人</th>
<th width="100px">操作</th> <th width="100px">操作</th>
</tr> </tr>
</thead> </thead>
...@@ -43,10 +41,9 @@ ...@@ -43,10 +41,9 @@
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0"> <table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0">
<colgroup> <colgroup>
<col width="12%" /> <col width="12%" />
<col width="8.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="8.5%" />
<col width="6.5%" />
<col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
<col width="6.5%" /> <col width="6.5%" />
...@@ -71,7 +68,7 @@ ...@@ -71,7 +68,7 @@
</td> </td>
<td style="border:none">{{item.GuestCount}}人</td> <td style="border:none">{{item.GuestCount}}人</td>
<td style="border:none"> <td style="border:none">
{{item.StartCityName}}至 {{item.StartCityName}}->
{{item.EndCityName}} {{item.EndCityName}}
</td> </td>
<td style="border:none"> <td style="border:none">
...@@ -104,14 +101,11 @@ ...@@ -104,14 +101,11 @@
</p> </p>
</td> </td>
<td style="border:none"> <td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center" <div style="background: rgba(2, 196, 153, 0.2);width: 70px;border-radius: 2px;text-align: center"
:style="{background:item.OrderStatus==1?'rgba(2, 196, 153, 0.2)':'rgba(0, 0, 0, 0.2)'}"> :style="{background:item.OrderStatus==1?'rgba(2, 196, 153, 0.2)':'rgba(0, 0, 0, 0.2)'}">
<span :style="{color: item.OrderStatus==1?'#02C499':''}">{{item.OrderStatus==1?"正常":"取消"}}</span> <span :style="{color: item.OrderStatus==1?'#02C499':''}">{{item.OrderStatus==1?"正常":"取消"}}</span>
</div> </div>
</td> </td>
<td style="border:none">
{{item.CreateByName}}
</td>
<td style="border:none;width:150px"> <td style="border:none;width:150px">
<div class="enedit-box"> <div class="enedit-box">
<el-tooltip <el-tooltip
...@@ -119,7 +113,8 @@ ...@@ -119,7 +113,8 @@
<i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i> <i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i>
</el-tooltip> </el-tooltip>
<div> <div>
<el-select style="width:130px" class="select-right" <el-select style="width:80px;" class="select-right"
clearable clearable
size="mini" size="mini"
v-model="item.More" placeholder="更多" v-model="item.More" placeholder="更多"
...@@ -137,7 +132,7 @@ ...@@ -137,7 +132,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="8" style="height: 168px;text-align: left"> <td :colspan="8" style="height: 108px;text-align: left">
<div>备注：</div> <div>备注：</div>
<div class="remarks-b"> <div class="remarks-b">
<div v-if="item.Remark != null || item.Remark != ''"> <div v-if="item.Remark != null || item.Remark != ''">
...@@ -146,7 +141,7 @@ ...@@ -146,7 +141,7 @@
<span v-if="item.Remark == null || item.Remark == ''">暂无</span> <span v-if="item.Remark == null || item.Remark == ''">暂无</span>
</div> </div>
</td> </td>
<td :colspan="5" style="height: 168px;text-align: left"> <td :colspan="4" style="height: 108px;text-align: left">
<div class="documents-text"> <div class="documents-text">
<div class="documents-left"> <div class="documents-left">
<div>收入单据：</div> <div>收入单据：</div>
...@@ -238,7 +233,6 @@ ...@@ -238,7 +233,6 @@
return { return {
userInfo:{}, userInfo:{},
MoreList:[ MoreList:[
{Name:'编辑订单金额',Id:'5'},
{Name:'取消订单',Id:'1'}, {Name:'取消订单',Id:'1'},
{Name:'订单转交',Id:'2'}, {Name:'订单转交',Id:'2'},
{Name:'修改出票状态',Id:'4'}, {Name:'修改出票状态',Id:'4'},
...@@ -630,7 +624,7 @@ ...@@ -630,7 +624,7 @@
} }
.classorder .enrollTotalSearchTable tr td { .classorder .enrollTotalSearchTable tr td {
height: 66px; height: 46px;
padding: 10px; padding: 10px;
} }
...@@ -652,7 +646,7 @@ ...@@ -652,7 +646,7 @@
} }
.classorder .remarks-b { .classorder .remarks-b {
height: 94px; height: 34px;
background: #f0f5fb; background: #f0f5fb;
margin-top: 10px; margin-top: 10px;
padding: 15px; padding: 15px;
...@@ -765,7 +759,12 @@ ...@@ -765,7 +759,12 @@
color: rgb(41, 97, 254); color: rgb(41, 97, 254);
padding: 0; padding: 0;
} }
.documents-right {
margin-right: 20px;
}
.OrderId-text{ .OrderId-text{
font-size: 19px;
text-decoration:underline;
font-weight: bold; font-weight: bold;
color: #2961fe; color: #2961fe;
margin-bottom: 10px; margin-bottom: 10px;
......
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