采购调整小程序结束生产逻辑，修改采购单页面报价显示

app/Http/Controllers/api/thirdPart/weixin/ProcurementController.php

@@ -128,11 +128,19 @@ class ProcurementController extends Controller
         $supplierService=app(SupplierService::class);
         $supplier_ids=$supplierService->screenSupplierIds();
         $procurements=Procurement::query()
-            ->with('ownerMaterial.material')
+            ->withCount('procurementDeliveries')
+            ->with('ownerMaterial.material','procurementDeliveries')
             ->whereIn('type',[0,2])
             ->where('status',4) //4:生产中
             ->whereIn('supplier_id',$supplier_ids)
             ->get();
+        foreach ($procurements as $procurement){
+            $procurement->delivery_amount=0;
+            if (isset($procurement->procurementDeliveries))
+                foreach ($procurement->procurementDeliveries as $procurementDelivery){
+                    if ($procurementDelivery->receipt_amount)$procurement->delivery_amount+=$procurementDelivery->receipt_amount;
+                }
+        }
         if ($procurements) return $this->success($procurements);
     }
     //结束生产

app/ProcurementTotalBill.php

@@ -5,7 +5,6 @@ namespace App;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-
 use App\Traits\ModelLogChanging;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -51,11 +50,6 @@ class ProcurementTotalBill extends Model
             ->whereIn('procurement_delivery_id',$procurementDeliveryQuery)->get();
     }
 
-    public function checkSheet()
-    {
-
-    }
-
     protected static function booted()
     {
         /** @var User $user */

resources/views/maintenance/logistic/index.blade.php

@@ -34,9 +34,9 @@
                         <td>@{{logistic.remark}}</td>
                         <td class="text-muted">@{{logistic.created_at}}</td>
                         <td>
-                            @can('物流公司-编辑')
+                            @can('承运商-编辑')
                             <button class="btn btn-sm btn-outline-primary" @click="edit(logistic.id)">改</button> @endcan
-                            @can('物流公司-删除')
+                            @can('承运商-删除')
                             <button class="btn btn-sm btn-outline-dark" @click="destroy(logistic)">删</button> @endcan
                         </td>
                     </tr>

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

@@ -107,10 +107,6 @@
                             <span v-else>-</span>
                     </div>
                 </td>
-{{--                <td>--}}
-{{--                    <span v-if="procurement_type[procurement.type]=='询价单' && procurement.supplier" >@{{ procurement.supplier.name ??  '' }}</span>--}}
-{{--                    <span  v-if="procurement.supplier">@{{ procurement.supplier.name ??  '' }}</span>--}}
-{{--                </td>--}}
                 <td class="text-center" style="min-width: 80px">
                     <div :class="procurement.procurement_quotations&&procurement.procurement_quotations.length==1 ? '' : 'up'" :id="'procurement_quotation-'+i">
                         <div v-for="procurement_quotation in procurement.procurement_quotations" class="row">
@@ -119,15 +115,12 @@
                         </div>
                     </div>
                     <div class="row text-center cursor-pointer" v-if="procurement.procurement_quotations&&procurement.procurement_quotations.length>1">
-                        <b @click="unfold(i)" class="col-12 cursor-pointer" v-if="!upList[i]">共有 @{{ procurement.procurement_quotations.length }} 家报价，<template v-for="(item,i) in procurement.procurement_quotations">价格@{{ i+1 }}:@{{ item.offer }}&nbsp</template>点击展开</b>
+                        <b @click="unfold(i)" class="col-12 cursor-pointer" v-if="procurement.supplier && !upList[i]">@{{ procurement.supplier.name }},<template>&nbsp价格：@{{ procurement.cost_price }}&nbsp</template>点击展开详细报价</b>
+                        <b @click="unfold(i)" class="col-12 cursor-pointer" v-else-if="!procurement.supplier && !upList[i]">共有 @{{ procurement.procurement_quotations.length }} 家报价，<template v-for="(item,i) in procurement.procurement_quotations">价格@{{ i+1 }}:@{{ item.offer }}&nbsp</template>点击展开详细报价</b>
                         <b class="col-12" @click="unfold(i)" v-else>点击收起明细</b>
                     </div>
                 </td>
                 <td class="text-center">@{{ procurement.quantity }}</td>
-{{--                <td>--}}
-{{--                    <span v-if="procurement_type[procurement.type]=='询价单'">@{{ procurement.cost_price }}</span>--}}
-{{--                    <span >@{{ procurement.cost_price }}</span>--}}
-{{--                </td>--}}
                 <td class="text-center"><span>@{{ procurement.unit_price }}</span></td>
                 <td class="text-center"><span v-if="procurement.deliver_amount">@{{ procurement.deliver_amount }}</span></td>
                 <td class="text-center"><span>@{{ (procurement.quantity*procurement.unit_price).toFixed(2) }}</span></td>