修改退货录入问题

采购系统，显示每次的所有报价

app/Http/Controllers/CommodityController.php

@@ -172,10 +172,14 @@ class CommodityController extends Controller
     public function apiGetCommodityByBarcode(Request $request)
     {
         $barcode=$request->input('barcode');
+        $owner_id=$request->input('owner_id');
 //        $name = '';
-        $commodity = '';
+        $commodity=[];
         if($barcode){
-            $commodity=Commodity::query()->whereHas('barcodes', function (Builder $query)use($barcode){
+            $commodity=Commodity::query()->where('owner_id',$owner_id)->whereHas('barcodes', function (Builder $query)use($barcode){
+                $query->where('code',$barcode);
+            })->first();
+            if (!$commodity)$commodity=Commodity::query()->whereNotNull('owner_id')->whereHas('barcodes', function (Builder $query)use($barcode){
                 $query->where('code',$barcode);
             })->first();
 //            if($commodity&&$commodity['name']) $name=$commodity['name'];

app/Http/Controllers/ProcurementController.php

@@ -72,7 +72,7 @@ class ProcurementController extends Controller
             ->filter($filters)
             ->with(['initiator','ownerMaterial.file','ownerMaterial.material','supplier','ownerMaterial.owner'=>function($query)use($owner_ids){
                 $query->with('customer')->whereIn('id',$owner_ids);
-            },'procurementDeliveries'])
+            },'procurementDeliveries','procurementQuotations.supplier'])
             ->whereHas('ownerMaterial',function($builder)use($owner_ids){
                 $builder->whereHas('owner',function ($build)use($owner_ids){
                     $build->whereIn('id',$owner_ids);

app/Http/Controllers/TestController.php

@@ -141,6 +141,7 @@ use ChangeColumnOrderIdToOrderIssues;
 use Doctrine\DBAL\Exception\DatabaseObjectExistsException;
 use Doctrine\DBAL\Query\QueryBuilder;
 use Illuminate\Database\Connection;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\QueryException;
 use Illuminate\Support\Facades\Auth;
@@ -1440,11 +1441,6 @@ where purch.islower=1 and deliver.id>'.$id);
         app('OrderPackageCommoditySerialNumberService')->syncOrderPackageCommoditySerialNumbers($orderHeaders);
         $service->createByWmsOrderHeader($orderHeaders);
     }
-    public function testArray1()
-    {
-        $arr = (array)'update_at';
-        dd($arr);
-    }
     public function addHaiBox(Request $request)
     {
         echo <<<TEXT

app/Jobs/DeleteRepetitionSkuItem.php

@@ -62,7 +62,6 @@ class DeleteRepetitionSkuItem implements ShouldQueue
             if ($del['id']==$this->param[0]['id']) continue;
             Commodity::query()->where('id',$del['id'])->delete();
             LogService::log(__METHOD__,"去除重复sku商品",json_encode($del));
-
         }
     }
 }

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

@@ -88,15 +88,27 @@
                             <span v-else>-</span>
                     </div>
                 </td>
-                <td>
+{{--                <td>--}}
 {{--                    <span v-if="procurement_type[procurement.type]=='询价单' && procurement.supplier" >@{{ procurement.supplier.name ??  '' }}</span>--}}
-                    <span  v-if="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">
+                            <div class="col-6  border border-1"><span v-if="procurement_quotation.supplier">@{{ procurement_quotation.supplier.name }}</span></div>
+                            <div class="col-6 border border-1">@{{ procurement_quotation.offer }}</div>
+                        </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 class="col-12" @click="unfold(i)" v-else>点击收起明细</b>
+                    </div>
                 </td>
                 <td>@{{ procurement.quantity }}</td>
-                <td>
+{{--                <td>--}}
 {{--                    <span v-if="procurement_type[procurement.type]=='询价单'">@{{ procurement.cost_price }}</span>--}}
-                    <span >@{{ procurement.cost_price }}</span>
-                </td>
+{{--                    <span >@{{ procurement.cost_price }}</span>--}}
+{{--                </td>--}}
                 <td><span>@{{ procurement.unit_price }}</span></td>
                 <td><span v-if="procurement.deliver_amount">@{{ procurement.deliver_amount }}</span></td>
                 <td><span>@{{ procurement.quantity*procurement.unit_price }}</span></td>
@@ -173,8 +185,10 @@
                 errors: {},
                 selectTr:'',
                 createdProcurement:{},
+                upList:{},
             },
             mounted: function () {
+                $(".up").slideUp();
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
                 $('#list').removeClass('d-none');
                 let data = [
@@ -212,9 +226,13 @@
                     {name: 'special', value: '特殊要求', class: 'text-center'},
                     {name: 'specification', value: '材质规格', class: 'text-center'},
                     {name: '附件', value: '附件', class: 'text-center'},
-                    {name: 'supplier', value: '供应商', class: 'text-center'},
+                    // {name: 'supplier', value: '供应商', class: 'text-center'},
+                    {name:"price",type:"multi",title:"报价信息",rows:[
+                            {value:"供应商",col:"6"},
+                            {value:"采购单价(元)",col:"6"},
+                        ]},
                     {name: 'quantity', value: '采购数量', neglect: true,class: 'text-center'},
-                    {name: 'offer', value: '采购单价(元)', neglect: true,class: 'text-center'},
+                    // {name: 'offer', value: '采购单价(元)', neglect: true,class: 'text-center'},
                     {name: 'unit_price', value: '销售单价(元)', neglect: true,class: 'text-center'},
                     {name: '送货数量', value: '送货数量', neglect: true,class: 'text-center'},
                     {name: '销售总价', value: '销售总价(元)', neglect: true,class: 'text-center'},
@@ -271,6 +289,20 @@
                         window.tempTip.show("网络错误：" + err);
                     });
                 },
+                unfold(index){
+                    this.$set(this.upList,index,this.upList[index] ? !this.upList[index] : true);
+                    $("#procurement_quotation-"+index).slideToggle();
+                },
+                show(id,$e){
+                    $("#"+id).slideToggle();
+                    let value= $($e.target).html();
+                    if(value=== '点击展开'){
+                        value = '点击收起';
+                    }else if(value === '点击收起'){
+                        value ='点击展开'
+                    }
+                    $($e.target).html(value);
+                },
                 owner_seek: function (e) {
                     let _this = this;
                     let $val = e.target.value;

resources/views/rejected/create.blade.php

@@ -434,7 +434,6 @@
                     @endforeach
                 ],
                 commodityOwnerId:'',
-
             },
             mounted:function () {
                 let _this=this;
@@ -484,7 +483,7 @@
                     let _this=this;
                     let barcode=$(e.target).val();
                     let url='{{"/apiLocal/commodity/getCommodityByBarcode"}}';
-                    axios.post(url,{barcode:barcode}).then(function (response) {
+                    axios.post(url,{barcode:barcode,owner_id:_this.billInputting.id_owner}).then(function (response) {
                         _this.cleanError();
                         if(response.data.success==='true'){
                             if(response.data.commodity){