问题件页面 权限“订单管理-问题件-客户自定义订单号”，应用到相应位置，以使添加相应禁止权限者不可见

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

@@ -108,7 +108,7 @@
                         <th class="three-layer   align-middle" rowspan="2" v-if="!isShowRejectedBill" style="min-width:50px">展开</th>
                         <th class="three-layer align-middle" rowspan="2" v-if="isShowRejectedBill" style="min-width:220px">退回单号</th>
                         <th class="three-layer   align-middle" colspan="5" v-if="isShowRejectedBill" style="min-width: 450px">返回商品明细</th>
-                        <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 115px">情况说明</th>
+                        <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 180px">情况说明</th>
                         <th class="three-layer   align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
                         <th class="three-layer  align-middle" colspan="4" style="min-width: 155px">处理结果</th>
                         @cannot('订单管理-问题件-客户不可见')
@@ -118,6 +118,9 @@
                             <th class="three-layer  align-middle" rowspan="2" v-if="isShowSecondOrderInfo" style=" min-width: 200px;">二次运单号</th>
                             <th class="three-layer" colspan="3" style="min-width: 300px" v-if="isShowSecondOrderInfo" style=" min-width: 350px;">二次商品明细</th>
                         @endcannot
+                        @cannot('订单管理-问题件-客户自定义订单号')
+                        <th class="three-layer  align-middle" rowspan="2" style="min-width: 120px">自定义订单号</th>
+                        @endcannot
                         @cannot('订单管理-问题件-客户不可见')
                             <th class="three-layer  align-middle" rowspan="2" style="min-width: 120px">承运商赔偿金额</th>
                             <th class="three-layer  align-middle" rowspan="2" style="min-width: 120px">承运商快递减免</th>
@@ -244,7 +247,6 @@
                         <td class="td-yellow p-0 m-0 child-layer-2" v-if="!isShowOrderInfo && index===0" style="width:50px" :rowspan="orderIssues.length">
                             <span class="btn btn-outline-secondary "  @click="showOrderInfo" :style="orderIssues.length>4 ?'{height: 200px;line-height: 100px':''" >展开运单列</span>
                         </td>
-
                         <td class="td-yellow child-layer-2-hide" v-if="isShowOrderInfo">@{{ orderIssue.order.consignee_name }}</td>
                         <td class="td-yellow child-layer-2-hide" v-if="isShowOrderInfo">@{{ orderIssue.order.consignee_phone }}</td>
                         <td class="td-yellow child-layer-2-hide" v-if="isShowOrderInfo">@{{ orderIssue.order.province }}</td>
@@ -309,7 +311,17 @@
                             </div>
                         </td>
 
-                        <td class="child-layer-3">@{{ orderIssue.result_explain}}</td>
+                        <td class="child-layer-3">
+                            @can('订单管理-问题件-编辑')
+                                <textarea class="form-control form-control-sm"  @change="updateOrderIssue(orderIssue,'result_explain',$event)"
+                                          data-toggle="tooltip" data-placement="bottom" :title="orderIssue.result_explain"
+                                          :cols="orderIssue.result_explain==null?'': (orderIssue.result_explain.length>10?10:orderIssue.result_explain.length)"
+                                          :rows="orderIssue.result_explain==null?'': (orderIssue.result_explain.length>10?(Math.ceil(orderIssue.result_explain.length)/10):1)"
+                                >@{{ orderIssue.result_explain }}</textarea>
+                            @else
+                                @{{ orderIssue.result_explain}}
+                            @endcan
+                        </td>
                         <td class="child-layer-3">
                             @can('订单管理-问题件-编辑')
                                 <select class="form-control form-control-sm" :value="orderIssue.order_issue_type_id" @change="updateOrderIssue(orderIssue,'order_issue_type_id',$event)">
@@ -328,15 +340,11 @@
                                 <div style="width: 45px"></div>
                                 <div class="form-inline m-2">
                                     <input type="text" name="content" class="form-control" style="width: 300px" required >
-                                    <button type="button" class="btn btn-primary ml-2"
-                                            @click="addOrderIssueLog('AddLog_'+orderIssue.id,orderIssue)">添加
-                                    </button>
+                                    <button type="button" class="btn btn-primary ml-2" @click="addOrderIssueLog('AddLog_'+orderIssue.id,orderIssue)">添加</button>
                                 </div>
                             </div>
                             <div style="position: absolute;display: none;margin-top: -35px" class="add-btn" :id="'AddBtn'+orderIssue.id">
-                                <button type="button" class="btn  btn-primary "
-                                        @click="showAddDiv('AddLog_'+orderIssue.id)">新
-                                </button>
+                                <button type="button" class="btn  btn-primary " @click="showAddDiv('AddLog_'+orderIssue.id)">新</button>
                             </div>
                             @endcan
                             <template v-if="orderIssue.logs && orderIssue.logs.length > 0" class="p-0 m-0 ">
@@ -385,20 +393,16 @@
                             </td>
                             <td class="log-td p-0 child-layer-3-hide" v-if="isShowSecondOrderInfo" v-on:mouseover="edit.orderIssue.id=orderIssue.id" v-on:mouseleave="edit.orderIssue.id = null">
                                 <div class="row position-absolute p-0 m-0" v-if="edit.orderIssue.id === orderIssue.id" :class="edit.orderIssue.id === orderIssue.id ? '':'d-none'">
-                                    <button type="button" class="btn btn-primary " style="margin-top: -35px" @click="edit.orderIssue.showId === orderIssue.id ? edit.orderIssue.showId='':edit.orderIssue.showId=orderIssue.id">
-                                        新
-                                    </button>
+                                    <button type="button" class="btn btn-primary " style="margin-top: -35px" @click="edit.orderIssue.showId === orderIssue.id ? edit.orderIssue.showId='':edit.orderIssue.showId=orderIssue.id">新</button>
                                 </div>
                                 <div class="row p-0 m-0" v-if="edit.orderIssue.showId === orderIssue.id ">
                                     <div class="form-inline">
                                         <input class="form-control" :id="'secondLogisticNumber-'+orderIssue.id">
-                                        <button type="button" class="btn btn-sm btn-primary" @click="addSecondLogisticNumber(orderIssue)">
-                                            添加
-                                        </button>
+                                        <button type="button" class="btn btn-sm btn-primary" @click="addSecondLogisticNumber(orderIssue)">添加</button>
                                     </div>
                                 </div>
 
-                                <template v-if="orderIssue.second_order !== null">
+                                <div v-if="orderIssue.second_order !== null">
                                     <div class="text-center m-0" :id="'secondOrderNumbers'+orderIssue.id"
                                          :class="orderIssue.seconderCount > 1 ? 'collapse':''"
                                          :data-value="orderIssue.seconderCount = 0">
@@ -413,15 +417,16 @@
                                             @click="toggleseCondOrderNumbers(orderIssue.id,orderIssue.second_order.logisticNumbers.length)">
                                         分箱@{{ orderIssue.second_order.logisticNumbers.length }}件,点击展开
                                     </button>
-                                </template>
+                                </div>
+                                <div v-else-if="orderIssue.second_order === null">
+                                    @{{orderIssue.second_logistic_number}}
+                                </div>
                             </td>
                             <td class="child-layer-3-hide p-0" colspan="3" v-if="isShowSecondOrderInfo">
                                 <template v-if="orderIssue.second_order!==null" class=" p-0">
                                     <div class="m-0 p-0" :class="orderIssue.secondeOrderCount > 1 ? 'collapse':''"
                                          :id="'secondOrder'+orderIssue.id">
-                                        <table class="table table-sm  m-0 "
-                                               :data-count="orderIssue.secondeOrderCount = 0"
-                                               :data-value="orderIssue.secondeOrderItems = 0">
+                                        <table class="table table-sm  m-0 " :data-count="orderIssue.secondeOrderCount = 0" :data-value="orderIssue.secondeOrderItems = 0">
                                             <template v-for="packages in orderIssue.second_order.packages">
                                                 <tr v-for="item in packages.commodities" :data-value="orderIssue.secondeOrderCount += 1" v-if="item.commodity" >
                                                     <td >@{{ item.commodity.sku }}</td>
@@ -444,6 +449,11 @@
                                 </template>
                             </td>
                         @endcannot
+                        @cannot('订单管理-问题件-客户自定义订单号')
+                            <td>
+                                <input class="form-control form-control-sm" :value="orderIssue.custom_code" @change="updateOrderIssue(orderIssue,'custom_code',$event)">
+                            </td>
+                        @endcan
                         @cannot('订单管理-问题件-客户不可见')
                             <td class="child-layer-3">
                                 @can('订单管理-问题件-编辑')
@@ -697,7 +707,7 @@
                 let tr = $('.tr-yellow')[1];
                 let countShow = $(tr).children('.one-layer').length;
                 $('.header-1').attr('colspan',countShow);
-
+                $('[data-toggle="tooltip"]').tooltip({'trigger': 'hover'})
                 $('#list').removeClass("d-none");
                 let _this = this;
                 let log_content_range = [{name:'15',value:'15天内'},{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},];
@@ -1362,17 +1372,17 @@
                     let logisticNumber = $('#secondLogisticNumber-'+orderIssue.id).val()
                     let data = {id:orderIssue.id,logistic_number:logisticNumber,client_code:orderIssue.second_client_no}
                     let _this = this;
-                    axios.post('{{url('apiLocal/order/issue/secondOrderAddOrderPackage')}}',data).then(function(response){
+                    axios.post('{{url('apiLocal/order/issue/editSecondLogisticNumber')}}',data).then(function(response){
                         if(response.data.success){
                             tempTip.setDuration(2000)
                             tempTip.showSuccess('添加成功')
-                            if(orderIssue.second_order == null){
+                            if(response.data.order != null){
                                 orderIssue.second_order = response.data.order
+                                orderIssue.second_client_no = response.data.order.client_code
                             }
-                            if(orderIssue.second_order.packages==null){
-                                orderIssue.second_order.packages = []
+                            if(response.data.second_logistic_number != null){
+                                orderIssue.second_logistic_number = response.data.second_logistic_number
                             }
-                            orderIssue.second_order.packages.push(response.data.orderPackage);
                             _this.edit.orderIssue.id = ''
                             _this.edit.orderIssue.showId = ''
                         }else{