From 214ee581a9bcb07808fe61f055ccf83798366900 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Wed, 7 Aug 2024 23:31:21 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/productReceipt/job/fgProductReceiptDetail.vue | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index 7437bf12..f2895ab2 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -232,9 +232,9 @@
that.jobStatus = res.data.status
that.jobToLocationCode = that.subList[0].toLocationCode
that.productionLineCode = that.subList[0].productionLineCode;
- if (that.jobContent.allowModifyLocation == 'FALSE') {
- that.toLocationCode = that.subList[0].toLocationCode
- }
+ // if (that.jobContent.allowModifyLocation == 'FALSE') {
+ // that.toLocationCode = that.subList[0].toLocationCode
+ // }
that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes)
that.detailSource = getDataSource(that.subList)
@@ -441,7 +441,6 @@
// this.showErrorMessage("扫描数为0,请先扫描")
// return;
// }
-
var valiDate = getSwitchInfoByCode("fgProductReceipCommitValidate")
//校验库位
if(valiDate){
From ff3a0a854dc341f7eb293d2aa2576bb728044cb0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 8 Aug 2024 08:42:38 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=8C=89=E8=AE=A1=E5=88=92=E5=AE=8C?=
=?UTF-8?q?=E5=B7=A5=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E5=90=8E=E4=B8=8D?=
=?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/receiptByPlan.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index abb35529..7548197a 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -132,6 +132,7 @@
import {
Exception
} from 'sass';
+import { nextTick } from 'vue';
export default {
components: {
@@ -352,9 +353,13 @@
throw new Error("未查找到单据信息")
}
uni.hideLoading()
- this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
this.showList = [];
this.dataContent.handleQty = 0;
+ nextTick(()=>{
+ this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
+ })
+
+
} catch (error) {
uni.hideLoading()
var hint = error.message ? error.message : error
From 90599b48a01da236466ba649071313ba98e0a3a0 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 8 Aug 2024 09:57:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=BC=80=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/basic.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/common/basic.js b/src/common/basic.js
index 8d1fb95d..0217bd96 100644
--- a/src/common/basic.js
+++ b/src/common/basic.js
@@ -344,9 +344,7 @@ export function getInspectReasonList(value) {
export function getSwitchInfoByCode(code) {
var isCheck = false
var resultInfo = ""
- if (switchList.length == 0) {
- switchList = uni.getStorageSync("switch")
- }
+ switchList = uni.getStorageSync("switch")
for (let item of switchList) {
if (item.code == code) {
From dce1cbea29fb89179ef00bd88525fe9f1460a1ad Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 8 Aug 2024 10:52:44 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=8B=86=E5=8C=85=E6=89=93=E5=8D=B0?=
=?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=92=8C=E4=BA=8C=E7=BB=B4=E7=A0=81=E4=B8=8D?=
=?UTF-8?q?=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/point/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 8454d2ec..3aeaadad 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -199,7 +199,8 @@
}, 1000)
} else {
- var url = this.picUrl[index]
+ let i = this.picUrl.length - 1 - index
+ var url = this.picUrl[i]
// #ifdef APP
plus.io.resolveLocalFileSystemURL(url, (entry) => {
// 可通过entry对象操作test.html文件
@@ -207,7 +208,8 @@
let fileReader = new plus.io.FileReader();
fileReader.onloadend = (evt) => {
console.log("文件路径" + evt.target.result)
- this.data[index].barcodeBase64 = evt.target.result
+ let i = this.data.length - 1 - index
+ this.data[i].barcodeBase64 = evt.target.result
this.generateBase64(index + 1)
}
fileReader.readAsDataURL(file);
From f46c669c99386bf6e5da88af8e28c7602a895b4e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 8 Aug 2024 11:29:49 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=8C=89=E8=AE=A1=E5=88=92=E5=AE=8C?=
=?UTF-8?q?=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/receiptByPlan.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index 7548197a..bb5cef4f 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -353,8 +353,7 @@ import { nextTick } from 'vue';
throw new Error("未查找到单据信息")
}
uni.hideLoading()
- this.showList = [];
- this.dataContent.handleQty = 0;
+ this.clearData();
nextTick(()=>{
this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
})
From 10a9374db3d1be5f5a7d7598ca0497831e435448 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 8 Aug 2024 11:57:05 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97?=
=?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/receiptByPlan.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index bb5cef4f..c62e9dcd 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -218,6 +218,8 @@ import { nextTick } from 'vue';
this.showList = []
this.loadingType = "";
this.showList = this.getDataPage(this.index, this.pageSize)
+ this.dataContent.handleQty = this.showList.length;
+
},
getDataPage(pageNo, pageSize) {
From ac40331586da86237dbdc89df294f40c2ff81b4a Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 8 Aug 2024 12:08:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/fg/receiptByPlan.vue | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index c62e9dcd..c1aa87eb 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -355,7 +355,12 @@ import { nextTick } from 'vue';
throw new Error("未查找到单据信息")
}
uni.hideLoading()
- this.clearData();
+ this.showList = [];
+ this.allList = [];
+ this.index = 1;
+ this.dataContent.handleQty = 0;
+
+
nextTick(()=>{
this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
})