库存盘点BUG

public/t.php

@@ -1,14 +1,9 @@
 <script>
 
 
-    let promise = new Promise(function (resolve, reject) {
-
-        resolve('xxx')
-    });
-    promise.then(function(ind){for (let i = 0; i < 9999999; i++) {
-        if (i % 5000 === 0) console.log('i')
-    }})
-    console.log('yes')
-    console.log('yes')
-    console.log('yes')
+    let arr=[a:111,b:222]
+    arr['c']=333;
+    arr['c']=333;
+    arr['c']=333;
+    console.log(Array.isArray(arr['c']),Array.isArray(arr['cc']))
 </script>

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

@@ -7,7 +7,10 @@
             <a  class="nav-link" href="{{URL::current()}}" :class="{active:isActive('enterStockInventory',3)}">盘点中({!! $inventoryAccount->id !!})</a>
         </li>
     @endcomponent
-    <div id="list" class="d-none container-fluid" >
+    <div class="text-center h5 mt-2" id="loadingPage">
+        载入中……
+    </div>
+    <div id="list" class="d-none container-fluid d-none" >
         <div class="mt-3">
             <span class="mt-3" >
                 @can('库存管理-盘点-完结')
@@ -635,8 +638,8 @@
                     },
                     @endforeach
                 ],
-                条码索引_记录: [],
-                库位索引_记录: [],
+                条码索引_记录: {},
+                库位索引_记录: {},
                 checkData: [],
                 selectedStyle:'',
                 指定盘点记录列:[],
@@ -670,8 +673,11 @@
             },
             mounted: function () {
                 let _this = this;
+                (function 显示渲染后页面(){
+                    $('#loadingPage').remove();
+                    $('#list').removeClass('d-none');
+                })()
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
-                $("#list").removeClass('d-none');
                 $barcodeInput=$('#barcodeInput');
                 $locationInput=$('#locationInput');
                 $amountInput=$('#amountInput');
@@ -717,8 +723,7 @@
                     });
                     header.init();
                 },0);
-                this.以条码建立记录索引();
-                this.以库位建立记录索引();
+                this.建立记录索引();
             },
             methods:{
                 inputs() {
@@ -797,20 +802,15 @@
                     }
                     this.筛选出记录(_this.inputs().location,_this.inputs().barcode);
                 },100,{ 'trailing': false }),
-                以条码建立记录索引(){
+                建立记录索引(){
                     let _this=this;
                     _this.inventoryMissions.forEach(function (inventoryMission) {
                         inventoryMission.commodity_barcodes.forEach(function (barcode) {
-                            _this.条码索引_记录[barcode.code]=inventoryMission;
-                            _this.条码索引_记录.push(_this.条码索引_记录[barcode.code])
+                            if(!Array.isArray(_this.条码索引_记录[barcode.code])) _this.条码索引_记录[barcode.code]=[];
+                            _this.条码索引_记录[barcode.code].push(inventoryMission);
                         })
-                    });
-                },
-                以库位建立记录索引(){
-                    let _this=this;
-                    _this.inventoryMissions.forEach(function (inventoryMission) {
-                        _this.库位索引_记录[inventoryMission.location]=inventoryMission;
-                        _this.库位索引_记录.push(_this.库位索引_记录[inventoryMission.location])
+                        if(!Array.isArray(_this.库位索引_记录[inventoryMission.location])) _this.库位索引_记录[inventoryMission.location]=[];
+                        _this.库位索引_记录[inventoryMission.location].push(inventoryMission);
                     });
                 },
                 清空指定盘点记录列(){
@@ -836,15 +836,14 @@
                     if(!库位)return false;
                     if(!条码)return false;
                     if (!_this.库位索引_记录[库位]||(!_this.条码索引_记录[条码]&&(await _this.is条码存在于WMS(条码)))) return;
-                    _this.inventoryMissions.forEach(function (inventoryMission) {
-                        inventoryMission.commodity_barcodes.forEach(function (barcode) {
-                            if (inventoryMission.location===库位 && 条码===barcode.code){
-                                if(!_this.指定盘点记录列.includes(inventoryMission)){
-                                    _this.指定盘点记录列.push(inventoryMission);
-                                }
+                    if(_this.库位索引_记录[条码]){
+                        let inventoryMission=_this.条码索引_记录[条码];
+                        if (inventoryMission.location===库位){
+                            if(!_this.指定盘点记录列.includes(inventoryMission)){
+                                _this.指定盘点记录列.push(inventoryMission);
                             }
-                        })
-                    });
+                        }
+                    }
                 },
                 放置焦点光标至正确位置:_.throttle(function(){
                     let _this=this;
@@ -1241,17 +1240,17 @@
                                 tempTip.setDuration(3000);
                                 tempTip.show('增加系统之外的盘点记录失败!');
                             } else {
-                                _this.inventoryMissions.push(response.data.inventoryAccountMission);
-                                _this.inventoryMissions.every(function (inventoryAccountMission, i) {
-                                    if (parseInt(inventoryAccountMission.id) === parseInt(response.data.inventoryAccountMission.id)) {
-                                        inventoryAccountMission = response.data.inventoryAccountMission;
-                                        inventoryAccountMission.stockInventoryPersons = response.data.stockInventoryPersons;
-                                        _this.inventoryMissions.splice(i, 1);
-                                        _this.inventoryMissions.unshift(inventoryAccountMission);
-                                        return false;
-                                    }
-                                    return true
+                                let inventoryAccountMission=response.data.inventoryAccountMission;
+                                inventoryAccountMission.commodity_barcodes = response.data.inventoryAccountMission.commodity.barcodes;
+                                inventoryAccountMission.commodity_name = response.data.inventoryAccountMission.commodity.name;
+                                inventoryAccountMission.stockInventoryPersons = response.data.stockInventoryPersons;
+                                inventoryAccountMission.produced_at = '';
+                                inventoryAccountMission.valid_at = '';
+                                _this.inventoryMissions.push(inventoryAccountMission);
+                                inventoryAccountMission.commodity_barcodes.forEach(function(barcode){
+                                    _this.条码索引_记录[barcode.code]=inventoryAccountMission;
                                 });
+                                _this.库位索引_记录[location]=inventoryAccountMission;
                                 _this.重排序并标记全列表类型(_this.inventoryMissions);
                                 _this.清空inputs();
                                 tempTip.setDuration(3000);

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

@@ -4,7 +4,10 @@
 
 @section('content')
     @component('inventory.stockInventory.menu')@endcomponent
-    <div id="list" class="container-fluid" style="min-width: 1500px">
+    <div class="text-center h5 mt-2" id="loadingPage">
+        载入中……
+    </div>
+    <div id="list" class="container-fluid d-none" style="min-width: 1500px">
         <form class="form-inline mt-2">
             <span class="form-inline ml-5">
                  <span class="btn btn-sm btn-outline-secondary tooltipTarget" @click="syncOwners">同步货主</span>
@@ -120,7 +123,10 @@
             },
             mounted: function () {
                 $(".tooltipTarget").tooltip({'trigger': 'hover'});
-                $("#list").removeClass('d-none');
+                (function 显示渲染后页面(){
+                    $('#loadingPage').remove();
+                    $('#list').removeClass('d-none');
+                })()
                 this.fakeOwners=this.owners;
                 let _this = this;
                 let column = [

resources/views/store/checkingReceive/mission.blade.php

@@ -70,7 +70,7 @@
                 <button v-if="storeCheckingReceive.status != '已收货'" class="btn btn-sm btn-outline-success" data-toggle="modal" data-target="#asnWindow" @click="thisIndex=i">
                     <span v-if="storeCheckingReceive.asn">重新</span>匹配ASN号
                 </button>@endcan
-                @can('入库管理-快速入库-录入')
+                @can('入库管理-快速入库')
                 <button v-if="storeCheckingReceive.status=='已ASN入库' && storeCheckingReceive.is_receive_diff != '是' && storeCheckingReceive.is_asn_diff != '是' && storeCheckingReceive.status != '已收货'"
                         class="btn btn-sm btn-outline-info" @click="receipt(i)">快速入库</button>
                 @endcan
@@ -279,4 +279,4 @@
             },
         });
     </script>
-@stop
+@stop