瀏覽代碼

问题件修改【“结果说明”删掉创建消息或没有消息时,无法显示创建扫按钮,创建时不要写入说明】

ajun 5 年之前
父節點
當前提交
d69c3be7ae

+ 1 - 1
app/Imports/OrderIssueImport.php

@@ -100,7 +100,7 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
                 $orderIssue = OrderIssue::create($arr);
                 if ($orderIssue) {
                     array_push($exception, ['订单' . $row['原始运单号'] . '问题件创建成功!']);
-                    OrderIssueProcessLog::create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '导入创建问题订单件', 'type' => '创建']);
+                    OrderIssueProcessLog::create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '', 'type' => '创建']);
                 } else {
                     array_push($exception, ['订单' . $row['原始运单号'] . '问题件创建失败']);
                 }

+ 1 - 6
app/Services/OrderIssueService.php

@@ -9,15 +9,10 @@ use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\OrderPackage;
 use App\Order;
-use App\OrderPackageCommodities;
-use App\Owner;
 use App\RejectedBill;
 use App\RejectedBillItem;
-use App\Services\common\QueryService;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
 class OrderIssueService
@@ -264,7 +259,7 @@ class OrderIssueService
         foreach ($orderNos as $orderNo) {
             $orderIssue = $this->createOrFindByOrderNo($orderNo);
             OrderIssue::query()->where('id', $orderIssue['id'])->update(['order_issue_type_id' => $params['typeId'], 'result_explain' => $params['result_explain']]);
-            OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '标记创建订单问题件', 'type' => '创建']);
+            OrderIssueProcessLog::query()->create(['order_issue_id' => $orderIssue['id'], 'user_id' => Auth::user()['id'], 'content' => '', 'type' => '创建']);
         }
         Controller::logS(__METHOD__, __FUNCTION__, '标记订单问题件' . json_encode($orderNos), Auth::user()['id']);
         $meg['success'] = true;

+ 5 - 1
resources/views/order/issue/index.blade.php

@@ -319,7 +319,7 @@
                                 </button>
                             </div>
 
-                            <template v-if="orderIssue.logs" class="p-0 m-0 ">
+                            <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 == null ? orderIssue.logShow=false:''">
                                     <tr style="position:static" align="center" v-for="(log,index) in orderIssue.logs" :class="(orderIssue.logs.length <= 2 ? '' : ((index === 0 || orderIssue.logShow )  ? '' : 'd-none' )) "
                                         v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
@@ -337,6 +337,9 @@
                                     记录共@{{ orderIssue.logs.length }}条,点击展开
                                 </button>
                             </template>
+                            <div v-else  class="w-auto" style="height: 55px">
+
+                            </div>
                         </td>
                         @cannot('客户不可见')
                         <td class="p-0 m-0 h-100" v-if="!isShowSecondOrderInfo && index === 0" style="width:50px;" :rowspan="orderIssues.length" >
@@ -949,6 +952,7 @@
                     let div = $('#' + id);
                     if (div.is(":hidden")) {
                         div.show();
+                        div.find('input').focus();
                     } else {
                         div.hide();
                     }