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

src/components/customerManage/orderList.vue

@@ -73,9 +73,9 @@
                <p class="CreateByName-text">引流人：{{item.CreateByName}}</p>
                <p class="CreateByName-text">业务员：<span class="colorblue">{{item.EnterName}}</span></p>
                <p>{{item.CreateTime}}</p>
+               <p class="CreateByName-text" v-if="item.OrderStatus == 5">完结：<span class="colorblue">{{item.FinishTime}}</span></p>
+               <p class="CreateByName-text" v-if="item.OrderStatus == 6">完结：<span class="colorblue">{{item.LossFinishTime}}</span></p>
                <p class="CreateByName-text Commission cp" v-if="item.Commission" @click="commissionDetails(item)">提成：<span>{{item.Commission}}</span></p>
-               <p class="CreateByName-text" v-if="item.OrderStatus == 5">完结日期：<span class="colorblue">{{item.FinishTime}}</span></p>
-               <p class="CreateByName-text" v-if="item.OrderStatus == 6">完结日期：<span class="colorblue">{{item.LossFinishTime}}</span></p>
               </td>
               <td style="border:none" min-width="6.5%">
                   <p class="colorblue font-color-link"