问题件 添加权限"订单管理-问题件-处理结果添加","订单管理-问题件-处理结果添加"并应用， 添加权限”订单管理-问题件-客户自定义订单号“

database/migrations/2020_10_27_113358_add_order_issue_authority.php

@@ -0,0 +1,31 @@
+<?php
+
+use App\Authority;
+use Illuminate\Database\Migrations\Migration;
+
+class AddOrderIssueAuthority extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Authority::query()->firstOrCreate(['name'=>'订单管理-问题件-处理结果添加','alias_name'=>'订单管理-问题件-处理结果添加']);
+        Authority::query()->firstOrCreate(['name'=>'订单管理-问题件-处理结果删除','alias_name'=>'订单管理-问题件-处理结果删除']);
+        Authority::query()->firstOrCreate(['name'=>'订单管理-问题件-客户自定义订单号','alias_name'=>'订单管理-问题件-客户自定义订单号','permission'=>'禁止']);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Authority::query()->where('name','订单管理-问题件-处理结果添加')->delete();
+        Authority::query()->where('name','订单管理-问题件-处理结果删除')->delete();
+        Authority::query()->where('name','订单管理-问题件-客户自定义订单号')->delete();
+    }
+}

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

@@ -6,7 +6,7 @@
     <div class="container-fluid" id="issue_div">
         <div style="@cannot('订单管理-问题件-客户不可见')min-width: 3000px;@else min-width: 1990px; @endcannot">
             <div id="list" class="d-none container-fluid">
-                <div id="form_div" style="min-width: 3000px;"></div>
+                <div id="form_div" style="min-width: 2250px;"></div>
                 <div class="form-inline mt-1" id = "btn">
                     <span class="dropdown">
                         <button type="button"
@@ -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: 180px">情况说明</th>
+                        <th class="three-layer bg-whit  align-middle" rowspan="2" style="min-width: 115px">情况说明</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,7 +118,6 @@
                             <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
-                        <th class="three-layer  align-middle" rowspan="2" style="min-width: 120px">自定义订单号</th>
                         @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>
@@ -284,7 +283,7 @@
                         </td>
 
                         <td class="p-0 m-0 child-layer-3" v-if="!isShowRejectedBill && index === 0 " style="width:50px;" :rowspan="orderIssues.length" >
-                            <span class="btn btn-outline-secondary"  @click="showRejectedBill"  :style="orderIssues.length>4 ?'{height: 200px;line-height: 100px':''" >展开退单列</span>
+                            <span class="btn  btn-outline-secondary "  @click="showRejectedBill"  :style="orderIssues.length>4 ?'{height: 200px;line-height: 100px':''" >展开退单列</span>
                         </td>
 
                         <td class="p-0 child-layer-3-hide" :id="orderIssue.id+'rejectedBill'" valign="middle" align="center" colspan="5" v-if="isShowRejectedBill">
@@ -310,17 +309,7 @@
                             </div>
                         </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">@{{ orderIssue.result_explain}}</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)">
@@ -333,6 +322,7 @@
                         </td>
 
                         <td class=" m-0 p-0 log-td child-layer-3" valign="middle" align="center" v-on:mouseover="showAddBtn($event)" v-on:mouseleave="hideAddBtn($event)" colspan="4">
+                            @can('订单管理-问题件-处理结果添加')
                             <div class="addLogDiv row m-0 p-0 form-group" :id="'AddLog_'+orderIssue.id" style="display: none;">
                                 <input type="hidden" name="id" :value="orderIssue.id">
                                 <div style="width: 45px"></div>
@@ -343,14 +333,12 @@
                                     </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>
                             </div>
-
+                            @endcan
                             <template v-if="orderIssue.logs && orderIssue.logs.length > 0" class="p-0 m-0 ">
                                 <table class="table table-sm p-0 m-0 " :id="'logs'+orderIssue.id" :data-value="orderIssue.logShow = true">
                                     <tr style="position:static" align="center" v-for="(log,index) in orderIssue.logs"
@@ -360,11 +348,11 @@
                                         <td style="min-width: 200px">@{{ log.content }}</td>
                                         <td class="text-muted" style="min-width: 120px">@{{ log.user.name }}</td>
                                         <td class="text-muted" style="min-width: 170px">@{{ log.created_at }}</td>
+                                        @can('订单管理-问题件-处理结果删除')
                                         <td style="" class="m-0 p-0 border-0">
-                                            @cannot('订单管理-问题件-客户不可见')
                                             <button type="button" class="btn btn-sm btn-outline-danger m-0 del-btn invisible" @click="deleteOrderIssueLog(log.id,orderIssue.id)">删</button>
-                                            @endcan
                                         </td>
+                                        @endcan
                                     </tr>
                                 </table>
                                 <button type="button" class="btn btn-sm btn-outline-primary align-middle mt-1" v-if="orderIssue.logs.length > 2"
@@ -410,7 +398,7 @@
                                     </div>
                                 </div>
 
-                                <div v-if="orderIssue.second_order !== null">
+                                <template 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">
@@ -425,10 +413,7 @@
                                             @click="toggleseCondOrderNumbers(orderIssue.id,orderIssue.second_order.logisticNumbers.length)">
                                         分箱@{{ orderIssue.second_order.logisticNumbers.length }}件,点击展开
                                     </button>
-                                </div>
-                                <div v-else-if="orderIssue.second_order === null">
-                                    @{{orderIssue.second_logistic_number}}
-                                </div>
+                                </template>
                             </td>
                             <td class="child-layer-3-hide p-0" colspan="3" v-if="isShowSecondOrderInfo">
                                 <template v-if="orderIssue.second_order!==null" class=" p-0">
@@ -459,9 +444,6 @@
                                 </template>
                             </td>
                         @endcannot
-                        <td class="child-layer-3">
-                            <input type="text" class="form-control form-control-sm" :value="orderIssue.custom_code" @change="updateOrderIssue(orderIssue,'custom_code',$event)">
-                        </td>
                         @cannot('订单管理-问题件-客户不可见')
                             <td class="child-layer-3">
                                 @can('订单管理-问题件-编辑')
@@ -715,7 +697,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:'不限'},];
@@ -1380,17 +1362,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/editSecondLogisticNumber')}}',data).then(function(response){
+                    axios.post('{{url('apiLocal/order/issue/secondOrderAddOrderPackage')}}',data).then(function(response){
                         if(response.data.success){
                             tempTip.setDuration(2000)
                             tempTip.showSuccess('添加成功')
-                            if(response.data.order != null){
+                            if(orderIssue.second_order == null){
                                 orderIssue.second_order = response.data.order
-                                orderIssue.second_client_no = response.data.order.client_code
                             }
-                            if(response.data.second_logistic_number != null){
-                                orderIssue.second_logistic_number = response.data.second_logistic_number
+                            if(orderIssue.second_order.packages==null){
+                                orderIssue.second_order.packages = []
                             }
+                            orderIssue.second_order.packages.push(response.data.orderPackage);
                             _this.edit.orderIssue.id = ''
                             _this.edit.orderIssue.showId = ''
                         }else{
@@ -1402,13 +1384,7 @@
                         tempTip.show('添加失败'+error)
                     });
                 },
-                getResultExplainRowsOrCols(result_explain,type='cols'){
-                    if(type==='cols'){
-                        return result_explain.length>15 ? 15 :result_explain.length
-                    }else if(type==='rows'){
-                        return Math.ceil(result_explain.length / 15)
-                    }
-                }
+
             }
         })
         // modal 隐藏时修改 input 为空