Forráskód Böngészése

盘点页面--修改确认差异按钮为跳过

haozi 5 éve
szülő
commit
38eeaf171a

+ 10 - 5
resources/views/inventory/stockInventory/inventoryMission.blade.php

@@ -41,8 +41,8 @@
             </span>
             <span>
                 <button class="btn btn-outline-dark btn-sm form-control-sm tooltipTarget"
-                        @click="批量跳过或确认差异()" v-if="!listMode" title="勾选指定盘点记录行,进行批量跳过或批量确认差异">
-                    批量跳过或确认差异
+                        @click="批量跳过或确认差异()"  title="勾选指定盘点记录行,进行批量跳过或批量确认差异">
+                    批量跳过
                 </button>
             </span>
 
@@ -425,7 +425,7 @@
                             <span class="btn  btn-sm btn-outline-secondary" v-if="inventoryMission.checked==='否'"
                                   @click="跳过盘点记录(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">跳过</span>
                             <span class="btn  btn-sm btn-outline-secondary" v-if="inventoryMission.mark==='已复盘有差异'||inventoryMission.mark==='未复盘有差异'"
-                                  @click="确认盘点差异(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">确认差异</span>
+                                  @click="确认盘点差异(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">跳过</span>
                             <span class="btn  btn-sm btn-outline-secondary"
                                   v-if="inventory.type=='动盘'&& inventoryMission.mark=='未盘' &&!listMode"
                                   @click="选中盘点起始位置(inventoryMission.id,inventoryMission.location)">以此为起点</span>
@@ -509,7 +509,7 @@
                                 <span class="btn  btn-sm btn-outline-secondary" v-if="inventoryMission.checked==='否'"
                                       @click="跳过盘点记录(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">跳过</span>
                                      <span class="btn  btn-sm btn-outline-secondary" v-if="inventoryMission.mark==='已复盘有差异'||inventoryMission.mark==='未复盘有差异'"
-                                           @click="确认盘点差异(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">确认差异</span>
+                                           @click="确认盘点差异(inventoryMission.id,inventory.id,inventoryMission.commodity.name)">跳过</span>
                                     <span class="btn  btn-sm btn-outline-secondary"
                                           v-if="inventory.type=='动盘'&& inventoryMission.mark=='未盘' &&!listMode"
                                           @click="选中盘点起始位置(inventoryMission.id,inventoryMission.location)">以此为起点</span>
@@ -2027,8 +2027,13 @@
                 },
                 showCommitButton: function () {
                     let data = this;
-                    if(data.inputting.barcode && data.inputting.amount){
+                    if(data.inputting.barcode && data.inputting.amount /*&& data.inputting.bin*/){
                         data.commitButtonVisible=true;
+                    }else{
+                        if (this.inputMode==='regular' && this.status.barcodeDisable && !this.inputting.amount && this.inputting.barcode){
+                            this.focusing = '';
+                            document.getElementById('amount').focus();
+                        }
                     }
                 },
                 submitStockInventory: function () {