修改问题件下载

app/Http/Controllers/OrderIssueController.php

@@ -639,18 +639,25 @@ class OrderIssueController extends Controller
                     $order_sku_amount.= ($commodities->amount ?? '').",\r\n";
                 });
             });
-            $rejected_logistic_number = $order_issue->rejectedBill->logistic_number_return ?? '';
+            $rejected_logistic_number = '';
 
             $rejected_Bill_remark = '';
             $rejected_is_checked = '';
             $rejected_name = ''; $rejected_barcode = '';$rejected_amount = '';
-            if($order_issue->rejectedBill){
-                $order_issue->rejectedBill->items->each(function($item)use(&$rejected_name,&$rejected_barcode, &$rejected_amount,&$rejected_Bill_remark,&$rejected_is_checked){
-                    $rejected_name.= $item->name_goods.",\r\n";
-                    $rejected_barcode.= $item->barcode_goods.",\r\n";
-                    $rejected_amount.= $item->amount.",\r\n";
-                    $rejected_Bill_remark.= $item->remark.",\r\n";
-                    $rejected_is_checked.= $item->quality->name.",\r\n";
+            if($order_issue->rejectedBills){
+                $order_issue->rejectedBills->each(function($rejectedBill)use(
+                    &$rejected_name,&$rejected_barcode, &$rejected_amount,&$rejected_Bill_remark,&$rejected_is_checked,&$rejected_logistic_number
+                    ) {
+                    $rejected_logistic_number.=$rejectedBill->logistic_number_return . ",\r\n";
+                    $rejectedBill->items->each(function($item)use(
+                        &$rejected_name,&$rejected_barcode, &$rejected_amount,&$rejected_Bill_remark,&$rejected_is_checked
+                    ){
+                        $rejected_name.= $item->name_goods.",\r\n";
+                        $rejected_barcode.= $item->barcode_goods.",\r\n";
+                        $rejected_amount.= $item->amount.",\r\n";
+                        $rejected_Bill_remark.= $item->remark.",\r\n";
+                        $rejected_is_checked.= $item->quality->name.",\r\n";
+                    });
                 });
             }
             $log_type = ''; $log_content = '';$log_user = '';
@@ -690,7 +697,7 @@ class OrderIssueController extends Controller
                 rtrim($order_sku_amount,",\r\n"),              //原始商品数量
 
                 //,'退单商品名','退单商品条码','退单商品数量','退单状态','退单备注'
-                $rejected_logistic_number,                      //退回单号
+                rtrim($rejected_logistic_number,",\r\n"),                      //退回单号
                 rtrim($rejected_name,",\r\n"),        // 退单商品名
                 rtrim($rejected_barcode,",\r\n") ,    // 退单商品条码
                 rtrim($rejected_amount,",\r\n"),      // 退单商品数量

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

@@ -393,7 +393,7 @@
                                 <input type="hidden" name="id" :value="orderIssue.id">
                                 <div style="width: 45px"></div>
                                 <div class="form-inline m-2">
-                                    <input type="text" name="content" class="form-control" style="width: 300px" required >
+                                    <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>
                                 </div>
                             </div>
@@ -401,22 +401,23 @@
                                 <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 ">
+                            <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">
-                                    <tr class="align-center position-static" v-for="(log,index) in orderIssue.logs" v-show="(index > 1 || orderIssue.logs.length < 2)  && orderIssue.logShow"
-                                        @click="removeFocusing($event)"
-                                        v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
-                                        <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">
-                                                <button type="button" class="btn btn-sm btn-outline-danger m-0 del-btn invisible" @click="deleteOrderIssueLog(log.id,orderIssue.id)">删</button>
-                                            </td>
-                                        @endcan
+                                    <tr class="align-center position-static" v-for="(log,logIndex) in orderIssue.logs"
+                                        @click="removeFocusing($event)" v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
+                                        <template v-if="logIndex<2||orderIssue.log_is_show===true">
+                                            <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">
+                                                    <button type="button" class="btn btn-sm btn-outline-danger m-0 del-btn invisible" @click="deleteOrderIssueLog(log.id,orderIssue.id)">删</button>
+                                                </td>
+                                            @endcan
+                                        </template>
                                     </tr>
                                 </table>
-                                <button type="button" class="btn btn-sm btn-outline-primary align-middle mt-1" v-if="orderIssue.logs.length > 2" @click="toggleLogs(orderIssue,$event)">
+                                <button type="button" class="btn btn-sm btn-outline-primary align-middle mt-1" v-if="orderIssue.logs.length > 2" @click="toggleLogs(orderIssue,$event,index)">
                                     记录共@{{ orderIssue.logs.length }}条,点击展开
                                 </button>
                             </template>
@@ -887,10 +888,13 @@
                     orderIssue.rejected_bill_type_numbers = type_numbers;
                 },
                 regroupLogs(orderIssue){
-                    if(orderIssue.logs && orderIssue.logs.length > 2) orderIssue.logShow = true;
-                    else orderIssue.logShow = false;
-
-                    orderIssue.logCount = orderIssue.logs.length;
+                    if(!orderIssue)return;
+                    if(!orderIssue.logs)return;
+                    if(orderIssue.logs.length < 2){
+                        orderIssue.log_is_show = true;
+                    } else{
+                        orderIssue.log_is_show = false;
+                    }
                 },
                 displayDelBtn(bool,e){
                     if(bool)$(e.target).next().removeClass('d-none');
@@ -1209,13 +1213,16 @@
                         button.text("分箱" + length + "件,点击展开");
                     }
                 },
-                toggleLogs(orderIssue, e) {
-                    if ( orderIssue.logShow  === false) {
-                        $(e.target).text("记录共" + orderIssue.logs.length + "条,点击展开");
-                    } else {
+                toggleLogs(orderIssue, e,index) {
+                    if (orderIssue.log_is_show  === false) {
+                        orderIssue.log_is_show = true;
+                        this.$set(this.orderIssues,index,orderIssue);
                         $(e.target).text('点击收起');
+                    }else{
+                        orderIssue.log_is_show = false;
+                        this.$set(this.orderIssues,index,orderIssue);
+                        $(e.target).text("记录共" + orderIssue.logs.length + "条,点击展开");
                     }
-                    orderIssue.logShow = !orderIssue.logShow;
                 },
                 toggleOrder(id, length) {
                     let button = $("#orderBtn" + id);