Merge branch 'master' of http://101.133.135.193:20080/huhao/baoshi-was

app/Http/ApiControllers/RejectController.php

@@ -139,6 +139,9 @@ class RejectController
 
     private function saveRejectBillItem($data,$rejectBill){
         foreach ($data['rejectItems'] as $item){
+            if ($item['quality']=='机损'){
+                $item['quality']='残次';
+            }
             $id_quality_label=QualityLabel::query()->where('name',$item['quality'])->first()['id'];
             $rejectBillItemNew = new RejectedBillItem();
             $rejectBillItemNew->id_rejected_bill=$rejectBill->id;

app/Http/Controllers/ProcurementController.php

@@ -353,7 +353,7 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('amount');
-            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'];
+            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at']??'';
         }
         return view('procurement/finance/procurementBill',compact('suppliers','materials','owners','paginateParams','procurements'));
     }
@@ -399,7 +399,7 @@ class ProcurementController extends Controller
         }
         $procurementStatus=Procurement::status;
         $procurementType=Procurement::type;
-        $row = ['采购编号','项目','单据类型','采购公司','耗材编号','耗材','尺寸大小','特殊要求','材质规格','供应商','采购单价(元)','采购数量','销售单价(元)','送货数量','销售总价(元)','采购单状态','供应商联系方式'];
+        $row = ['采购编号','项目','单据类型','采购公司','耗材编号','耗材','尺寸大小','特殊要求','材质规格','供应商','采购单价(元)','采购数量','销售单价(元)','送货数量','销售总价(元)','采购单状态','供应商联系方式','备注'];
         $list = [];
         foreach ($procurements as $procurement){
             $list[] = [
@@ -420,6 +420,7 @@ class ProcurementController extends Controller
                 $procurement->unit_price*$procurement->amount,//销售总价=销售数量*销售单价
                 is_null($procurement->status) ? '' :$procurementStatus[$procurement->status],
                 $procurement->supplier ? $procurement->supplier->phone :'',
+                $procurement->remark,
             ];
         }
         return Export::make($row,$list,"采购管理-采购报表记录");
@@ -483,12 +484,12 @@ class ProcurementController extends Controller
         foreach ($procurements as $procurement){
             if (empty($procurement->procurementDeliveries))continue;
             $procurement->receive_amount=$procurement->procurementDeliveries->sum('receipt_amount');
-            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at'];
+            $procurement->signed_at=$procurement->procurementDeliveries->first()['signed_at']??'';
         }
 
         $procurementStatus=Procurement::status;
         $row = ['采购编号','采购日期','接单日期','签收日期','项目名称','采购公司','供应商','耗材编号','耗材','尺寸大小','特殊要求',
-            '材质规格','采购数量','销售数量','收货数量','采购单价(元)','销售单价(元)','应收金额(元)','应付金额(元)','状态'];
+            '材质规格','备注','采购数量','销售数量','收货数量','采购单价(元)','销售单价(元)','应收金额(元)','应付金额(元)','状态'];
         $list = [];
         foreach ($procurements as $procurement){
             $list[] = [
@@ -504,6 +505,7 @@ class ProcurementController extends Controller
                 $procurement->ownerMaterial ? $procurement->ownerMaterial->size :'',
                 $procurement->ownerMaterial ? $procurement->ownerMaterial->special :'',
                 $procurement->ownerMaterial ? $procurement->ownerMaterial->specification :'',
+                $procurement->remark,
                 $procurement->quantity,
                 $procurement->amount,
                 $procurement->receive_amount ? $procurement->receive_amount : '',//收货数量

resources/views/procurement/finance/procurementBill.blade.php

@@ -31,8 +31,9 @@
                 <td class="tooltipTarget" style="max-width: 200px;overflow:hidden" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.material_code }}</span></td>
                 <td class="text-muted" v-if="procurement.owner_material.material"><span>@{{ procurement.owner_material.material.name }}</span></td>
                 <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.size }}</span></td>
-                <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.special }}</span></td>
+                <td class="text-muted"  style="max-width: 200px;overflow:hidden" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.special }}</span></td>
                 <td class="text-muted" v-if="procurement.owner_material"><span>@{{ procurement.owner_material.specification }}</span></td>
+                <td class="text-muted"  style="max-width: 200px;overflow:hidden"><span>@{{ procurement.remark }}</span></td>
                 <td><span>@{{ procurement.quantity }}</span></td>{{--采购数量--}}
                 <td><span>@{{ procurement.amount }}</span></td> {{--销售数量--}}
                 <td><span v-if="procurement.receive_amount">@{{ procurement.receive_amount }}</span></td>
@@ -126,6 +127,7 @@
                     {name: 'size', value: '尺寸大小',class: 'text-center'},
                     {name: 'special', value: '特殊要求',class: 'text-center'},
                     {name: 'specification', value: '材质规格',class: 'text-center'},
+                    {name: '备注', value: '备注',class: 'text-center'},
                     {name: 'quantity', value: '采购数量', neglect: true,class: 'text-center'},
                     {name: '销售数量', value: '销售数量', neglect: true,class: 'text-center'},
                     {name: 'deliver_amount', value: '收货数量', neglect: true,class: 'text-center'},

resources/views/procurement/procurement/index.blade.php

@@ -126,6 +126,7 @@
                 <td class="text-center"><span>@{{ (procurement.quantity*procurement.unit_price).toFixed(2) }}</span></td>
                 <td class="text-center"><span>@{{ procurement.created_at }}</span></td>
                 <td class="text-muted"><span v-if="procurement.supplier">@{{ procurement.supplier.phone }}</span></td>
+                <td class="text-muted"><span v-if="procurement.remark">@{{ procurement.remark }}</span></td>
             </tr>
         </table>
         <div class="text-info h5 btn btn">{{$procurements->count()}}/@{{ sum }}</div>
@@ -246,6 +247,7 @@
                     {name: '销售总价', value: '销售总价(元)', neglect: true,class: 'text-center'},
                     {name: 'created_at', value: '创建时间', neglect: true,class: 'text-center'},
                     {name: '联系方式', value: '供应商联系方式', neglect: true,class: 'text-center'},
+                    {name: '备注', value: '备注', neglect: true,class: 'text-center'},
                 ];
 
                 new Header({