Browse Source

HL-5339无计划完工,超过报工数还可以在扫描,应到报工数自动提交;超过报工数提交后,返回可再次扫描,应返回主页面不能在扫扫描

hella_online_20240819
zhang_li 3 months ago
parent
commit
24fe84795c
  1. 23
      src/pages/fg/receiptNoPlan.vue

23
src/pages/fg/receiptNoPlan.vue

@ -395,12 +395,22 @@
calcFgQty() { calcFgQty() {
this.dataContent.handleQty = this.showList.length; this.dataContent.handleQty = this.showList.length;
if (this.dataContent.handleQty == this.dataContent.packQty) { if(parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty) <= parseFloat(this.dataContent.packQty)){
if(parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.planQty) -parseFloat(this.scanedQty)){
if (this.$refs.scanPopup) { if (this.$refs.scanPopup) {
this.$refs.scanPopup.closeScanPopup(); this.$refs.scanPopup.closeScanPopup();
} }
this.commit() this.commit()
} }
}else{
if (parseFloat(this.dataContent.handleQty) == parseFloat(this.dataContent.packQty)) {
if (this.$refs.scanPopup) {
this.$refs.scanPopup.closeScanPopup();
}
this.commit()
}
}
}, },
scanPopupGetFocus() { scanPopupGetFocus() {
@ -416,15 +426,22 @@
getH5BatchPrintingLable( number) { getH5BatchPrintingLable( number) {
let _this = this let _this = this
batchPrintingLable(number).then(resLable => { batchPrintingLable(number).then(resLable => {
console.log('batchPrintingLable', resLable)
const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712` const webUrl = `${import.meta.env.VITE_JMREPORT_BASE_URL}/jmreport/view/922734157577715712`
const webData = { const webData = {
token: storage.getStorage(storage.constant.token), token: storage.getStorage(storage.constant.token),
asn_number: resLable.data asn_number: resLable.data
} }
if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
uni.redirectTo({
url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
});
}else{
uni.navigateTo({ uni.navigateTo({
url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}` url: `/pages/pointProductReceipt/webview?url=${webUrl}&webData=${JSON.stringify(webData)}`
}); });
}
}) })
}, },
@ -432,7 +449,7 @@
let _this = this let _this = this
// #ifdef APP // #ifdef APP
if (pointData.length > 0) { if (pointData.length > 0) {
if (this.scanedQty + this.showList.length == this.dataContent.planQty) { if ( this.scanedQty + this.showList.length == this.dataContent.planQty) {
uni.redirectTo({ uni.redirectTo({
url: `/pages/point/index?points=${JSON.stringify(pointData)}` url: `/pages/point/index?points=${JSON.stringify(pointData)}`
}); });

Loading…
Cancel
Save