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) {
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index abb35529..c1aa87eb 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: {
@@ -217,6 +218,8 @@
this.showList = []
this.loadingType = "";
this.showList = this.getDataPage(this.index, this.pageSize)
+ this.dataContent.handleQty = this.showList.length;
+
},
getDataPage(pageNo, pageSize) {
@@ -352,9 +355,17 @@
throw new Error("未查找到单据信息")
}
uni.hideLoading()
- this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
this.showList = [];
+ this.allList = [];
+ this.index = 1;
this.dataContent.handleQty = 0;
+
+
+ nextTick(()=>{
+ this.showCommitSuccessMessage("提交成功
生成装配收货记录
" + list[0].requestNumber, list)
+ })
+
+
} catch (error) {
uni.hideLoading()
var hint = error.message ? error.message : error
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);
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){