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

src/components/guestManagement/Agreement.vue

@@ -74,42 +74,32 @@
         row-class-name="font-size-12">
         <el-table-column
             fixed
-            prop="CreateByName"
-            label="下单人"
+            label="订单号"
             show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.OrderId}}
+              <!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
+            </template>
         </el-table-column>
         <el-table-column
             fixed
             label="业务员"
-            show-overflow-tooltip>
+            show-overflow-tooltip :width="120">
             <template slot-scope="scope">
               <p>{{scope.row.EnterName}}</p>
               <p>{{scope.row.CreateTime}}</p>
             </template>
         </el-table-column>
-        <el-table-column
-            fixed
-            label="订单号"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.OrderId}}
-              <!-- <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.OrderId}}</p> -->
-            </template>
-        </el-table-column>
         <el-table-column 
-            label="起始地址"
-            show-overflow-tooltip>
+            label="起始城市"
+            show-overflow-tooltip :width="120">
             <template slot-scope="scope">
-              {{scope.row.StartCityName}} —— {{scope.row.EndCityName}}
+              <p>人数：{{scope.row.GuestCount}}人</p>
+              <p>{{scope.row.StartCityName}}->{{scope.row.EndCityName}}</p>
             </template>
         </el-table-column>
         <el-table-column 
-            prop="GuestCount"
-            label="客人数"
-            show-overflow-tooltip>
-        </el-table-column>
-        <el-table-column 
-            label="订单金额"
+            label="应收"
             show-overflow-tooltip>
             <template slot-scope="scope">
               <p @click="editOrderAmount(scope.row)" class="cp"
@@ -135,15 +125,7 @@
             label="成本"
             show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
-            </template>
-        </el-table-column>
-        <el-table-column 
-            prop="PayMoney"
-            label="付款"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.PayMoney}}
+              {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
             </template>
         </el-table-column>
         <el-table-column
@@ -201,6 +183,11 @@
             label="退款单据"
             show-overflow-tooltip>
         </el-table-column>
+        <el-table-column
+            prop="CreateByName"
+            label="创建人"
+            show-overflow-tooltip>
+        </el-table-column>
         <el-table-column
             fixed="right"
             label="操作"