盘点页面兼容移动端修改

app/Http/Controllers/InventoryAccountController.php

@@ -15,7 +15,7 @@ class InventoryAccountController extends Controller
 {
     public function __construct()
     {
-        app()->singleton('inventoryService',InventoryAccountService::class);
+        app()->singleton('inventoryAccountService',InventoryAccountService::class);
     }
 
     //创建盘点任务
@@ -27,7 +27,7 @@ class InventoryAccountController extends Controller
         $date_start=$request->input('date_start');
         $date_end=$request->input('date_end');
         $ownerId=$request->input('owner_id');
-        $inventoryAccount=app('inventoryService')->createMission($date_start,$date_end,$ownerId);
+        $inventoryAccount=app('inventoryAccountService')->createMission($date_start,$date_end,$ownerId);
         $inventoryAccount=InventoryAccount::with('owner')->find($inventoryAccount->id);
         if (is_null($inventoryAccount)) return ['success'=>false,'data'=>'参数错误!'];
         return ['success'=>true,'data'=>$inventoryAccount];
@@ -47,7 +47,7 @@ class InventoryAccountController extends Controller
         if(!Gate::allows("库存管理-盘点")){ return redirect(url('/'));  }
         $paginateParams = $request->input();
         $queryParam=$request->all();
-        $inventoryAccounts=app('inventoryService')->paginate($queryParam);
+        $inventoryAccounts=app('inventoryAccountService')->paginate($queryParam);
         $owners=Owner::select('id','name')->get();
         return view('inventory.stockInventory.mission',compact('owners','inventoryAccounts','paginateParams'));
     }
@@ -72,9 +72,9 @@ class InventoryAccountController extends Controller
         $inventoryId=$request->input('inventoryId');
         $count=$request->input('count');
         if (is_null($count)) return ['success'=>false,'data'=>'盘点数不能为空!'];
-        $inventoryAccountMission=app('inventoryService')->stockInventory($location,$barcode,$count,$inventoryId);
+        $inventoryAccountMission=app('inventoryAccountService')->stockInventory($location,$barcode,$count,$inventoryId);
         if (!$inventoryAccountMission)return ['success'=>false,'data'=>'参数错误!'];
-        $inventoryAccount=app('inventoryService')->updateInventory($inventoryId);
+        $inventoryAccount=app('inventoryAccountService')->updateInventory($inventoryId);
         return ['success'=>true,'inventoryMission'=>$inventoryAccountMission,'inventory'=>$inventoryAccount];
     }
     //根据该库存和产品条码查询该条盘点记录
@@ -83,7 +83,7 @@ class InventoryAccountController extends Controller
         $location=$request->input('location');
         $barcode=$request->input('barcode');
         $inventoryId=$request->input('inventoryId');
-        $inventoryAccountMission=app('inventoryService')->searchStockInventoryRecord($location,$barcode,$inventoryId);
+        $inventoryAccountMission=app('inventoryAccountService')->searchStockInventoryRecord($location,$barcode,$inventoryId);
         if (!$inventoryAccountMission)return ['success'=>false,'data'=>'参数错误!'];
         return ['success'=>true,'data'=>$inventoryAccountMission];
     }
@@ -96,10 +96,10 @@ class InventoryAccountController extends Controller
         if ($request->checkAllSign){
             $request->offsetUnset('checkAllSign');
             $queryParam=$request->all();
-            $inventoryAccounts=app('inventoryService')->get($queryParam);
+            $inventoryAccounts=app('inventoryAccountService')->get($queryParam);
         }else{
             $queryParam=$request->all();
-            $inventoryAccounts=app('inventoryService')->some($queryParam);
+            $inventoryAccounts=app('inventoryAccountService')->some($queryParam);
         }
         $row=[[
             'id'=>'盘点编号',

app/Http/Controllers/InventoryController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use App\Exports\Export;
 use App\OracleBasCustomer;
-use App\Services\InventoryAccountService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
@@ -12,11 +11,7 @@ use Maatwebsite\Excel\Facades\Excel;
 
 class InventoryController extends Controller
 {
-    public function __construct()
-    {
-        app()->singleton('inventoryService',InventoryAccountService::class);
-    }
-    //动库表表
+
     private function conditionQuery(Request $request,$page=null,$paginate=null){
         $date_start=$request->input('date_start');
         $range = $request->input('range');
@@ -90,7 +85,6 @@ class InventoryController extends Controller
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
         return DB::connection('oracle')->select($sql);
     }
-    //全部库存
     private function conditionQueryAllInventory(Request $request,$page=null,$paginate=null){
         $date_start=$request->date_start;
         $range = $request->range;
@@ -138,7 +132,6 @@ class InventoryController extends Controller
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
         return DB::connection('oracle')->select($sql);
     }
-    //动库报表
     public function changeInventory(Request $request){
         if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
         $page=$request->input('page')??1;
@@ -149,7 +142,6 @@ class InventoryController extends Controller
         $isTotalStock=false;
         return view('inventory.statement.changeInventory',compact('oracleActTransactingLogs','page','owners','isTotalStock'));
     }
-    //全部库存
     public function allInventory(Request $request){
         if(!Gate::allows("库存管理-库存")){ return redirect(url('/'));  }
         $page=$request->page??1;

app/InventoryAccount.php

@@ -39,6 +39,7 @@ class InventoryAccount extends Model
     public function getDifferenceAmount(){
         return $this->inventoryMissions()->where('inventory_account_id',$this['id'])->where('difference_amount','>',0)->count();
     }
+    //复盘归位
     public function getReturnedAmount(){
         return $this->inventoryMissions()->where('inventory_account_id',$this['id'])->where('returned','是')->count();
 

app/Services/InventoryAccountService.php

@@ -176,6 +176,7 @@ class InventoryAccountService
             'quality'=>$wmsInventory->质量状态,
             'stored_amount'=>$wmsInventory->在库数量,
             'occupied_amount'=>$wmsInventory->占用数量,
+            'valid_amount'=>$wmsInventory->在库数量-$wmsInventory->占用数量,
             ];
             array_push($inventoryAccountMissions,$inventoryAccountMission);
         }

resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -7,72 +7,76 @@
                 <a  class="nav-link" href="{{URL::current()}}" :class="{active:isActive('enterStockInventory',3)}">盘点中({!! $inventoryAccount->id !!})</a>
             </li>
         @endcomponent
-    <div id="list" class="container-fluid" style="min-width: 1500px">
-        <div class="mt-3 pl-5">
-        <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded">
-            <label class="col-1 font-weight-bold">货主:</label><span>@{{ inventory.owner.name }}</span>
+    <div id="list" class="d-none container-fluid" >
+        <div class="mt-3 offset-1">
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
+            <label class=" font-weight-bold">货主:</label><span>@{{ inventory.owner.name }}</span>
         </span>
-            <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded">
-            <label class="col-1 font-weight-bold">盘点单号:</label><span>@{{ inventory.id }}</span>
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
+            <label class=" font-weight-bold">盘点单号:</label><span>@{{ inventory.id }}</span>
         </span>
         </div>
-        <div class="mt-3 pl-5">
-        <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded">
-            <label class="col-1 font-weight-bold">时间范围:</label><span>@{{ inventory.start_at }}——@{{ inventory.end_at }}</span>
+
+        <div class="mt-3 offset-1">
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded">
+            <label class=" font-weight-bold">时间范围:</label><span>@{{ inventory.start_at }}—@{{ inventory.end_at }}</span>
         </span>
-        <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
-            <label class="col-1 font-weight-bold">已盘点:</label><span>@{{ inventory.processed }}/总数:@{{ inventory.total }}</span>
+
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
+            <label class=" font-weight-bold">已盘点:</label><span>@{{ inventory.processed }}/总数:@{{ inventory.total }}</span>
         </span>
-        <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
-            <label class="col-1 font-weight-bold">剩余数:</label><span>@{{ inventory.surplus }}</span>
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus!=0">
+            <label class=" font-weight-bold">剩余数:</label><span>@{{ inventory.surplus }}</span>
         </span>
-            <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
-            <label class="col-1 font-weight-bold">盘点记录数:</label><span>@{{ inventory.total }}</span>
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
+            <label class=" font-weight-bold">盘点记录数:</label><span>@{{ inventory.total }}</span>
         </span>
-            <span class="form-group pl-5 shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
-            <label class="col-1 font-weight-bold">复盘剩余数:</label><span>@{{ inventory.check_surplus }}/复盘总数:@{{ inventory.total }}</span>
+        <span class="form-group  shadow-sm p-2 mb-5 bg-white rounded" v-if="inventory.surplus==0">
+            <label class=" font-weight-bold">复盘剩余数:</label><span>@{{ inventory.check_surplus }}/复盘总数:@{{ inventory.total }}</span>
         </span>
         </div>
-        <div class="mt-4 ml-5" >
-        <span class="btn col-1 font-weight-bold"  style="cursor: default" :class="inventory.surplus!=0?'bg-info':'btn-outline-info disabled'">
+
+
+        <div class="row offset-1 mt-3" >
+        <span class="btn  col-md-2 font-weight-bold"  style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'bg-info':'btn-outline-info disabled'">
             @{{ inventory.type }}
         </span>
-            <span class="btn col-1 font-weight-bold" style="cursor: default" :class="inventory.surplus!=0?'btn-outline-info disabled':'bg-info'">复盘</span>
+            <span class="btn  col-md-2 font-weight-bold" style="cursor: default;max-width: 160px" :class="inventory.surplus!=0?'btn-outline-info disabled':'bg-info'">复盘</span>
         </div>
 
-        <form id="form"  class="mt-3 pl-5">
-            <div class="row" :class="inventory.surplus!=0?'row-cols-3':'row-cols-5'">
+        <form id="form"  class="row mt-3 offset-1">
+            <div class="row form-inline" :class="inventory.surplus!=0?'row-cols-3':'row-cols-5'">
         <span>
-            <label for="location" class="text-secondary font-weight-bold">请输入库位</label>
-            <input id="inventoryInput" name="location" type="text" class="form-control col-6 input"  autocomplete="off" value="@if(old('location')){{old('location')}}@endif">
+            <label for="location" class="text-secondary font-weight-bold">请输库位</label>
+            <input id="inventoryInput" name="location" type="text" class="form-control  input"  autocomplete="off" value="@if(old('location')){{old('location')}}@endif">
         </span>
         <span>
-            <label for="barcode" class="text-secondary font-weight-bold">请输入产品条码</label>
-            <input id="barcode" name="barcode" type="text" value="@if(old('barcode')){{old('barcode')}}@endif" class="form-control col-6 input" autocomplete="off" @blur="searchBarcode">
+            <label for="barcode" class="text-secondary font-weight-bold">请输产品条码</label>
+            <input id="barcode" name="barcode" type="text" value="@if(old('barcode')){{old('barcode')}}@endif" class="form-control  input" autocomplete="off" @blur="searchBarcode">
         </span>
         <span>
-            <label for="count" class="text-secondary font-weight-bold">请输入盘点数</label>
-            <input type="text" id="count" name="count" class="form-control col-6 input" value="@if(old('count')){{old('count')}}@endif"  autocomplete="off">
+            <label for="count" class="text-secondary font-weight-bold">请输盘点数</label>
+            <input type="text" id="count" name="count" class="form-control input" value="@if(old('count')){{old('count')}}@endif"  autocomplete="off">
         </span>
 
         <span v-if="inventory.surplus==0">
             <label for="count" class="text-secondary font-weight-bold">上一次盘点数</label>
             <span v-if="!inventoryMissionRecord.re_checked_amount">
-                <input type="text" id="count" name="count" v-model="inventoryMissionRecord.verified_amount" class="form-control col-6 input" readonly>
+                <input type="text" id="count" name="count" v-model="inventoryMissionRecord.verified_amount" class="form-control  input" readonly>
             </span>
             <span v-if="inventoryMissionRecord.re_checked_amount">
-                <input type="text" id="count" name="count" v-model="inventoryMissionRecord.re_checked_amount" class="form-control col-6 input" readonly>
+                <input type="text" id="count" name="count" v-model="inventoryMissionRecord.re_checked_amount" class="form-control  input" readonly>
             </span>
         </span>
         <span v-if="inventory.surplus==0">
             <label for="count" class="text-secondary font-weight-bold">盘点差异数</label>
-            <input type="text" id="count" name="count" v-model="inventoryMissionRecord.difference_amount" class="form-control col-6 input" readonly>
+            <input type="text" id="count" name="count" v-model="inventoryMissionRecord.difference_amount" class="form-control  input" readonly>
         </span>
             </div>
         </form>
 
 
-        <table class="table table-sm table-striped table-bordered table-hover text-nowrap card-body mt-2">
+        <table class="table table-sm table-striped table-bordered table-hover text-nowrap d-none d-sm-block  mt-2">
             <tr>
                 <th>序号</th>
                 <th>库位</th>
@@ -91,7 +95,6 @@
                 <th>盘点差异</th>
                 <th>分配数量</th>
             </tr>
-
             <tr v-for="(inventoryMission,i) in inventoryMissions" v-if="inventoryMission.checked=='是'"  @click="selectedColor(inventoryMission.id)" :style="{'font-weight': inventory.id==selectedStyle?'bold':''}">
                 <td>@{{ i+1 }}</td>
                 <td>@{{ inventoryMission.location }}</td>
@@ -111,6 +114,27 @@
                 <td>@{{ inventoryMission.occupied_amount }}</td>
             </tr>
         </table>
+
+        <table class="table table-striped table-sm table-bordered table-hover p-0 d-block d-sm-none" style="background: rgb(255, 255, 255);" >
+            <tbody>
+            <tr v-for="inventoryMission in inventoryMissions" v-if="inventoryMission.checked=='是'">
+                <td style="filter:grayscale(30%); ">
+                    <div  class="mt-3">
+                        <div style="transform:scale(0.9)" class="pl-0">
+                            <span class="mr-3 text-nowrap"><span class="font-weight-bold">库位：</span><span style="color:#af7651">@{{ inventoryMission.location }}</span></span>
+                            <span class="mr-3 text-nowrap"><span class="font-weight-bold">产品名称：</span><span style="color:#af7651" v-if="inventoryMission.commodity">@{{ inventoryMission.commodity.name }}</span></span>
+                            <span class="mr-3 text-nowrap"><span class="font-weight-bold">产品条码：</span><span style="color:#af7651" v-if="inventoryMission.commodity">@{{ inventoryMission.commodity.barcode }}</span></span>
+                            <div v-if="inventory.surplus==0">
+                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点数量：</span><span style="color:#af7651">@{{ inventoryMission.verified_amount }}</span></span>
+                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">复盘数量：</span><span style="color:#af7651">@{{ inventoryMission.re_checked_amount }}</span></span>
+                            <span class="mr-3 text-nowrap"><span style="color:#783000" class="font-weight-bold">盘点差异：</span><span >@{{ inventoryMission.difference_amount }}</span></span>
+                            </div>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
+        </table>
     </div>