采购管理月账单报表调整

app/Http/Controllers/ProcurementController.php

@@ -298,13 +298,33 @@ class ProcurementController extends Controller
         $this->gate('采购管理-财务-对账单');
         $id=$request->input('procurementCheckSheetId');
         $invoice_number=$request->input('invoice_number');
-        $procurementCheckSheet=ProcurementCheckSheet::query()->where('id',$id)
-            ->update([
+        $procurementCheckSheet=ProcurementCheckSheet::query()->find($id);
+        $procurementTotalBill=null;
+        $procurementCheckSheet->update([
                 'invoice_number'=>$invoice_number,
                 'status'=>3,//3 已完结
             ]);
-        if ($procurementCheckSheet) return ['success' => true,'data' => $invoice_number];
-        else return ['success' => false, 'message' => '添加失败'];
+        $supplier_id = $procurementCheckSheet->procurementDelivery->procurement->supplier_id ?? null;
+        $ProcurementQuery = Procurement::query()->select("id")
+            ->where('supplier_id',$supplier_id);
+        $procurementDeliveryQuery= ProcurementDeliverie::query()->select('id')
+            ->whereIn("procurement_id",$ProcurementQuery)
+            ->where("created_at","like",Carbon::parse($procurementCheckSheet['procurementDelivery']['created_at'])->format('Y-m')."%");
+        $count=ProcurementCheckSheet::query()
+            ->with(['procurementDelivery.procurement.ownerMaterial.material','procurementDelivery.procurement.supplier'])
+            ->whereIn('procurement_delivery_id',$procurementDeliveryQuery)->where('status','!=',3)->count();
+        if($count==0){
+            $procurementTotalBill=ProcurementTotalBill::query()
+                ->where('counting_month','like',Carbon::parse($procurementCheckSheet['procurementDelivery']['created_at'])->format('Y-m')."%")
+                ->where('supplier_id',$supplier_id)
+                ->update(['status'=>2]);
+        }
+        if ($procurementTotalBill) {
+            return ['success' => true,'data' => $invoice_number,'status'=>3,'totalStatus'=>2];
+        }
+        elseif ($procurementCheckSheet){
+            return ['success' => true,'data' => $invoice_number,'status'=>3];
+        }else return ['success' => false, 'message' => '添加失败'];
 
     }
 

app/ProcurementTotalBill.php

@@ -43,7 +43,6 @@ class ProcurementTotalBill extends Model
     public function  setCurrentMothProcurements(){
         $ProcurementQuery = Procurement::query()->select("id")
             ->where('supplier_id',$this->supplier_id);
-//            ->where("created_at","like",$this->counting_month."%");
          $procurementDeliveryQuery= ProcurementDeliverie::query()->select('id')
             ->whereIn("procurement_id",$ProcurementQuery)
             ->where("created_at","like",$this->counting_month."%");
@@ -52,6 +51,11 @@ class ProcurementTotalBill extends Model
             ->whereIn('procurement_delivery_id',$procurementDeliveryQuery)->get();
     }
 
+    public function checkSheet()
+    {
+
+    }
+
     protected static function booted()
     {
         /** @var User $user */

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

@@ -172,7 +172,8 @@
                         }else {
                             _this.procurementCheckSheets.forEach(function (procurementCheckSheet) {
                                 if (procurementCheckSheet.id===_this.procurementCheckSheetId){
-                                    procurementCheckSheet.invoice_number=_this.invoice_number;
+                                    procurementCheckSheet.invoice_number=res.data.data;
+                                    procurementCheckSheet.status=res.data.status;
                                 }
                             });
                             $("#fill-invoice-number").modal('hide');

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

@@ -4,17 +4,17 @@
     <div class="container-fluid nav3">
         <div class="card menu-third" >
             <ul class="nav nav-pills">
-                @can('采购管理-财务-对账单')
+                @can('采购管理-财务-月账单报表')
                     <li class="nav-item">
-                        <a class="nav-link" href="{{url('procurement/finance/checkBill')}}" :class="{active:isActive('checkBill',3)}">对账单</a>
+                        <a  class="nav-link" href="{{url('procurement/finance/monthlyBillReport')}}" :class="{active:isActive('monthlyBillReport',3)}">月账单报表</a>
                     </li> @endcan
                 @can('采购管理-财务-采购账单')
                     <li class="nav-item">
                         <a  class="nav-link" href="{{url('procurement/finance/procurementBill')}}" :class="{active:isActive('procurementBill',3)}">采购账单</a>
                     </li> @endcan
-                    @can('采购管理-财务-月账单报表')
+                @can('采购管理-财务-对账单')
                     <li class="nav-item">
-                        <a  class="nav-link" href="{{url('procurement/finance/monthlyBillReport')}}" :class="{active:isActive('monthlyBillReport',3)}">月账单报表</a>
+                        <a class="nav-link" href="{{url('procurement/finance/checkBill')}}" :class="{active:isActive('checkBill',3)}">对账单</a>
                     </li> @endcan
             </ul>
         </div>

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

@@ -141,12 +141,6 @@
                             name: 'supplier_id', type: 'select_multiple_select', tip: ['输入关键词快速定位下拉列表,回车确定', '选择要显示的供应商'],
                             placeholder: ['供应商', '定位或多选供应商'], data: this.suppliers
                         },
-                        // {
-                        //     name: 'status', type: 'select',
-                        //     tip: '输入关键词快速定位下拉列表,回车确定',
-                        //     placeholder: '对账单状态',
-                        //     data: [{name:0,value:'未出账'},{name:1,value:'已出账'},{name:2,value:'已完结'},],
-                        // },
                     ],
                 ];
                 this.form = new query({
@@ -225,9 +219,12 @@
                         }else {
                             _this.procurementTotalBills[_this.index].procurementCheckSheets.forEach(function (procurementCheckSheet) {
                                 if (procurementCheckSheet.id===_this.procurementCheckSheetId){
-                                    procurementCheckSheet.invoice_number=_this.invoice_number;
+                                    procurementCheckSheet.invoice_number=res.data.data;
+                                    procurementCheckSheet.status=res.data.status;
                                 }
                             });
+                            console.log(res.data.totalStatus,_this.procurementTotalBills[_this.index])
+                            if (res.data.totalStatus) _this.procurementTotalBills[_this.index].status=res.data.totalStatus;
                             $("#fill-invoice-number").modal('hide');
                             tempTip.setDuration(3000);
                             tempTip.showSuccess('添加发票号成功！');