Merge branch 'zengjun' into wrok_order_batch_version

# Conflicts:
#	resources/views/order/workOrder/index.blade.php

resources/views/order/workOrder/index.blade.php

@@ -56,13 +56,11 @@
                                 </td>
                                 <td>
                                     <span v-text="item.id"></span>
-                                    <template v-if="item.is_issue_order">
-                                        <br>
-                                        <a :href="'{{url("order/issue/index")}}'+'?orderCode='+item.orderno"
-                                           target="order/issue/index?addtime=15">
-                                            <span class="badge badge-primary">问题件</span>
-                                        </a>
-                                    </template>
+                                    <br v-show="item.is_issue_order">
+                                    <a :href="'{{url("order/issue/index")}}'+'?orderCode='+item.orderno"
+                                       target="order/issue/index?addtime=15">
+                                        <span class="badge badge-primary">问题件</span>
+                                    </a>
                                     <br>
                                     <button class="btn btn-sm btn-outline-dark"
                                             @click="showWorkOrderItem(item)">详情
@@ -70,93 +68,93 @@
                                 </td>
                                 <td>
                                     @can('订单管理-订单问题件生成')
-                                        <template v-if="!item.is_issue_order ">
-                                            <button class="btn btn-sm btn-outline-primary"
-                                                    @click="createOrderIssue(item,true)">生成问题件
-                                            </button>
-                                            <br>
-                                        </template>
+                                        <button class="btn btn-sm btn-outline-primary"
+                                                v-show="!item.is_issue_order "
+                                                @click="createOrderIssue(item,true)">生成问题件
+                                        </button>
+                                        <br v-show="!item.is_issue_order ">
                                     @endcan
                                     @can('订单管理-工单处理-货主编辑')
-                                        <template v-if="isOwnerDispose(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color: #5d9983;color: #FFFFFF;border-color: #378d72"
-                                                    @click="ownerShowDispose(item,i)">
-                                                商家处理
-                                            </button>
-                                            <br>
-                                        </template>
+                                        <button class="btn btn-sm"
+                                                style="background-color: #5d9983;color: #FFFFFF;border-color: #378d72"
+                                                v-show="isOwnerDispose(item)"
+                                                @click="ownerShowDispose(item,i)">
+                                            商家处理
+                                        </button>
+                                        <br v-show="isOwnerDispose(item)">
 
-                                        <template v-if="canOwnerEdit(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color: #13b6af;color: #FFFFFF;border-color: #079e74"
-                                                    @click="ownerShowEdit(item,i)">
-                                                重新编辑
-                                            </button>
-                                            <br>
-                                        </template>
+                                        <button class="btn btn-sm"
+                                                style="background-color: #13b6af;color: #FFFFFF;border-color: #079e74"
+                                                v-show="canOwnerEdit(item)"
+                                                @click="ownerShowEdit(item,i)">
+                                            重新编辑
+                                        </button>
+                                        <br v-show="canOwnerEdit(item)">
 
-                                        <template v-if="canOwnerEnd(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color: #13b6af;color: #FFFFFF;border-color: #079e74"
-                                                    @click="ownerEndWorkOrder(item,i)">
-                                                商家完结
-                                            </button>
-                                            <br>
-                                        </template>
+                                        <button class="btn btn-sm"
+                                                style="background-color: #13b6af;color: #FFFFFF;border-color: #079e74"
+                                                v-show="canOwnerEnd(item)"
+                                                @click="ownerEndWorkOrder(item,i)">
+                                            商家完结
+                                        </button>
+                                        <br v-show="canOwnerEnd(item)">
 
                                     @endcan
                                     @can('订单管理-工单处理-承运商编辑')
-                                        <template v-if="isLogisticDispose(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color:#ea8863;color: #FFFFFF;border-color: #9a3d23"
-                                                    @click="logisticShowDispose(item,i)">
-                                                快递处理
-                                            </button>
-                                            <br>
-                                        </template>
-                                        <template v-if="canLogisticEdit(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color:#bf674e;color: #FFFFFF;border-color: #9a3d23"
-                                                    @click="logisticShowEdit(item,i)">
-                                                重新编辑
-                                            </button>
-                                            <br>
-                                        </template>
-                                        <template v-if="canTagWorkOrder(item)">
-                                            <button
-                                                class="btn btn-sm"
-                                                style="background-color:#d96a46;color: #FFFFFF;border-color: #e55c2d"
-                                                @click="tagWorkOrderHandler(item,i)">
-                                                标记处理
-                                            </button>
-                                            <br>
-                                        </template>
+                                        <button class="btn btn-sm"
+                                                style="background-color:#ea8863;color: #FFFFFF;border-color: #9a3d23"
+                                                v-show="isLogisticDispose(item)"
+                                                @click="logisticShowDispose(item,i)">
+                                            快递处理
+                                        </button>
+                                        <br v-show="isLogisticDispose(item)">
+                                        <button class="btn btn-sm"
+                                                style="background-color:#bf674e;color: #FFFFFF;border-color: #9a3d23"
+                                                v-show="canLogisticEdit(item)"
+                                                @click="logisticShowEdit(item,i)">
+                                            重新编辑
+                                        </button>
+                                        <br v-show="canLogisticEdit(item)">
+
+                                        <button class="btn btn-sm"
+                                                style="background-color:#bf674e;color: #FFFFFF;border-color: #9a3d23"
+                                                v-show="canLogisticEdit(item)"
+                                                @click="logisticShowEdit(item,i)">
+                                            重新编辑
+                                        </button>
+                                        <br v-show="canLogisticEdit(item)">
+
+
+                                        <button
+                                            class="btn btn-sm"
+                                            style="background-color:#d96a46;color: #FFFFFF;border-color: #e55c2d"
+                                            v-show="canTagWorkOrder(item)"
+                                            @click="tagWorkOrderHandler(item,i)">
+                                            标记处理
+                                        </button>
+                                        <br v-show="canTagWorkOrder(item)">
                                     @endcan
                                     @can('订单管理-工单处理-宝时编辑')
-                                        <template v-if="isBaoShiDispose(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color: #52b7d7;color: #FFFFFF;border-color:#90acb6;"
-                                                    @click="baoShiShowDispose(item,i)">
-                                                宝时处理
-                                            </button>
-                                            <br>
-                                        </template>
-                                        <template v-if="isBaoShiReview(item)">
-                                            <button class="btn btn-sm "
-                                                    style="background-color: #62a151;color: #FFFFFF;border-color:#90acb6;"
-                                                    @click="baoShiShowDispose(item,i)">
-                                                宝时客服
-                                            </button>
-                                            <br>
-                                        </template>
-                                        <template v-if="isBaoShiEdit(item)">
-                                            <button class="btn btn-sm"
-                                                    style="background-color: #4390a7;color: #FFFFFF;border-color:#90acb6;"
-                                                    @click="baoShiShowEdit(item,i)">
-                                                重新编辑
-                                            </button>
-                                        </template>
+                                        <button class="btn btn-sm"
+                                                style="background-color: #52b7d7;color: #FFFFFF;border-color:#90acb6;"
+                                                v-show="isBaoShiDispose(item)"
+                                                @click="baoShiShowDispose(item,i)">
+                                            宝时处理
+                                        </button>
+                                        <br v-show="isBaoShiDispose(item)">
+                                        <button class="btn btn-sm "
+                                                style="background-color: #62a151;color: #FFFFFF;border-color:#90acb6;"
+                                                v-show="isBaoShiReview(item)"
+                                                @click="baoShiShowDispose(item,i)">
+                                            宝时客服
+                                        </button>
+                                        <br v-show="isBaoShiReview(item)">
+                                        <button class="btn btn-sm"
+                                                style="background-color: #4390a7;color: #FFFFFF;border-color:#90acb6;"
+                                                v-show="isBaoShiEdit(item)"
+                                                @click="baoShiShowEdit(item,i)">
+                                            重新编辑
+                                        </button>
                                     @endcan
                                 </td>
                                 <td>