Browse Source

合并时候解决8月17号和20号盘点冲突问题,重新修改一遍

hella_online_20240829
zhang_li 5 months ago
parent
commit
4f431b5d55
  1. 22
      src/mycomponents/scan/winScanPackAndLocation.vue

22
src/mycomponents/scan/winScanPackAndLocation.vue

@ -8,8 +8,8 @@
</view>
<view class="">
<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg"
@click="closeScanPopup()"></image>
<image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()">
</image>
</view>
</view>
<view class="uni-flex uni-row" style="align-items: center;
@ -39,8 +39,8 @@
</view>
<view class="">
<view class="">
<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult"
:isShowHistory="isShowHistory" :clearResult="true" :headerType="headerType"></win-com-scan>
<win-com-scan ref="comscan" :placeholder="title" @getResult="getScanResult" :isShowHistory="isShowHistory"
:clearResult="true" :headerType="headerType"></win-com-scan>
</view>
</view>
</view>
@ -140,6 +140,7 @@
managementPrecision: '',
fromInventoryStatuses: "",
isCheck: false,
chooseWhich: '1'
}
},
created() {
@ -317,7 +318,12 @@
uni.hideLoading();
if (res.success) {
this.managementPrecision = res.managementPrecision
this.chooseWhich = '2'
if (res.data && res.data.list && res.data.list.length > 1) {
this.showBalanceSelect(res.data.list);
} else {
this.afterQueryBalance(res.data.list);
}
} else {
this.showErrorMessage(res.message, res => {
this.packGetFocus();
@ -386,6 +392,7 @@
// }
} else {
this.showBalanceSelect(datas);
this.chooseWhich = '1'
}
},
@ -394,7 +401,12 @@
},
selectBalanceItem(balance) {
if (this.chooseWhich == 1) {
this.packCallBack(balance);
} else {
this.countCallBack(balance);
}
// this.packCallBack(balance);
// 20231228
// if (balance.qty > 0) {
// this.packCallBack(balance);
@ -459,7 +471,7 @@
let condition = '按照以下条件:\n';
let label = this.scanResult.label;
var isShowStatus = this.balanceFromInventoryStatuses ? this.fromInventoryStatuses : undefined
if(isShowStatus){
if (isShowStatus) {
let status = getInventoryStatusDesc(isShowStatus);
}

Loading…
Cancel
Save