Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Http/Controllers/StoreCheckingReceiveController.php

@@ -267,6 +267,7 @@ class StoreCheckingReceiveController extends Controller
             'counted_amount'=>0,
             'imported_diff_amount'=>null,
             'asn_diff_amount'=>null,
+            'bin_number'=>null,
         ]);
         app('LogService')->log(__METHOD__,"重置盘收任务所有数量","store_checking_receive_id:".$id);
         return ['success'=>true];

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

@@ -40,7 +40,7 @@
                             <div class="btn btn-sm btn-outline-primary" v-if="status.barcodeDisable" @click="status.barcodeDisable=false">手动输入</div>
                             <div class="btn btn-sm btn-outline-danger" v-if="!status.barcodeDisable" @click="status.barcodeDisable=true">扫描输入</div>
                         </div>
-                        <input type="text" id="barcode" class="form-control"
+                        <input type="text" id="barcode" class="form-control" @blur="showCommitButton()"
                                :placeholder="status.barcodeDisable ? '扫入条码' : '输入条码'" :disabled="status.barcodeDisable" v-model="inputting.barcode" :class="inputMode=='regular' ? '' : 'mt-4'"
                                @focusin="focusOutDocument" @focusout="focusDocument">
 
@@ -60,7 +60,7 @@
                     <div class="col-6">
                         <div class="card-title" id="amountLabel">输入数量：</div>
                         <div class="input-group mt-n2 mb-2">
-                            <input type="number" id="amount" style='height: 40px;font-size: 1.6em;color:blue;font-weight: bolder;padding: 3px;text-align: center' class="form-control" placeholder=""
+                            <input type="number" id="amount" style='height: 40px;font-size: 1.6em;color:blue;font-weight: bolder;padding: 3px;text-align: center' class="form-control" placeholder="" @blur="showCommitButton()"
                                    :disabled="status.amountDisable" v-model="inputting.amount" @focusin="focusOutDocument" @focusout="focusDocument" @keyup="oninputEnter">
                         </div>
 
@@ -662,6 +662,7 @@
                               item.counted_amount = 0;
                               item.imported_diff_amount = '';
                               item.asn_diff_amount = '';
+                              item.bin_number = '';
                           });
                           window.tempTip.setDuration(2000);
                           window.tempTip.showSuccess('重新清点完毕，数量已重置为0');