- 物料号：
${item.itemCode}
+ 物料号：
${item.itemCode}asjkdhfksjahfkljashfklsdh
托包装号：
${item.packingNumber}
@@ -184,44 +193,48 @@
// 获取采购收货指引单html
getPurchaseReceiptJobHtml() {
this.$nextTick(async () => {
- let str2 = ''
+ let str = ''
this.readFile(htmlFileUrl1, (htmlContent) => {
this.newHtmlContent1 = htmlContent
- str2 = `
-
-
-
-
- | 发货单号: |
- ${this.data1.asnNumber} |
-
-
- | 物料代码 |
- 供应商批次 |
- 检验数量 |
-
-
-
- strBody
-
-
-
-
- `
- let str1 = ''
this.data1.inspectDTOList.forEach(item => {
- str1 += `
-
- | ${item.itemCode} |
- ${item.supplierBatch} |
- ${item.sampleQty} |
-
+ str += `
+
+
+
Q
+
+
+
+ | 物料代码: |
+ ${item.itemCode} |
+
+
+
+
+ | 物料名称 |
+ ${item.itemName} |
+ 发货单号 |
+ ${this.data1.asnNumber} |
+
+
+ | 供应商 |
+ ${item.supplierCode} |
+ 批次 |
+ ${item.supplierBatch} |
+
+
+ | 到货数量 |
+ ${item.quantityQty} |
+ 抽检数量 |
+ ${item.sampleQty} |
+
+
+
+
+
`
})
- str2 = str2.replace("strBody", str1)
- console.log(335, str1)
this.newHtmlContent1 = this.newHtmlContent1.replace(
- "mainBody", str2); //替换物品代码
+ "mainBody", str); //替换物品代码
});
})
@@ -308,7 +321,7 @@
},
onReachBottom() {
if (this.tabIndex == 1) {
- if (this.showTableInspectDTOList.length != this.data1.inspectDTOList.length) {
+ if (this.showTableInspectDTOList != this.data1.inspectDTOList.length) {
this.getTableInspectDTOList()
}
} else {
@@ -323,7 +336,7 @@
\ No newline at end of file
From 4ee3560350cf4eb247887b2a1716cb83c308a951 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Fri, 9 Aug 2024 14:35:28 +0800
Subject: [PATCH 06/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AD=9B=E9=80=89=E6=B2=A1=E6=9C=89=E8=AE=B0?=
=?UTF-8?q?=E4=BD=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/repleinsh/job/repleinshJob.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 54c654d0..b7b2f5e4 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -114,7 +114,7 @@
},
onShow() {
- this.getList('refresh');
+ this.getList('refresh', this.fromLocationCode, this.filterItemCode)
},
onReady() {
From 0aa7c71af5afb3281cfead7c48ccfed061ddd258 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Fri, 9 Aug 2024 14:36:18 +0800
Subject: [PATCH 07/43] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/job/jobFilter.vue | 2 +-
src/mycomponents/scan/winComScanBalance.vue | 1 +
.../inventoryMove/coms/comMoveRecordCard.vue | 16 ++++++++++------
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 84e9db14..0da05f0f 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -59,7 +59,7 @@
-->
-
+
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index b8f165a8..b2b32600 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -282,6 +282,7 @@
},
showErrorMessage(message) {
+ this.losefocus()
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
if (this.$refs.comscan) {
diff --git a/src/pages/inventoryMove/coms/comMoveRecordCard.vue b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
index 80c1c590..7e9c2113 100644
--- a/src/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -1,6 +1,6 @@
-
+
@@ -88,13 +88,17 @@
dataContent: {
handler(newName, oldName) {
if (this.dataContent.subList.length > 0) {
- if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
- this.$nextTick(res => {
- this.$refs.collapse1.resize()
- })
- }
+ this.$nextTick(res => {
+ setTimeout(() => {
+ if (this.$refs.collapse1) {
+ this.$refs.collapse1.resize();
+ }
+ }, 500)
+ })
}
},
+
+
immediate: true,
deep: true
}
From 281c52e21a28335b0f348413ed83f2df800c6686 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Fri, 9 Aug 2024 15:05:06 +0800
Subject: [PATCH 08/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?=
=?UTF-8?q?=E5=B7=B2=E7=BB=8F=E6=9C=89=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../repleinsh/coms/comScanReplishPack.vue | 71 +++++++++++++++++--
1 file changed, 66 insertions(+), 5 deletions(-)
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index b65006d4..58a21ce1 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -84,7 +84,7 @@
import {
getWorkShopLineStation,
getBalanceByFilter,
- getBalanceByParams
+ getBalanceByParams,
} from '@/api/request2.js';
import {
@@ -142,7 +142,9 @@
defaultValueList: [],
label: {},
fromInventoryStatuses: "",
- packageInfo: {}
+ packageInfo: {},
+ toLocationAreaTypeList:[]
+
}
},
created() {
@@ -194,6 +196,7 @@
that.fromInventoryStatuses = this.jobContent.outInventoryStatuses
that.toLocation = that.dataContent[0];
that.toLocationCode = that.dataContent[0].toLocationCode;
+ that.toLocationAreaTypeList=getDirectoryItemArray(this.jobContent.toAreaTypes)
// that.fromLocationList = that.getFromLocationList();
}
},
@@ -250,16 +253,74 @@
this.$refs.comMessage.showQuestionMessage(
`扫描物料包装【${result.package.packUnit}】与任务推荐包装规格【${item.packUnit}】不一致.是否要继续发料？`, res => {
if (res) {
- this.onScanResult(result)
+ this.getToLocationBalance(result)
}
});
} else {
- this.onScanResult(result)
+ this.getToLocationBalance(result)
}
}
},
+
+ //查询到目标库位的库存余额
+ getToLocationBalance(result) {
+ uni.showLoading({
+ title: '查询中',
+ mask: true
+ })
+ var filters = []
+ if (result.package.parentNumber) {
+ var packingNumber = result.package.parentNumber + "," + result.package.number;
+ filters.push({
+ column: "packingNumber",
+ action: "in",
+ value: packingNumber
+ })
+ } else {
+ filters.push({
+ column: "packingNumber",
+ action: "==",
+ value: result.package.number
+ })
+ }
+
+ filters.push({
+ column: "itemCode",
+ action: "==",
+ value: result.package.itemCode
+ })
+ filters.push({
+ column: "batch",
+ action: "==",
+ value: result.package.batch
+ })
+
+ filters.push({
+ column: "areaType",
+ action: "in",
+ value: this.toLocationAreaTypeList.join(',')
+ })
+
+
+ var params = {
+ filters: filters,
+ pageNo: 1,
+ pageSize: 100,
+ }
+ getBalanceByFilter(params).then(res => {
+ uni.hideLoading()
+ if (res.data.list.length > 0) {
+ this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+ } else {
+ this.queryBalance(result);
+ }
+ // callback(res.data)
+ }).catch(err => {
+ this.showErrorMessage(err.message);
+ })
+ },
- onScanResult(result) {
+ queryBalance(result) {
try {
let that = this;
// if (that.fromLocationCode == '') {
From cc1840e9135e8ebc8ce3a439b6589fdfb4a4ba77 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 9 Aug 2024 15:05:57 +0800
Subject: [PATCH 09/43] =?UTF-8?q?PDA=E9=83=A8=E5=88=86=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E4=B8=8E?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E9=87=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
=?UTF-8?q?=E7=9A=84=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/common/comMessage.vue | 19 ++++--
src/pages/customerReturn/job/returnDetail.vue | 54 +++++++++++------
.../inventoryMove/job/inventoryMoveDetail.vue | 58 ++++++++++++-------
.../package/job/overPackageJobDetail.vue | 6 +-
.../productReceipt/job/scrapReceiptDetail.vue | 48 ++++++++++-----
.../job/productRecycleJobDetail.vue | 57 ++++++++++++------
src/pages/purchaseReturn/job/returnDetail.vue | 55 ++++++++++++------
src/pages/scrap/job/scrapJobDetail.vue | 55 ++++++++++++------
src/pages/unPlanned/job/issueJobDetail.vue | 55 ++++++++++++------
9 files changed, 273 insertions(+), 134 deletions(-)
diff --git a/src/mycomponents/common/comMessage.vue b/src/mycomponents/common/comMessage.vue
index bc82cdc0..603977b7 100644
--- a/src/mycomponents/common/comMessage.vue
+++ b/src/mycomponents/common/comMessage.vue
@@ -13,7 +13,7 @@
-
+
@@ -62,7 +62,9 @@
isDisabled: true, //为 true 时，表示用户可以点击，反之则不可以
seconds: 0,
success: () => {} ,// 回调方法
- version:""
+ version:"",
+ textColor:'#000',
+ count:0
}
},
@@ -151,8 +153,9 @@
},
// 打开疑问弹框(取消+确定）
- showQuestionMessage(mContent, callback) {
- this.showSelectModal("疑问", mContent, callback);
+ showQuestionMessage(mContent,textColor, callback) {
+ // this.textColor = textColor?textColor:'#000'
+ this.showSelectModal("疑问", mContent, callback,textColor);
},
// 打开警告弹框(确定+倒计时)
@@ -246,10 +249,11 @@
},
// 初始化弹框并打开(取消+确定）
- showSelectModal(mIconType, mContent, callback) {
+ showSelectModal(mIconType, mContent, callback,textColor) {
this.showModal({
iconType: mIconType,
content: mContent,
+ textColor:textColor,
success: function(res) {
if (callback != undefined) {
if (res.confirm == true) {
@@ -396,6 +400,11 @@
this.cancelColor = '#666F83'
}
+ if (data.textColor) {
+ this.textColor = data.textColor
+ } else {
+ this.textColor = '#000'
+ }
if (data.showConfirmButton === false || data.showConfirmButton === true) {
this.showConfirmButton = data.showConfirmButton
} else {
diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 824cde5c..a550b728 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -339,25 +339,43 @@
if (!this.checkLocation()) {
return
}
-
- //扫描数量和任务数量相等，直接提交
- if (this.scanCount == this.subList.length) {
- this.submitJob();
- } else if (this.scanCount < this.subList.length) {
- //扫描数量小于任务数量，判断是否允许部分提交
- if (this.jobContent.allowPartialComplete == "TRUE") {
- //提交
- this.submitJob();
- } else {
- //不允许部分提交，提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this.subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
+ // 提交的数量和任务数量不一致提示
+ let str = ''
+ this.detailSource.forEach((item) => {
+ item.subList.forEach(cur => {
+ if (cur.qty != cur.handleQty) {
+ str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+ }
+ })
+ })
+ if (str) {
+ str += '，是否确认提交?'
+ this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+ if (res) {
+ this.submitJob()
+ }
+ });
+ } else {
+ this.submitJob()
}
+ // //扫描数量和任务数量相等，直接提交
+ // if (this.scanCount == this.subList.length) {
+ // this.submitJob();
+ // } else if (this.scanCount < this.subList.length) {
+ // //扫描数量小于任务数量，判断是否允许部分提交
+ // if (this.jobContent.allowPartialComplete == "TRUE") {
+ // //提交
+ // this.submitJob();
+ // } else {
+ // //不允许部分提交，提示
+ // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ // "]箱总共[" + this.subList.length + "]箱", res => {
+ // if (res) {
+ // this.openScanPopup();
+ // }
+ // });
+ // }
+ // }
},
submitJob() {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index 7419a85e..1ca2b273 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
@@ -354,27 +354,45 @@
this.showErrorMessage("扫描数为0,请先扫描")
return;
}
-
- //允许部分提交
- //扫描数量和任务数量相等，直接提交
- if (this.scanCount == this.subList.length) {
- this.submitJob();
- } else if (this.scanCount < this.subList.length) {
- //扫描数量小于任务数量，判断是否允许部分提交
- if (this.jobContent.allowPartialComplete == "TRUE") {
- //提交
- this.submitJob();
- } else {
- //不允许部分提交，提示
- this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
- "]箱总共[" + this
- .subList.length + "]箱", res => {
- if (res) {
- this.openScanPopup();
- }
- });
- }
+ // 提交的数量和任务数量不一致提示
+ let str = ''
+ this.detailSource.forEach((item) => {
+ item.subList.forEach(cur => {
+ if (cur.qty != cur.handleQty) {
+ str += `包装号【${cur.packingNumber}】提交数量【${cur.handleQty}】与任务物料数量【${cur.qty}】不一致`
+ }
+ })
+ })
+ if (str) {
+ str += '，是否确认提交?'
+ this.$refs.comMessage.showQuestionMessage(str, 'red', res => {
+ if (res) {
+ this.submitJob()
+ }
+ });
+ } else {
+ this.submitJob()
}
+ // //允许部分提交
+ // //扫描数量和任务数量相等，直接提交
+ // if (this.scanCount == this.subList.length) {
+ // this.submitJob();
+ // } else if (this.scanCount < this.subList.length) {
+ // //扫描数量小于任务数量，判断是否允许部分提交
+ // if (this.jobContent.allowPartialComplete == "TRUE") {
+ // //提交
+ // this.submitJob();
+ // } else {
+ // //不允许部分提交，提示
+ // this.$refs.comMessage.showErrorMessage('请完成扫描后,再进行提交
' + "已经扫描[" + this.scanCount +
+ // "]箱总共[" + this
+ // .subList.length + "]箱", res => {
+ // if (res) {
+ // this.openScanPopup();
+ // }
+ // });
+ // }
+ // }
},
submitJob() {
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 433b0635..c243f0e1 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -35,16 +35,16 @@
From e53f0f23051fb4adc722736d80affb5600d3d502 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sat, 10 Aug 2024 13:39:53 +0800
Subject: [PATCH 20/43] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E3=80=81=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1=E3=80=81=E7=BF=BB?=
=?UTF-8?q?=E5=8C=85=E4=BB=BB=E5=8A=A1=E3=80=81=E8=A3=85=E9=85=8D=E4=B8=8A?=
=?UTF-8?q?=E6=9E=B6=E3=80=81=E9=A2=84=E7=94=9F=E4=BA=A7=E4=B8=8A=E6=9E=B6?=
=?UTF-8?q?=E3=80=81=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7=E3=80=81?=
=?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=20=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=89=BF=E6=8E=A5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/config.js | 4 +-
src/mycomponents/job/jobAccept.vue | 6 +-
.../inventoryMove/coms/comMoveRecord.vue | 5 +
src/pages/issue/coms/comIssueJobCard.vue | 9 +-
src/pages/issue/job/issueJob.vue | 113 ++++++++++++----
src/pages/package/coms/comOverPackJobCard.vue | 6 +-
src/pages/package/job/overPackageJob.vue | 91 +++++++++++--
.../productPutaway/coms/comProductJobCard.vue | 10 +-
.../job/fgProductPutawayJob.vue | 25 +++-
.../productPutaway/job/productPutawayJob.vue | 121 ++++++++++-------
.../job/semiProductPutawayJob.vue | 25 +++-
.../productReceipt/coms/comProductJobCard.vue | 7 +-
.../job/fgProductReceiptJob.vue | 20 ++-
.../productReceipt/job/productReceiptJob.vue | 128 ++++++++++++------
.../productReceipt/job/scrapReceiptJob.vue | 28 +++-
.../job/semiProductReceiptJob.vue | 21 ++-
.../repleinsh/coms/comRepleinshJobCard.vue | 6 +-
src/pages/repleinsh/job/repleinshJob.vue | 118 +++++++++++-----
18 files changed, 547 insertions(+), 196 deletions(-)
diff --git a/src/common/config.js b/src/common/config.js
index 1288b666..4c8cc3c4 100644
--- a/src/common/config.js
+++ b/src/common/config.js
@@ -1,2 +1,4 @@
export const overPagePrint="overPage_print"
-export const overPageTemplate="overPage_Template"
\ No newline at end of file
+export const overPageTemplate="overPage_Template"
+//3分钟刷新
+export const planRefreshTime=3*60*1000
\ No newline at end of file
diff --git a/src/mycomponents/job/jobAccept.vue b/src/mycomponents/job/jobAccept.vue
index 2c94f345..b7b8dac2 100644
--- a/src/mycomponents/job/jobAccept.vue
+++ b/src/mycomponents/job/jobAccept.vue
@@ -1,12 +1,12 @@
-
+
- 承接人:{{dataContent.acceptUserName}}
+ 承接人: {{dataContent.acceptUserName}}
- 承接时间:{{formatDate(dataContent.acceptTime)}}
+ 承接时间 : {{formatDate(dataContent.acceptTime)}}
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 0ed15f92..23f313b0 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -341,6 +341,11 @@
this.showErrorMessage("请先选择目标库位")
return;
}
+ if(this.fromLocationCode==this.toLocationCode){
+ this.showErrorMessage("来源库位和目标库位不能一致")
+ return;
+ }
+
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
//查询管理模式
uni.showLoading({
diff --git a/src/pages/issue/coms/comIssueJobCard.vue b/src/pages/issue/coms/comIssueJobCard.vue
index 92157886..1cd8438e 100644
--- a/src/pages/issue/coms/comIssueJobCard.vue
+++ b/src/pages/issue/coms/comIssueJobCard.vue
@@ -1,6 +1,8 @@
+
+
@@ -9,16 +11,21 @@
+
+
+
diff --git a/src/pages/productPutaway/coms/comProductJobCard.vue b/src/pages/productPutaway/coms/comProductJobCard.vue
index d8a43bf2..31e6d155 100644
--- a/src/pages/productPutaway/coms/comProductJobCard.vue
+++ b/src/pages/productPutaway/coms/comProductJobCard.vue
@@ -1,16 +1,20 @@
-
+
+
+
diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue
index 2d91d17b..9c2d2319 100644
--- a/src/pages/package/job/overPackageJobDetail.vue
+++ b/src/pages/package/job/overPackageJobDetail.vue
@@ -58,7 +58,7 @@
-
+
@@ -128,6 +128,7 @@
detailOptions: [],
scanOptions: [],
jobStatus: "",
+ scanMessage: ''
// printDeafult: {}, //默认打印机
// templateDeafult: {} //默认的模板
@@ -143,6 +144,7 @@
title: option.title + '详情'
})
this.id = option.id;
+ this.scanMessage = option.scanMessage || '';
if (this.id != undefined) {
//新建的任务自动接收
if (option.status == "1") {
@@ -229,6 +231,9 @@
that.jobStatus = res.data.status
that.subList = res.data.subList;
that.detailSource = getDataSource(that.detailSource, that.subList)
+ if (this.scanMessage) {
+ this.openScanPopupSimulate(this.scanMessage);
+ }
// this.$nextTick(() => {
// if (uni.getStorageSync('overPackageJobDetailPointParams')) {
// const overPackageJobDetailPointParams = uni.getStorageSync(
@@ -255,6 +260,9 @@
this.showErrorMessage(error)
})
},
+ openScanPopupSimulate(scanMessage) {
+ this.$refs.comScanPackagePack.openScanPopupForJobSimulate(this.detailSource, this.jobContent, scanMessage);
+ },
closeScan() {
this.resizeCollapse();
From 77ffbfaa8729fb1e38f08cd766fd0fca600287b1 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 11 Aug 2024 18:01:24 +0800
Subject: [PATCH 26/43] =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/manifest.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/manifest.json b/src/manifest.json
index 6a45e3e6..a5f98d04 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,10 +1,10 @@
{
"name" : "wms",
"package" : "uni.UNI43932FE",
- "appid" : "__UNI__C9CF4BF",
+ "appid" : "__UNI__F36DDCF",
"description" : "",
- "versionName" : "1.0.52",
- "versionCode" : 52,
+ "versionName" : "1.0.53",
+ "versionCode" : 53,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
From 01063ee217d37f822c4cbf6d5e0ca67fb917e420 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 11 Aug 2024 19:10:39 +0800
Subject: [PATCH 27/43] =?UTF-8?q?=E8=A1=A5=E6=96=99=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0onUnLoad?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/repleinsh/job/repleinshJob.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 1a820cf9..d0c1605f 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -125,7 +125,9 @@
onHide() {
this.stopRefresh();
},
-
+ onUnload(){
+ this.stopRefresh();
+ },
onReady() {
this.detailOptions = getDetailOption();
this.detailGiveupOptions = getDetailGiveupOption();
From 89d63b84aaab0f86bd5d83aa6d139379682e1aaf Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sun, 11 Aug 2024 19:11:13 +0800
Subject: [PATCH 28/43] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/manifest.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/manifest.json b/src/manifest.json
index a5f98d04..fedfa8f9 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
"package" : "uni.UNI43932FE",
"appid" : "__UNI__F36DDCF",
"description" : "",
- "versionName" : "1.0.53",
- "versionCode" : 53,
+ "versionName" : "1.0.54",
+ "versionCode" : 54,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
From bf836b13f5a0b99dc5138032e1071016668c8393 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Sun, 11 Aug 2024 19:28:18 +0800
Subject: [PATCH 29/43] =?UTF-8?q?=E5=8F=91=E6=96=99=E6=8E=A5=E6=94=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../job/productionReceiptJob.vue | 68 ++++++++++++++++---
1 file changed, 58 insertions(+), 10 deletions(-)
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index 5bc91f36..c529f434 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -4,7 +4,10 @@
+ :productionline="productionLineList"
+ :isShowItemCode="true"
+ :isShowQurery='true'
+ @onQuery="getListByFilter">
@@ -84,7 +87,8 @@
title: '',
scanMessage: "",
productionLineList: [],
- productionLine: ""
+ productionLine: "",
+ filterItemCode:""
};
},
onLoad(option) {
@@ -93,7 +97,7 @@
},
onShow() {
- this.getList('refresh', this.productionLine);
+ this.getList('refresh', this.productionLine,this.filterItemCode)
},
onReady() {
@@ -106,11 +110,11 @@
if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
return;
}
- this.getList("more", this.productionLine);
+ this.getList('more', this.productionLine,this.filterItemCode)
},
onPullDownRefresh() {
- this.getList('refresh', this.productionLine);
+ this.getList('refresh', this.productionLine,this.filterItemCode)
},
//后退按钮
@@ -135,7 +139,7 @@
methods: {
productionLineCode(productionLineCode) {
this.productionLine = productionLineCode
- this.getList('refresh', this.productionLine)
+ this.getList('refresh', this.productionLine,this.filterItemCode)
},
getProductionReceiptJobByProductionline() {
getProductionReceiptJobByProductionline().then(res => {
@@ -153,7 +157,7 @@
}
})
},
- getList(type, productionLine = '') {
+ getList(type, productionLine = '',filterItemCode="") {
let that = this;
uni.showLoading({
title: "加载中....",
@@ -194,6 +198,15 @@
value: productionLine
})
}
+
+ if(filterItemCode){
+ // 物料代码
+ filters.push({
+ column: "itemCode",
+ action: "like",
+ value: filterItemCode
+ })
+ }
var params = {
filters: filters,
@@ -266,7 +279,7 @@
cancleJob(id) {
cancleTakeProductionReceiptJob(id).then(res => {
if (res.data) {
- this.getList("refresh", this.productionLine)
+ this.getList('refresh', this.productionLine,this.filterItemCode)
uni.showToast({
title: "放弃任务成功"
})
@@ -281,13 +294,13 @@
switchChangeToday(state, creationTime) {
this.checkedToday = state;
this.todayTime = creationTime;
- this.getList("refresh", this.productionLine);
+ this.getList('refresh', this.productionLine,this.filterItemCode)
},
switchChangeWait(state, jobStatus) {
this.checkedWaitTask = state;
this.status = jobStatus;
- this.getList("refresh"), this.productionLine;
+ this.getList('refresh', this.productionLine,this.filterItemCode)
},
getScanNumber(code) {
this.getDataListByType(code)
@@ -405,6 +418,41 @@
this.showMessage(e.message)
}
},
+
+ getListByFilter(params) {
+ console.log('getListByFilter',params)
+ let that = this;
+ var filters = []
+ if (this.checkedToday) {
+ filters.push({
+ column: "create_time",
+ action: "betweeen",
+ value: this.todayTime
+ })
+ }
+
+ filters.push({
+ column: "status",
+ action: "in",
+ value: this.status
+ })
+
+
+ if (params.productionLineCode) {
+ // 生产线
+ this.productionLine = params.productionLineCode
+ }else{
+ this.productionLine = ''
+ }
+ if (params.itemCode) {
+ // 物料代码
+ this.filterItemCode = params.itemCode
+ }else{
+ this.filterItemCode = ''
+ }
+
+ this.getList('refresh', this.productionLine, this.filterItemCode)
+ },
}
}
From edd078a40ff4906aebca6fb02ce9ab62462cce96 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Mon, 12 Aug 2024 08:48:58 +0800
Subject: [PATCH 30/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E7=BD=91?=
=?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/httpRequest3.js | 130 ++++++++++++++++++++++----------------
src/pages/login/index.vue | 4 +-
2 files changed, 79 insertions(+), 55 deletions(-)
diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 0b362130..30c879c4 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -1,10 +1,10 @@
-
import storage from '../common/utils/storage'
import {
removeToken
} from '@/common/utils/auth'
-
+
function service(options = {}) {
+
var token = storage.getStorage(storage.constant.token)
var tenantId = storage.getStorage('tenantId')
// if(getApp()!=undefined){
@@ -16,63 +16,85 @@ function service(options = {}) {
// }
var requestUrl = ""
requestUrl = import.meta.env.VITE_BASE_URL
-
+
options.header = {
"content-type": "application/json",
- "Authorization": "Bearer "+token,
- "dataType":"json",
- "dataSource":"PDA",
- "tenant-id":tenantId
+ "Authorization": "Bearer " + token,
+ "dataType": "json",
+ "dataSource": "PDA",
+ "tenant-id": tenantId
};
options.timeout = 300000
-
- options.url = requestUrl+options.url
-
+
+ options.url = requestUrl + options.url
+
return new Promise((resolve, reject) => {
- options.success = (res) => {
- if (res ) {
- if(res.statusCode == 200){
- if(res.data.code==0){
- resolve(res.data);
- }else {
- if(res.data.code==401){
- uni.clearStorageSync()
- uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
- removeToken();
- uni.reLaunch({
- url: '/pages/login/index'
- })
- }
- reject("系统异常:"+res.data.msg)
- console.log("系统异常",res.data.msg)
- }
-
- }else {
- reject("系统异常:"+ res.data.msg)
- console.log("系统异常",res.data.msg)
- }
-
+ options.success = (res) => {
+ if (res) {
+ if (res.statusCode == 200) {
+ if (res.data.code == 0) {
+ resolve(res.data);
} else {
- reject("系统异常:"+res.data.msg)
- console.log("系统异常",res.data.msg)
- }
- };
- options.fail = (error) => {
- var message = error.errMsg
- if (message === 'Network Error') {
- message = '接口连接异常'
- } else if (message.includes('timeout')) {
- message = '接口请求超时'
- } else if (message.includes('Request failed with status code')) {
- message = '接口' + message.substr(message.length - 3) + '异常'
+ if (res.data.code == 401) {
+ uni.clearStorageSync()
+ uni.removeStorageSync('overPackageRecord') // 删除直接翻包中缓存的来源库位
+ removeToken();
+ uni.reLaunch({
+ url: '/pages/login/index'
+ })
+ }
+ reject("系统异常:" + res.data.msg)
+ console.log("系统异常", res.data.msg)
}
- reject("系统异常:"+message);
- console.log("系统异常",message)
- };
- uni.request(options);
- });
- }
-
-
- export default service;
+ } else {
+ reject("系统异常:" + res.data.msg)
+ console.log("系统异常", res.data.msg)
+ }
+
+ } else {
+ reject("系统异常:" + res.data.msg)
+ console.log("系统异常", res.data.msg)
+ }
+ };
+ options.fail = (error) => {
+ var message = error.errMsg
+ if (message === 'Network Error') {
+ message = '接口连接异常'
+ } else if (message.includes('timeout')) {
+ message = '接口请求超时'
+ } else if (message.includes('Request failed with status code')) {
+ message = '接口' + message.substr(message.length - 3) + '异常'
+ }
+ reject("系统异常:" + message);
+ console.log("系统异常", message)
+ };
+ // #ifdef APP
+ uni.getNetworkType({
+ success: function(res) {
+ const networkType = res.networkType;
+ console.log("网络类型", networkType)
+ if (networkType == "none") {
+ reject("当前无网络");
+ } else {
+ uni.request(options);
+ }
+ }
+ })
+ // #endif
+ // #ifdef H5
+ console.log("网s络H5", navigator.onLine)
+ if(navigator.onLine){
+ uni.request(options);
+ }else {
+ reject("当前无网络");
+ }
+ // #endif
+
+
+ });
+}
+
+
+
+export default service;
\ No newline at end of file
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 20a86f20..46030461 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -261,7 +261,9 @@
this.imageSrc = base64.replace(/[\r\n]/g, "")
this.uuid = res.data.uuid
}
- })
+ }).catch(error => {
+ this.showErrorMessage(error);
+ })
},
getAppVersion() {
const systemInfo = uni.getSystemInfoSync();
From c1952deaf11cc9b7a3b412c5705487cdd61d05e5 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Mon, 12 Aug 2024 08:57:03 +0800
Subject: [PATCH 31/43] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/manifest.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/manifest.json b/src/manifest.json
index fedfa8f9..7a1fc122 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,10 +1,10 @@
{
"name" : "wms",
"package" : "uni.UNI43932FE",
- "appid" : "__UNI__F36DDCF",
+ "appid" : "__UNI__C9CF4BF",
"description" : "",
- "versionName" : "1.0.54",
- "versionCode" : 54,
+ "versionName" : "1.0.55",
+ "versionCode" : 55,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
From 16fa4a251681079fe53500f5d1d16f49005ebeda Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Mon, 12 Aug 2024 09:56:51 +0800
Subject: [PATCH 32/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8C=85=E8=A3=85=E5=8F=B7=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/inventoryMove/coms/comMoveRecord.vue | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 09a271e2..a0da6804 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -49,6 +49,10 @@
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+
+ import {
+ getInventoryStatusName
+ } from '@/common/directory.js';
import {
inventoryMoveRecordSubmit,
getBasicLocationByCode,
@@ -278,11 +282,18 @@
} else {
newDetail.toInventoryStatus = this.toInventoryStatus;
}
+
+ if (newDetail.packingNumber == '') {
+ newDetail.packingNumber = pack.number;
+ }
newDetail.toLocationCode = this.toLocationCode;
newDetail.fromLocationCode = result.fromLocationCode
item.subList.push(newDetail);
} else {
- this.showErrorMessage(detail.packingNumber + "重复扫描")
+ this.showErrorMessage("包装["+detail.packingNumber+"]\n"+
+ "批次["+detail.batch+"]\n"+"库位["+detail.fromLocationCode+"]\n"+
+ "库存状态["+getInventoryStatusName(detail.toInventoryStatus)+"]\n"
+ + "重复扫描")
}
}
calcHandleQty(this.detailSource);
From ab395f1498ab7ce9d59ce94da2a1c1f5c40b87dc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 12 Aug 2024 10:14:15 +0800
Subject: [PATCH 33/43] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=BA=93=E5=8C=BA=E5=92=8C?=
=?UTF-8?q?=E5=88=B0=E5=BA=93=E5=8C=BA=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mycomponents/job/jobFilter.vue | 32 +++++++++++++++
src/pages/issue/job/issueJob.vue | 66 ++++++++++++++++++++++++------
2 files changed, 85 insertions(+), 13 deletions(-)
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 0da05f0f..4dcd4b84 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -46,6 +46,22 @@
+
+
+ 来源库区
+
+
+
+
+
+ 到库区
+
+
+
-
+
@@ -73,10 +77,10 @@
type: Boolean,
default: true
},
- boxFocus: {
- type: Boolean,
- default: true
- },
+ // boxFocus: {
+ // type: Boolean,
+ // default: true
+ // },
isShowHistory: {
type: Boolean,
default: true
@@ -100,41 +104,7 @@
}
},
mounted() {
- this.boxfocus =true;
- // uni.hideKeyboard();
-
- // #ifdef H5
- // if (document.querySelector('textarea') != null) {
- // document.querySelector('textarea').setAttribute('inputmode', 'none')
- // }
- // #endif
- // this.hide()
- // #ifdef APP-PLUS
- //
- // this.hide()
- // uni.onKeyboardHeightChange(res => {
- // console.log(res.height)
- // if(res.height>0){
- // // uni.hideKeyboard();
- // plus.key.hideSoftKeybord();
- // }
- // })
- //
- // uni.onWindowResize((res) => {
- // plus.key.hideSoftKeybord()
- // })
- // plus.key.hideSoftKeybord();
- // setInterval(function(){
- // plus.key.hideSoftKeybord();
- // // uni.hideKeyboard();//隐藏软键盘
- // // plus.key.hideSoftKeybord();
- // },60);
- // #endif
-
- // if (this.$el.querySelector('textarea') != null) {
- // this.$el.querySelector('textarea').setAttribute('inputmode', 'none')
- // }
},
watch: {
placeholder() {
@@ -169,6 +139,7 @@
},
clearScanValue() {
this.scanMsg = ''
+ this.cursorIndex =0
this.getfocus();
},
clickScanMsg() {
@@ -186,10 +157,10 @@
if (index >= 0) {
// that.scanMsg = 'HPQ;V1.0;ICE115F11161AG;PP20230427000027;B20230427002;Q50';
setTimeout(() => {
- that.losefocus();
+ that.losefocus();
let content = uni.$u.trim(that.scanMsg)
if (content == "") {
- that.getfocus();
+ // that.getfocus();
this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
if (res) {
that.scanMsg = ""
@@ -212,6 +183,7 @@
that.$emit("getResult", scanResult);
} else {
that.clear();
+ that.losefocus();
this.$refs.comMessage.showErrorMessage(scanResult.message, res => {
if (res) {
that.getfocus();
@@ -222,20 +194,25 @@
}, 500);
}
},
+
+ handleFocus(){
+ },
+
+ handleBlur(){
+ // setTimeout(res=>{
+ // uni.hideKeyboard();
+ // },200)
+ },
getfocus() {
let that = this;
this.$nextTick(r => {
- console.log("获取焦点")
that.boxfocus = true;
});
- // this.hide()
},
losefocus() {
let that = this;
this.$nextTick(r => {
- console.log("失去焦点")
that.boxfocus = false;
- uni.hideKeyboard();
});
},
clear() {
@@ -289,7 +266,7 @@
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index eeb54da6..148baaf9 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -118,6 +118,9 @@
this.toLocationAreaTypeList = getDirectoryItemArray(businessType.inAreaTypes)
this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
this.$refs.popup.open('bottom')
+ setTimeout(res=>{
+ this.getfocus()
+ },500)
},
getScanResult(result) {
diff --git a/src/mycomponents/scan/winComScanBalanceLocation.vue b/src/mycomponents/scan/winComScanBalanceLocation.vue
index 188bd60e..0dfdc271 100644
--- a/src/mycomponents/scan/winComScanBalanceLocation.vue
+++ b/src/mycomponents/scan/winComScanBalanceLocation.vue
@@ -145,28 +145,31 @@
this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes)
this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
this.$refs.popup.open('bottom')
+ setTimeout(res=>{
+ this.packGetFocus()
+ },500)
},
openScanPopupForJob(fromLocationCode, fromLocationList, jobContent){
this.fromLocationCode = fromLocationCode;
this.fromLocationList = fromLocationList;
- if (fromLocationCode != '') {
- this.packGetFocus();
- } else {
- if (this.fromLocationList.length == 0) {
- this.locationGetFocus();
- } else {
- this.fromLocationCode = this.fromLocationList[0];
- }
- }
-
- setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 500)
this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+ this.$refs.popup.open('bottom')
+ setTimeout(res => {
+ if (this.fromLocationCode != '') {
+ this.packGetFocus();
+ } else {
+ if (this.fromLocationList.length == 0) {
+ this.locationGetFocus();
+ } else {
+ this.fromLocationCode = this.fromLocationList[0];
+ this.packGetFocus();
+ }
+ }
+ }, 500)
},
//模拟扫描
@@ -294,6 +297,7 @@
})
},
showErrorMessage(message) {
+ this.packLoseFocus();
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
if(this.$refs.comscan){
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index 531c5a36..b8772969 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -6,12 +6,14 @@
+ style="margin-left: 5px;width: 90%;"
+ :focus="boxfocus" :placeholder="placeholderValue"
+ @focus="handleFocus"
+ @input="handelScanMsg" :cursor="cursorIndex">
-
+
@@ -103,13 +105,11 @@
}
},
mounted() {
- this.boxfocus = true;
- // uni.hideKeyboard();
// #ifdef H5
- if (document.querySelector('textarea') != null) {
- document.querySelector('textarea').setAttribute('inputmode', 'none')
- }
+ // if (document.querySelector('textarea') != null) {
+ // document.querySelector('textarea').setAttribute('inputmode', 'none')
+ // }
// #endif
// this.hide()
// #ifdef APP-PLUS
@@ -125,20 +125,6 @@
this.placeholderValue = '请扫描' + this.placeholder;
},
methods: {
-
- hide() {
- // #ifdef APP-PLUS
- // 只是解决软键盘的闪现
- var interval = setInterval(function() {
- uni.hideKeyboard(); //隐藏软键盘
- console.log('刷新')
- }, 5);
- setTimeout(() => {
- clearInterval(interval);
- console.log('停止刷新')
- }, 1000);
- // #endif
- },
setItemCodeSimulate(itemCode, scanMsg) {
this.itemCode = itemCode;
this.scanMsg = scanMsg;
@@ -154,6 +140,7 @@
this.scanMsg = val
},
clearScanValue() {
+ this.cursorIndex=0,
this.scanMsg = ''
this.getfocus();
},
@@ -171,7 +158,6 @@
let content = uni.$u.trim(that.scanMsg)
// let content = that.scanMsg;
if (content == "") {
- that.getfocus();
this.$refs.comMessage.showErrorMessage("扫描内容为空,请重新扫描", res => {
if (res) {
that.scanMsg = ""
@@ -235,6 +221,7 @@
that.$emit("getResult", scanResult);
}
} catch (error) {
+ that.losefocus();
this.$refs.comMessage.showErrorMessage(error.message, res => {
if (res) {
that.getfocus();
@@ -243,6 +230,7 @@
}
}).catch(error => {
+ that.losefocus();
this.$refs.comMessage.showErrorMessage(error, res => {
if (res) {
that.scanMsg = ""
@@ -268,6 +256,11 @@
that.boxfocus = false;
});
},
+ // handleBlur(){
+ // setTimeout(res=>{
+ // uni.hideKeyboard();
+ // },200)
+ // },
clear() {
this.cursorIndex = 0;
this.scanMsg = ''
diff --git a/src/mycomponents/scan/winScanAsnNumber.vue b/src/mycomponents/scan/winScanAsnNumber.vue
index 100a1c68..02ac8ca5 100644
--- a/src/mycomponents/scan/winScanAsnNumber.vue
+++ b/src/mycomponents/scan/winScanAsnNumber.vue
@@ -55,8 +55,9 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus('bottom')
}, 500)
},
closeScanPopup() {
diff --git a/src/mycomponents/scan/winScanContainer.vue b/src/mycomponents/scan/winScanContainer.vue
index d7323344..5ec28c5c 100644
--- a/src/mycomponents/scan/winScanContainer.vue
+++ b/src/mycomponents/scan/winScanContainer.vue
@@ -54,8 +54,9 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
closeScanPopup() {
diff --git a/src/mycomponents/scan/winScanFgLabel.vue b/src/mycomponents/scan/winScanFgLabel.vue
index 552d3b0e..8d953201 100644
--- a/src/mycomponents/scan/winScanFgLabel.vue
+++ b/src/mycomponents/scan/winScanFgLabel.vue
@@ -60,13 +60,13 @@
this.$refs.comscansimulate.clickScanMsg();
},
openScanPopup(itemCode) {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
setTimeout(re=>{
this.$refs.comscan.setItemCode(itemCode)
},500)
-
- }, 200)
+ this.getfocus()
+ }, 500)
},
closeScanPopup() {
@@ -91,13 +91,13 @@
},
getfocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan ) {
this.$refs.comscan.getfocus();
}
},
losefocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan ) {
this.$refs.comscan.losefocus();
}
},
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index aee8b8d7..9b2a6abd 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -76,8 +76,10 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
+ var that =this;
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ that.getfocus()
}, 500)
},
closeScanPopup() {
diff --git a/src/mycomponents/scan/winScanJobNumber.vue b/src/mycomponents/scan/winScanJobNumber.vue
index e12dfbfe..5f7355f2 100644
--- a/src/mycomponents/scan/winScanJobNumber.vue
+++ b/src/mycomponents/scan/winScanJobNumber.vue
@@ -61,8 +61,9 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
closeScanPopup() {
@@ -72,7 +73,7 @@
this.$refs.popup.close()
},
getfocus() {
- if (this.isShow) {
+ if (this.$refs.scan) {
this.$refs.scan.getfocus()
}
},
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 70f3aeea..0f4c0144 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -65,8 +65,9 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
openScanPopupSimulate(location) {
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 4fa855f5..7da05b49 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -70,9 +70,10 @@
})
},
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 200)
+ this.getfocus()
+ }, 500)
},
closeScanPopup() {
@@ -103,13 +104,13 @@
},
getfocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus();
}
},
losefocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
diff --git a/src/mycomponents/scan/winScanPackAndCont.vue b/src/mycomponents/scan/winScanPackAndCont.vue
index e71b2eaf..01941270 100644
--- a/src/mycomponents/scan/winScanPackAndCont.vue
+++ b/src/mycomponents/scan/winScanPackAndCont.vue
@@ -61,8 +61,9 @@
},
methods: {
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index 91c712b1..e958c8d4 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -152,43 +152,44 @@
},
//直接扫描
openScanPopupForType(fromLocationCode, businessType) {
-
this.businessType = businessType;
this.fromLocationCode = fromLocationCode;
- if (fromLocationCode != '') {
- this.packGetFocus();
- } else {
- this.locationGetFocus();
- }
+
this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
this.fromLocationAreaTypeList = getDirectoryItemArray(this.businessType.outAreaTypes); //出库库区
- if (!this.show) {
- setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 500)
- }
+ this.$refs.popup.open('bottom')
+ setTimeout(res => {
+ if (fromLocationCode != '') {
+ this.packGetFocus();
+ } else {
+ this.locationGetFocus();
+ }
+ }, 500)
},
//在任务中扫描
openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
this.fromLocationCode = fromLocationCode;
this.fromLocationList = fromLocationList;
- if (fromLocationCode != '') {
- this.packGetFocus();
- } else {
- if (this.fromLocationList.length == 0) {
- this.locationGetFocus();
- } else {
- this.fromLocationCode = this.fromLocationList[0];
- }
- }
- setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 500)
this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
this.fromLocationAreaTypeList = getDirectoryItemArray(jobContent.fromAreaTypes); //出库库存状态
+ this.$refs.popup.open('bottom')
+
+ setTimeout(res => {
+ if (this.fromLocationCode != '') {
+ this.packGetFocus();
+ } else {
+ if (this.fromLocationList.length == 0) {
+ this.locationGetFocus();
+ } else {
+ this.fromLocationCode = this.fromLocationList[0];
+ this.packGetFocus();
+ }
+ }
+ }, 500)
+
},
//模拟扫描
openScanPopupForJobSimulate(fromLocationCode, fromLocationList, jobContent, scanMessage) {
@@ -417,7 +418,7 @@
balance: datas,
fromLocationCode: this.fromLocationCode,
}
- this.packGetFocus();
+ // this.packGetFocus();
this.$emit("getResult", data);
this.$emit("getCountScanResult", data);
},
@@ -433,18 +434,18 @@
balance: item,
fromLocationCode: this.fromLocationCode,
}
- this.packGetFocus();
+ // this.packGetFocus();
this.$emit("getResult", data);
},
packGetFocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus();
}
},
packLoseFocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
diff --git a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
index f43c2bb1..c1f8c477 100644
--- a/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
+++ b/src/mycomponents/scan/winScanPackAndLocationNoBalance.vue
@@ -131,16 +131,16 @@
openScanPopupForType(fromLocationCode, businessType) {
this.businessType = businessType;
this.fromLocationCode = fromLocationCode;
- if (fromLocationCode != '') {
- this.packGetFocus();
- } else {
- this.locationGetFocus();
- }
this.fromInventoryStatuses = getDirectoryItemArray(this.businessType.outInventoryStatuses)
this.inventoryStatus = getDirectoryItemArray(this.businessType.outInventoryStatuses); //出库库存状态
this.fromLocationTypeArray = getDirectoryItemArray(this.businessType.outLocationTypes); //出库库存状态
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ if (fromLocationCode != '') {
+ this.packGetFocus();
+ } else {
+ this.locationGetFocus();
+ }
}, 500)
},
@@ -148,21 +148,23 @@
openScanPopupForJob(fromLocationCode, fromLocationList, jobContent) {
this.fromLocationCode = fromLocationCode;
this.fromLocationList = fromLocationList;
- if (fromLocationCode != '') {
- this.packGetFocus();
- } else {
- if (this.fromLocationList.length == 0) {
- this.locationGetFocus();
- } else {
- this.fromLocationCode = this.fromLocationList[0];
- }
- }
- setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 500)
+
this.fromInventoryStatuses = getDirectoryItemArray(jobContent.outInventoryStatuses)
this.inventoryStatus = getDirectoryItemArray(jobContent.outInventoryStatuses); //出库库存状态; //出库库存状态
this.fromLocationTypeArray = getDirectoryItemArray(jobContent.fromLocationTypes); //出库库存状态
+ this.$refs.popup.open('bottom')
+ setTimeout(res => {
+ if (fromLocationCode != '') {
+ this.packGetFocus();
+ } else {
+ if (this.fromLocationList.length == 0) {
+ this.locationGetFocus();
+ } else {
+ this.fromLocationCode = this.fromLocationList[0];
+ this.packGetFocus();
+ }
+ }
+ }, 500)
},
closeScanPopup(content) {
diff --git a/src/mycomponents/scan/winScanPackAndPosition.vue b/src/mycomponents/scan/winScanPackAndPosition.vue
index 1ee6edc6..266ba324 100644
--- a/src/mycomponents/scan/winScanPackAndPosition.vue
+++ b/src/mycomponents/scan/winScanPackAndPosition.vue
@@ -105,23 +105,23 @@
this.showErrorMessage(error)
})
}
-
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
-
- initData(){
+
+ initData() {
this.positionInfo = "请选择位置";
this.positionList = [];
this.productionLineCode = '';
this.rawLocationCode = "";
this.fgLocationCode = "";
this.workshopCode = "";
- this.workStationCode ="";
+ this.workStationCode = "";
this.workShopName = "";
- this.productionLineName="";
- this.workStationName="";
+ this.productionLineName = "";
+ this.workStationName = "";
this.show = false;
this.isEditPosition = true
},
@@ -223,4 +223,4 @@
height: auto;
max-height: 300rpx;
}
-
+
\ No newline at end of file
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
index eb53f519..c9db3744 100644
--- a/src/mycomponents/scan/winScanPackJob.vue
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -71,6 +71,9 @@
// 弹出
openScanPopup(){
this.$refs.popup.open('bottom')
+ setTimeout(res=>{
+ this.packGetFocus()
+ },500)
},
// 关闭
closeScanPopup(content) {
@@ -83,13 +86,13 @@
this.$emit("getResult", result);
},
packGetFocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus();
}
},
packLoseFocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
diff --git a/src/mycomponents/scan/winScanPackLevel.vue b/src/mycomponents/scan/winScanPackLevel.vue
index 6c78f008..07dd2bcd 100644
--- a/src/mycomponents/scan/winScanPackLevel.vue
+++ b/src/mycomponents/scan/winScanPackLevel.vue
@@ -96,9 +96,10 @@
})
},
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 200)
+ this.getfocus();
+ }, 500)
},
closeScanPopup() {
@@ -130,13 +131,13 @@
},
getfocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus();
}
},
losefocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index ffb26638..e751e5f4 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -67,18 +67,19 @@
this.$refs.comscansimulate.clickScanMsg();
},
openScanPopup() {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
- }, 200)
+ this.getfocus()
+ }, 500)
},
openScanPopupByBusinessType(businessType) {
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
this.businessType = businessType;
-
- }, 200)
+ }, 500)
},
@@ -223,13 +224,13 @@
},
getfocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.getfocus();
}
},
losefocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan ) {
this.$refs.comscan.losefocus();
}
},
@@ -240,9 +241,10 @@
this.show = e.show
},
showErrorMessage(message) {
+ this.losefocus()
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ this.getfocus();
}
});
},
diff --git a/src/pages.json b/src/pages.json
index 265152ee..b697869a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -2297,7 +2297,8 @@
// "fontSize": "58rpx"
// }]
// },
- "softinputMode": "adjustPan" //adjustResize
+ //手机软键盘升起不让其将页面头部上推
+ "softinputMode": "adjustResize" //adjustResize
},
"tabBar": {
"color": "#000000",
diff --git a/src/pages/count/job/fuzzyCountDetail.vue b/src/pages/count/job/fuzzyCountDetail.vue
index addbf80e..ad1a4642 100644
--- a/src/pages/count/job/fuzzyCountDetail.vue
+++ b/src/pages/count/job/fuzzyCountDetail.vue
@@ -433,10 +433,12 @@
},
remove(item, index) {
+ this.scanPopupLoseFocus();
this.showQuestionMessage("是否要移除扫描信息?", res => {
if (res) {
this.detailSource.splice(index, 1)
}
+ this.scanPopupGetFocus();
});
},
@@ -489,6 +491,7 @@
showMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.afterCloseMessage()
@@ -496,6 +499,7 @@
});
},
showErrorMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.afterCloseMessage()
diff --git a/src/pages/deliver/coms/comScanDeliverPack.vue b/src/pages/deliver/coms/comScanDeliverPack.vue
index 5592f322..27c5ce1c 100644
--- a/src/pages/deliver/coms/comScanDeliverPack.vue
+++ b/src/pages/deliver/coms/comScanDeliverPack.vue
@@ -184,8 +184,9 @@
this.initData();
this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
"-" + this.jobContent.subList[0].workStationCode
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus();
}, 500)
},
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index a0da6804..8c38f935 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -300,6 +300,9 @@
},
showErrorMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index 3f266f6b..67204f8a 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -213,8 +213,9 @@
this.initData();
// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
// "-" + this.jobContent.subList[0].workStationCode
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus();
}, 500)
},
@@ -315,7 +316,10 @@
"状态 [" + status + "] \n" +
"库区 [" + areaType + "] \n" +
"未查找到库存余额"
- this.showErrorMessage(hint)
+ this.showErrorMessage(hint,
+ res => {
+ that.getfocus();
+ })
} else if (res.data.length == 1) {
result.balance = res.data[0]
@@ -332,11 +336,16 @@
uni.hideLoading()
}).catch(error => {
uni.hideLoading()
- this.showErrorMessage(error)
+ this.showErrorMessage(error,
+ res => {
+ that.getfocus();
+ })
})
}
} catch (e) {
- this.showErrorMessage(e.stack)
+ this.showErrorMessage(e.stack,res => {
+ that.getfocus();
+ })
uni.hideLoading();
}
},
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 541e4808..2bfd64cd 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -481,6 +481,8 @@
'】不一致，是否继续提交', res => {
if (res) {
this.submit();
+ }else {
+ this.scanPopupGetFocus()
}
});
}
@@ -489,8 +491,8 @@
},
scanPopupGetFocus() {
- if (this.$refs.scanPopup != undefined) {
- this.$refs.scanPopup.getfocus();
+ if (this.$refs.comScanIssuePack) {
+ this.$refs.comScanIssuePack.getfocus();
}
},
diff --git a/src/pages/issue/record/directIssue.vue b/src/pages/issue/record/directIssue.vue
index 2a784cbe..7d44bfd7 100644
--- a/src/pages/issue/record/directIssue.vue
+++ b/src/pages/issue/record/directIssue.vue
@@ -256,8 +256,13 @@
},
showErrorMessage(message) {
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.losefocus();
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
- if (res) {}
+ if (res) {
+ this.scanPopupGetFocus()
+ }
});
},
diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue
index 33ad2b6c..d0b0d057 100644
--- a/src/pages/issue/request/issueScanRequest.vue
+++ b/src/pages/issue/request/issueScanRequest.vue
@@ -151,6 +151,9 @@
this.$refs.scanPopup.closeScanPopup();
},
showErrorMessage(message) {
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.losefocus();
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.scanPopupGetFocus()
@@ -158,7 +161,7 @@
});
},
scanPopupGetFocus() {
- if (this.$refs.scanPopup != undefined) {
+ if (this.$refs.scanPopup) {
this.$refs.scanPopup.getfocus();
}
},
diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index d6b8b098..34278165 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -171,6 +171,7 @@ import { getDirectoryItemArray } from '@/common/directory';
let lot = result.label.batch;
let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
if (item == undefined) {
+ this.packLoseFocus()
that.showErrorMessage('未查找到物料【' + itemCode + '】的翻包明细',
res => {
that.packGetFocus();
diff --git a/src/pages/productPutaway/job/productPutawayJob.vue b/src/pages/productPutaway/job/productPutawayJob.vue
index b901b688..25541856 100644
--- a/src/pages/productPutaway/job/productPutawayJob.vue
+++ b/src/pages/productPutaway/job/productPutawayJob.vue
@@ -357,8 +357,14 @@
},
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
}
});
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index bb40a81b..1c98771d 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -232,7 +232,10 @@
},
showErrorMessage(message) {
- this.$refs.comMessage.showErrorMessage(message, res => {});
+ this.scanPopupLoseFocus();
+ this.$refs.comMessage.showErrorMessage(message, res => {
+ this.scanPopupGetFocus();
+ });
},
calcHandleQty() {
calcHandleQty(this.detailSource);
@@ -274,6 +277,12 @@
this.$refs.scanPopup.getfocus();
}
},
+
+ scanPopupLoseFocus() {
+ if (this.$refs.scanPopup != undefined) {
+ this.$refs.scanPopup.losefocus();
+ }
+ },
scanLocationCode(location, code) {
this.toLocationCode = code
diff --git a/src/pages/productReceipt/job/ccProductReceiptJob.vue b/src/pages/productReceipt/job/ccProductReceiptJob.vue
index e79c2565..a9e11e68 100644
--- a/src/pages/productReceipt/job/ccProductReceiptJob.vue
+++ b/src/pages/productReceipt/job/ccProductReceiptJob.vue
@@ -322,9 +322,14 @@
},
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
}
});
},
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 3bf276b4..baf01cda 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -312,9 +312,14 @@
},
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
}
});
},
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index a6530486..8908d9fa 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.vue
@@ -442,6 +442,7 @@
},
showMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.scanPopupGetFocus()
@@ -450,6 +451,7 @@
},
showErrorMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.scanPopupGetFocus()
@@ -463,6 +465,8 @@
this.$refs.comMessage.showQuestionMessage(message, res => {
if (res) {
callback(res);
+ }else {
+ this.scanPopupGetFocus()
}
});
})
diff --git a/src/pages/productionReceipt/job/productionReceiptJob.vue b/src/pages/productionReceipt/job/productionReceiptJob.vue
index c529f434..c92ec8f5 100644
--- a/src/pages/productionReceipt/job/productionReceiptJob.vue
+++ b/src/pages/productionReceipt/job/productionReceiptJob.vue
@@ -347,9 +347,14 @@
},
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
}
});
},
diff --git a/src/pages/productionReturn/coms/comScanReturnPack.vue b/src/pages/productionReturn/coms/comScanReturnPack.vue
index 290b934d..69862044 100644
--- a/src/pages/productionReturn/coms/comScanReturnPack.vue
+++ b/src/pages/productionReturn/coms/comScanReturnPack.vue
@@ -159,8 +159,6 @@
this.scanOptions = getDetailEditRemoveOption();
},
methods: {
-
-
openScanPopup(content, jobcontent) {
this.issueRecord = [];
this.dataContent = content;
@@ -168,8 +166,9 @@
this.initData();
// this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
// "-" + this.jobContent.subList[0].workStationCode
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ that.getfocus();
}, 500)
},
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index ba9aa9c6..fa506e5a 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -373,7 +373,7 @@
})
if (itemDetail.scaned && scanedLength == itemDetail
.packList.length) {
- isExit.scanDate = new Date();
+ itemDetail.scanDate = new Date();
this.showMessage("箱码【" + packingNumber + "】已经扫描")
} else {
itemDetail.scaned = true;
@@ -712,6 +712,9 @@
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.losefocus();
+ }
setTimeout(r => {
this.$refs.comMessage.showMessage(message, res => {
if (res) {
@@ -722,6 +725,9 @@
},
showErrorMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.losefocus();
+ }
setTimeout(r => {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 4a43391a..3f610ed2 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -20,7 +20,7 @@
-
+
@@ -78,7 +78,7 @@
status: '1,2', //待处理 、进行中
detailOptions: [],
detailGiveupOptions: [],
- scanMessage:""
+ scanMessage: ""
};
},
@@ -95,7 +95,7 @@
scanTitle: {
type: String,
default: '箱标签'
- },
+ },
title: {
type: String,
default: ''
@@ -185,11 +185,11 @@
column: "status",
action: "in",
value: this.status
- })
- filters.push({
- column: "accept_user_id",
- action: "==",
- value: this.$store.state.user.id
+ })
+ filters.push({
+ column: "accept_user_id",
+ action: "==",
+ value: this.$store.state.user.id
})
var params = {
@@ -205,7 +205,7 @@
var list = res.data.list;
this.totalCount = res.data.total
- updateTitle(this.title+"(" + this.totalCount + ")");
+ updateTitle(this.title + "(" + this.totalCount + ")");
this.loadingType = "loadmore";
if (list == null || list.length == 0) {
this.loadingType = "nomore";
@@ -292,7 +292,7 @@
url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this
.operation + '&scanMessage=' + scanMessage
});
- this.scanMessage=""
+ this.scanMessage = ""
},
showItemList(itemList) {
@@ -350,12 +350,14 @@
},
showMessage(message) {
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
- if(this.$refs.scanPopup){
- this.$refs.scanPopup.packGetFocus()
- }
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.packGetFocus()
+ }
}
});
@@ -363,20 +365,20 @@
openScanPopup() {
this.$refs.scanPopup.openScanPopup();
},
- selectItem(item,isScanedASN=false) {
-
- this.$refs.scanPopup.closeScanPopup();
- if(isScanedASN){
- this.openJobDetail(item)
- }else{
- this.openJobDetail(item, this.scanMessage);
+ selectItem(item, isScanedASN = false) {
+
+ this.$refs.scanPopup.closeScanPopup();
+ if (isScanedASN) {
+ this.openJobDetail(item)
+ } else {
+ this.openJobDetail(item, this.scanMessage);
}
-
+
},
- getScanResult(result) {
+ getScanResult(result) {
try {
- this.scanMessage=""
+ this.scanMessage = ""
let filters = []
if (result.label.barType == "BarCode") {
// ASN单号
@@ -384,17 +386,17 @@
column: "asn_number",
action: "==",
value: result.label.code
- },{
- column: "status",
- action: "in",
- value: '1,2',
+ }, {
+ column: "status",
+ action: "in",
+ value: '1,2',
}]
} else {
filters = [{
- column: "packingNumber",
- action: "in",
- value: result.package.number + "," + result.package.parentNumber
- },
+ column: "packingNumber",
+ action: "in",
+ value: result.package.number + "," + result.package.parentNumber
+ },
{
column: "batch",
action: "==",
@@ -409,11 +411,11 @@
column: "itemCode",
action: "==",
value: result.label.itemCode
- },
- {
- column: "status",
- action: "in",
- value: '1,2',
+ },
+ {
+ column: "status",
+ action: "in",
+ value: '1,2',
},
{
column: "accept_user_id",
@@ -432,7 +434,7 @@
pageNo: 1,
pageSize: 100,
}).then(res => {
- this.scanMessage =result.scanMessage
+ this.scanMessage = result.scanMessage
let resultList = res.data.list;
if (resultList.length > 0) {
resultList.forEach(item => {
@@ -448,15 +450,15 @@
console.log('list', list)
if (list.length > 1) {
- this.$refs.jobList.openList(list,result.scanMessage.indexOf('ASN')>-1)
+ this.$refs.jobList.openList(list, result.scanMessage.indexOf('ASN') > -1)
} else {
- this.selectItem(list[0],result.scanMessage.indexOf('ASN')>-1)
+ this.selectItem(list[0], result.scanMessage.indexOf('ASN') > -1)
}
} else {
- this.showMessage("未查找到任务\n"+"扫描["+result.scanMessage+"]")
+ this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
}
}).catch(error => {
- this.showMessage(error+"\n扫描["+result.scanMessage+"]")
+ this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
})
} catch (e) {
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 09cb8434..11708552 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -458,15 +458,21 @@
},
closeScanPopup() {
- this.$refs.scanPopup.closeScanPopup();
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.closeScanPopup();
+ }
},
scanPopupGetFocus() {
- this.$refs.scanPopup.packGetFocus();
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus();
+ }
},
scanPopupLoseFocus() {
- this.$refs.scanPopup.packLoseFocus();
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus();
+ }
},
openDetail(item) {
@@ -474,6 +480,7 @@
},
showMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showMessage(message, res => {
if (res) {
this.scanPopupGetFocus()
@@ -482,6 +489,7 @@
},
showErrorMessage(message) {
+ this.scanPopupLoseFocus();
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.scanPopupGetFocus()
diff --git a/src/pages/purchaseReturn/record/returnRecord.vue b/src/pages/purchaseReturn/record/returnRecord.vue
index fea85dee..06a41339 100644
--- a/src/pages/purchaseReturn/record/returnRecord.vue
+++ b/src/pages/purchaseReturn/record/returnRecord.vue
@@ -211,6 +211,7 @@
}
}
calcHandleQty(this.detailSource);
+ this.scanPopupGetFocus()
},
updateData() {
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 494f8686..a9d9fbe2 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -1,14 +1,14 @@
@@ -364,6 +364,7 @@
}
}
calcTreeHandleQty(this.detailSource);
+ this.continueScan()
this.$forceUpdate()
} else {
var scanedLength = 0;
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 1621655f..9c903838 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -308,9 +308,14 @@
showMessage(message) {
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packLoseFocus()
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
}
});
},
diff --git a/src/pages/query/pack.vue b/src/pages/query/pack.vue
index a1e20917..045dd20b 100644
--- a/src/pages/query/pack.vue
+++ b/src/pages/query/pack.vue
@@ -119,6 +119,7 @@
return;
}
this.packingNumber =result.label.packingNumber ;
+ this.closeScanPopup();
this.tabChange(0)
},
getItemInfo(code) {
@@ -402,6 +403,9 @@
},
showMessage(message) {
+ if (this.$refs.scanPopup ) {
+ this.$refs.scanPopup.losefocus();
+ }
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
this.afterCloseMessage()
@@ -409,7 +413,7 @@
});
},
afterCloseMessage() {
- if (this.$refs.scanPopup != undefined) {
+ if (this.$refs.scanPopup ) {
this.$refs.scanPopup.getfocus();
}
},
diff --git a/src/pages/repleinsh/coms/comScanReplishPack.vue b/src/pages/repleinsh/coms/comScanReplishPack.vue
index 9bfa5072..0f764fe2 100644
--- a/src/pages/repleinsh/coms/comScanReplishPack.vue
+++ b/src/pages/repleinsh/coms/comScanReplishPack.vue
@@ -161,8 +161,9 @@
this.dataContent = content;
this.jobContent = jobcontent;
this.initData();
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus();
}, 500)
},
@@ -230,7 +231,9 @@
let location = this.fromLocationList.find(r => r == fromlocation)
if (location == undefined) {
this.fromLocationCode = ''
- this.showErrorMessage('发料库位【' + fromlocation + '】不存在')
+ this.showErrorMessage('发料库位【' + fromlocation + '】不存在',res=>{
+ this.getfocus();
+ })
}
},
@@ -246,7 +249,10 @@
if (this.toLocation && result.package.packUnit) {
let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode);
if (!item) {
- this.showErrorMessage('扫描物料代码不属于该任务');
+ this.showErrorMessage('扫描物料代码不属于该任务',
+ res => {
+ this.getfocus();
+ });
return
}
if (result.package.packUnit !== item.packUnit) {
@@ -310,14 +316,20 @@
getBalanceByFilter(params).then(res => {
uni.hideLoading()
if (res.data.list.length > 0) {
- this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
+ this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额",
+ res => {
+ this.getfocus();
+ });
} else {
this.queryBalance(result);
}
// callback(res.data)
}).catch(err => {
uni.hideLoading()
- this.showErrorMessage(err.message);
+ this.showErrorMessage(err.message,
+ res => {
+ this.getfocus();
+ });
})
},
@@ -368,7 +380,10 @@
"状态 [" + status + "] \n" +
"库区 [" + areaType + "] \n" +
"未查找到库存余额"
- this.showErrorMessage(hint)
+ this.showErrorMessage(hint,
+ res => {
+ this.getfocus();
+ })
} else if (res.data.length == 1) {
result.balance = res.data[0]
@@ -385,12 +400,19 @@
uni.hideLoading()
}).catch(error => {
uni.hideLoading()
- this.showErrorMessage(error)
+ this.showErrorMessage(error,
+ res => {
+ this.getfocus();
+ })
})
}
} catch (e) {
- this.showErrorMessage(e.stack)
uni.hideLoading();
+ this.showErrorMessage(e.stack,
+ res => {
+ this.getfocus();
+ })
+
}
},
diff --git a/src/pages/scrap/job/scrapJobDetail.vue b/src/pages/scrap/job/scrapJobDetail.vue
index 41cb0ce1..13d08f94 100644
--- a/src/pages/scrap/job/scrapJobDetail.vue
+++ b/src/pages/scrap/job/scrapJobDetail.vue
@@ -214,7 +214,8 @@
let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
if (itemDetail.inventoryStatus != result.balance.inventoryStatus) {
if (this.jobContent.allowModifyInventoryStatus == "TRUE") {
- this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+ this.scanPopupLoseFocus();
+ this.$refs.comMessage.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,是否继续出库?', res => {
if (res) {
@@ -231,7 +232,8 @@
}
});
} else {
- this.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
+ this.scanPopupLoseFocus();
+ this.$refs.comMessage.showQuestionMessage('任务中不允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' +
itemStatus +
']不一致,不允许转移!', res => {
this.scanPopupGetFocus();
@@ -297,6 +299,7 @@
})
if (str) {
str += '，是否确认提交?'
+
this.$refs.comMessage.showQuestionMessage1(str, 'red', res => {
if (res) {
this.submitJob()
diff --git a/src/pages/stockUp/coms/comScanStockUpPack.vue b/src/pages/stockUp/coms/comScanStockUpPack.vue
index 038b5849..a084d530 100644
--- a/src/pages/stockUp/coms/comScanStockUpPack.vue
+++ b/src/pages/stockUp/coms/comScanStockUpPack.vue
@@ -182,8 +182,9 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
this.initData();
this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
"-" + this.jobContent.subList[0].workStationCode
+ this.$refs.popup.open('bottom')
setTimeout(res => {
- this.$refs.popup.open('bottom')
+ this.getfocus()
}, 500)
},
@@ -420,17 +421,16 @@ import { getDirectoryItemArray } from '../../../common/directory.js';
batch.Records.push(record);
this.issueRecord.unshift(record)
this.calcBatchHandleQty(batch);
- this.getfocus();
},
getfocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan ) {
this.$refs.comscan.getfocus();
}
},
losefocus() {
- if (this.$refs.comscan != undefined) {
+ if (this.$refs.comscan) {
this.$refs.comscan.losefocus();
}
},
From 95ccec7137fe1d420f5e4e77b7619b4436c555e6 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Tue, 13 Aug 2024 13:44:48 +0800
Subject: [PATCH 39/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?=
=?UTF-8?q?=E8=BD=AC=E7=A7=BB=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/inventoryMove/coms/comMoveRecord.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue
index 8c38f935..89863e59 100644
--- a/src/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/src/pages/inventoryMove/coms/comMoveRecord.vue
@@ -355,10 +355,10 @@
this.showErrorMessage("请先选择目标库位")
return;
}
- if(this.fromLocationCode==this.toLocationCode){
- this.showErrorMessage("来源库位和目标库位不能一致")
- return;
- }
+ // if(this.fromLocationCode==this.toLocationCode){
+ // this.showErrorMessage("来源库位和目标库位不能一致")
+ // return;
+ // }
if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
//查询管理模式
From 8b10e9feab52b787bebb3bc5a9d1ded08b9e95fc Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Tue, 13 Aug 2024 13:45:12 +0800
Subject: [PATCH 40/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E7=BB=9C?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/httpRequest3.js | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 85e764ed..81a84796 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -45,36 +45,36 @@ function service(options = {}) {
}
if (res.data.msg) {
if (res.data.msg.includes('get lock')) {
- reject("系统异常:" + "数据库死锁")
+ reject("系统异常:状态码["+res.statusCode +"]\n"+"数据库死锁")
} else {
- reject("系统异常:" + res.data.msg)
+ reject("系统异常:状态码["+res.statusCode +"]\n"+res.data.msg)
}
} else {
- reject("系统异常:")
+ reject("系统异常:状态码["+res.statusCode+"]")
}
}
} else {
if (res.data.msg) {
if (res.data.msg.includes('get lock')) {
- reject("系统异常:" + "数据库死锁")
+ reject("系统异常:状态码[" +res.statusCode+"]\n"+ "数据库死锁")
} else {
- reject("系统异常:" + res.data.msg)
+ reject("系统异常:状态码[" +res.statusCode+"]\n"+ res.data.msg)
}
} else {
- reject("系统异常:")
+ reject("系统异常:状态码["+res.statusCode+"]")
}
}
} else {
if (res.data.msg) {
if (res.data.msg.includes('get lock')) {
- reject("系统异常:" + "数据库死锁")
+ reject("系统异常:状态码["+res.statusCode +"]\n"+ "数据库死锁")
} else {
- reject("系统异常:" + res.data.msg)
+ reject("系统异常:状态码["+res.statusCode +"]\n"+ res.data.msg)
}
} else {
- reject("系统异常:")
+ reject("系统异常:状态码["+res.statusCode+"]")
}
}
From 85dff3ceb5f636bcecd7ee469dec916e95fe2c96 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Tue, 13 Aug 2024 13:45:44 +0800
Subject: [PATCH 41/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?=
=?UTF-8?q?=E6=94=B6=E6=96=99=E8=87=AA=E5=8A=A8=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../job/productionReceiptDetail.vue | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue
index 10b0564b..967a3083 100644
--- a/src/pages/productionReceipt/job/productionReceiptDetail.vue
+++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue
@@ -213,6 +213,32 @@
calcHandleQty(this.detailSource);
this.continueScan()
this.$forceUpdate();
+
+ },
+ autoCommit(){
+ //判断数量是否相等
+ var noCommitInfo=null
+ for (var i = 0; i < this.detailSource.length; i++) {
+ var sub =this.detailSource[i].subList
+ for(var j=0;j{
+ if(res){
+ this.commit()
+ }
+ })
+ }else {
+ //提交
+ this.commit()
+ }
},
//继续扫描
@@ -332,6 +358,7 @@
itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
+ this.autoCommit();
} else {
this.scanPopupGetFocus();
}
@@ -354,6 +381,7 @@
itemDetail.balance.packQty = Number(result.package.packQty)
itemDetail.balance.packUnit = result.package.packUnit
this.calcHandleQty();
+ this.autoCommit();
}
}
}
From c078fb5ca17a93c7bf90ed4e6b666a59718f3683 Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Tue, 13 Aug 2024 15:37:48 +0800
Subject: [PATCH 42/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?=
=?UTF-8?q?=E5=A4=96=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../scrap/request/scrapRequestCreate.vue | 15 +++++--------
src/pages/unPlanned/record/issueRecord.vue | 20 ++++++++++++------
src/pages/unPlanned/record/receiptRecord.vue | 17 +++++++++++----
.../unPlanned/request/issueRequestCreate.vue | 21 +++++++++++++------
4 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/pages/scrap/request/scrapRequestCreate.vue b/src/pages/scrap/request/scrapRequestCreate.vue
index 3e8ef532..e307cc48 100644
--- a/src/pages/scrap/request/scrapRequestCreate.vue
+++ b/src/pages/scrap/request/scrapRequestCreate.vue
@@ -159,6 +159,7 @@
let newDetail = createDetailInfo(balance, pack); //
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
+ this.scanPopupGetFocus()
} else {
var detail = item.subList.find(r => {
if (r.packingNumber == balance.packingNumber &&
@@ -171,6 +172,7 @@
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
item.subList.push(newDetail);
+ this.scanPopupGetFocus()
} else {
if (detail.scaned == true) {
this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描")
@@ -185,7 +187,7 @@
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ this.scanPopupGetFocus()
}
});
},
@@ -231,8 +233,8 @@
},
scanPopupGetFocus() {
- if (this.$refs.scanPopup != undefined) {
- this.$refs.scanPopup.getfocus();
+ if (this.$refs.scanPopup) {
+ this.$refs.scanPopup.packGetFocus();
}
},
@@ -292,13 +294,6 @@
if (res) {}
});
},
- showErrorMessage(message) {
- this.$refs.comMessage.showErrorMessage(message, res => {
- if (res) {
-
- }
- });
- },
showScanMessage(message) {
this.$refs.comMessage.showScanMessage(message);
diff --git a/src/pages/unPlanned/record/issueRecord.vue b/src/pages/unPlanned/record/issueRecord.vue
index a964ceee..42ea5f8e 100644
--- a/src/pages/unPlanned/record/issueRecord.vue
+++ b/src/pages/unPlanned/record/issueRecord.vue
@@ -154,12 +154,13 @@
// newDetail.inventoryStatus ="OK";
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
+ this.packGetFocus()
} else {
var detail = item.subList.find(r => {
- if (r.packingNumber == result.packingNumber &&
- r.batch == result.batch &&
- r.locationCode == result.locationCode &&
- r.inventoryStatus == result.inventoryStatus &&
+ if (r.packingNumber == balance.packingNumber &&
+ r.batch == balance.batch &&
+ r.locationCode == balance.locationCode &&
+ r.inventoryStatus == balance.inventoryStatus &&
r.scaned == true) {
return r;
}
@@ -168,13 +169,20 @@
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
item.subList.push(newDetail);
+ this.packGetFocus()
} else {
- this.showErrorMessage(result.packingNumber + "重复扫描")
+ this.showErrorMessage("箱码[" + balance.packingNumber + "]批次[" + balance.batch + "]已经扫描")
}
}
this.calcHandleQty();
},
+
+ packGetFocus(){
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
+ },
calcHandleQty() {
calcHandleQty(this.detailSource);
@@ -184,7 +192,7 @@
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ this.packGetFocus()
}
});
},
diff --git a/src/pages/unPlanned/record/receiptRecord.vue b/src/pages/unPlanned/record/receiptRecord.vue
index 795c8f6a..8529bcd0 100644
--- a/src/pages/unPlanned/record/receiptRecord.vue
+++ b/src/pages/unPlanned/record/receiptRecord.vue
@@ -144,10 +144,12 @@
let newDetail = this.createDetailInfo(label, pack);
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
+ this.getfocus()
+
} else {
var detail = item.subList.find(r => {
- if (r.packingNumber == result.number &&
- r.batch == result.batch) {
+ if (r.packingNumber == pack.number &&
+ r.batch == pack.batch) {
return r;
}
})
@@ -155,9 +157,10 @@
if (detail == undefined) {
let newDetail = this.createDetailInfo(label, pack);
item.subList.push(newDetail);
+ this.getfocus()
} else {
if (detail.scaned) {
- this.showErrorMessage("箱码[" + result.Number + "]批次[" + result.batch + "]已经扫描")
+ this.showErrorMessage("箱码[" + pack.number + "]批次[" + pack.batch + "]已经扫描")
}
}
@@ -165,6 +168,12 @@
this.calcHandleQty();
},
+
+ getfocus(){
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.getfocus()
+ }
+ },
createItemInfo(label, pack) {
let item = {
@@ -213,7 +222,7 @@
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ this.getfocus()
}
});
},
diff --git a/src/pages/unPlanned/request/issueRequestCreate.vue b/src/pages/unPlanned/request/issueRequestCreate.vue
index 501ba450..7b9c9b7c 100644
--- a/src/pages/unPlanned/request/issueRequestCreate.vue
+++ b/src/pages/unPlanned/request/issueRequestCreate.vue
@@ -166,12 +166,13 @@
let newDetail = createDetailInfo(balance, pack); //
itemp.subList.push(newDetail);
this.detailSource.push(itemp)
+ this.packGetFocus()
} else {
var detail = item.subList.find(r => {
- if (r.packingNumber == result.packingNumber &&
- r.batch == result.batch &&
- r.locationCode == result.locationCode &&
- r.inventoryStatus == result.inventoryStatus &&
+ if (r.packingNumber == balance.packingNumber &&
+ r.batch == balance.batch &&
+ r.locationCode == balance.locationCode &&
+ r.inventoryStatus == balance.inventoryStatus &&
r.scaned == true) {
return r;
}
@@ -180,13 +181,21 @@
if (detail == undefined) {
let newDetail = createDetailInfo(balance, pack);
item.subList.push(newDetail);
+ this.packGetFocus()
} else {
- this.showErrorMessage(result.packingNumber + "重复扫描")
+ this.showErrorMessage("包装["+balance.packingNumber+"]"+"批次["+balance.batch+"]" + "重复扫描")
}
}
this.calcHandleQty();
},
+ packGetFocus(){
+ if(this.$refs.scanPopup){
+ this.$refs.scanPopup.packGetFocus()
+ }
+
+ },
+
calcHandleQty() {
calcHandleQty(this.detailSource);
@@ -196,7 +205,7 @@
showErrorMessage(message) {
this.$refs.comMessage.showErrorMessage(message, res => {
if (res) {
-
+ this.packGetFocus()
}
});
},
From ac9da76b5ba9bdffc52bc9da95a52a2b0032f63b Mon Sep 17 00:00:00 2001
From: lijuncheng
Date: Tue, 13 Aug 2024 17:00:47 +0800
Subject: [PATCH 43/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/receiptByPlan.vue | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index a64fb88e..74c31bcc 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -347,15 +347,15 @@ import { nextTick } from 'vue';
this.dataContent.goodQty = planeInfo.data.list[0].goodQty
this.dataContent.noGoodQty = calc.sub(planeInfo.data.list[0].planQty, planeInfo.data.list[
0].goodQty),
- this.dataContent.subList = []
+ this.dataContent.subList = []
this.showList = [];
this.allList = []
this.index = 1
}
-
- } else {
- throw new Error("未查找到单据信息")
- }
+ }
+ // else {
+ // throw new Error("未查找到单据信息")
+ // }
uni.hideLoading()
if(isAllSubmit){
this.clearData()
@@ -366,13 +366,10 @@ import { nextTick } from 'vue';
this.dataContent.handleQty = 0;
}
-
-
nextTick(()=>{
this.showCommitSuccessMessage("提交成功\n生成装配收货记录\n" + list[0].requestNumber, list)
})
-
} catch (error) {
uni.hideLoading()
var hint = error.message ? error.message : error