1

src/components/customerManage/customerOrder.vue

@@ -26,11 +26,10 @@
     }
     .statistics-box{
         flex: 1;
-        padding: 10px 20px;
+        padding: 7px 16px;
         background-color: #DDDEE0;
         display: flex;
         flex-wrap: wrap;
-        justify-content: center;
         border-radius: 5px;
         margin-right: 10px;
     }
@@ -82,11 +81,6 @@
                     <el-input size="mini" class="w210" v-model="msg.GusetName" placeholder="请输入客人姓名"
                         @keyup.enter.native="getList"></el-input>
                 </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">
                     <span class="font-size-12" style="padding-right: 10px">出发城市</span>
                     <el-input size="mini" class="w210" v-model="msg.StartCityName" placeholder="请输入出发城市"
@@ -98,7 +92,7 @@
                         @keyup.enter.native="getList"></el-input>
                 </el-col>
                 <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"
                         @keyup.enter.native="getList"></el-input>
                 </el-col>

src/components/customerManage/orderList.vue

@@ -16,7 +16,6 @@
           <col width="6.5%" />
           <col width="6.5%" />
           <col width="6.5%" />          
-          <col width="6.5%" />
           <col width="100px"/>
         </colgroup>
         <thead>
@@ -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="100px">操作</th>
           </tr>
         </thead>
@@ -54,7 +52,6 @@
           <col width="6.5%" />
           <col width="6.5%" />
           <col width="6.5%" />
-          <col width="6.5%" />
           <col width="100px"/>
         </colgroup>
         <template>
@@ -71,7 +68,7 @@
               </td>
               <td style="border:none">{{item.GuestCount}}人</td>
               <td style="border:none">
-                  {{item.StartCityName}}至
+                  {{item.StartCityName}}->
                   {{item.EndCityName}}
               </td>
               <td style="border:none">
@@ -109,9 +106,6 @@
                     <span :style="{color: item.OrderStatus==1?'#02C499':''}">{{item.OrderStatus==1?"正常":"取消"}}</span>
                 </div>
               </td>
-              <td style="border:none">
-                {{item.CreateByName}}
-              </td>
               <td style="border:none;width:150px">
                   <div class="enedit-box">
                     <el-tooltip
@@ -119,7 +113,7 @@
                         <i class="iconfont iconwenbenbianji cp" @click="editOrder(item)"></i>
                     </el-tooltip>
                     <div>
-                        <el-select style="width:130px"  class="select-right" 
+                        <el-select style="width:80px;"  class="select-right" 
                         clearable
                         size="mini" 
                         v-model="item.More" placeholder="更多"
@@ -137,7 +131,7 @@
               </td>
             </tr>
             <tr>
-              <td :colspan="8" style="height: 168px;text-align: left">
+              <td :colspan="8" style="height: 108px;text-align: left">
                 <div>备注：</div>
                 <div class="remarks-b">
                     <div v-if="item.Remark != null || item.Remark != ''">
@@ -146,7 +140,7 @@
                     <span v-if="item.Remark == null || item.Remark == ''">暂无</span>
                 </div>
               </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-left">
                         <div>收入单据：</div>
@@ -238,9 +232,8 @@
       return {
         userInfo:{},
         MoreList:[
-            {Name:'编辑订单金额',Id:'5'},
             {Name:'取消订单',Id:'1'},
-            {Name:'订单转换',Id:'2'},
+            {Name:'订单转交',Id:'2'},
             {Name:'修改出票状态',Id:'4'},
             {Name:'操作日志',Id:'3'},
         ],
@@ -652,7 +645,7 @@
   }
 
   .classorder .remarks-b {
-    height: 94px;
+    height: 34px;
     background: #f0f5fb;
     margin-top: 10px;
     padding: 15px;
@@ -765,6 +758,9 @@
     color: rgb(41, 97, 254);
     padding: 0;
 }
+.documents-right {
+  margin-right: 20px;
+}
 .OrderId-text{
     font-weight: bold;
     color: #2961fe;