diff --git a/pages/manage/mater-in-storage.vue b/pages/manage/mater-in-storage.vue index 03bfffb..fa697d6 100644 --- a/pages/manage/mater-in-storage.vue +++ b/pages/manage/mater-in-storage.vue @@ -155,18 +155,24 @@ try { let current = await getSD01GroupLog(v1, v2) if (current && current?.material) { - uni.showModal({ - title: '提示', - cancelText: '取消', - confirmText: '确定', - content: '已发现近期从SD01出库的组盘信息,是否自动填充?', - success: (res) => { - if (res.confirm) { - this.dataList.push(...current.material) - this.flag = true + if (current?.regionCode) { + this.index = '1' + this.index2 = current.regionCode + } + if (current?.material) { + uni.showModal({ + title: '提示', + cancelText: '取消', + confirmText: '确定', + content: '已发现近期从SD01出库的组盘信息,是否自动填充?', + success: (res) => { + if (res.confirm) { + this.dataList = [...current.material] + this.flag = true + } } - } - }) + }) + } } } catch (e) { console.log(e) diff --git a/utils/mork2.js b/utils/mork2.js index 226bcf4..04e239a 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -17,7 +17,7 @@ export const regionList = () => { export const getSD01GroupLog = () => { let res = { "device_code": "SD01", - "regionCode": null, + "regionCode": '6', "region_Code": null, "vehicle_code": "VEH001", "material": [ @@ -31,6 +31,12 @@ export const getSD01GroupLog = () => { } return res } +export const handheldBlanking = (data) => { + let res = { + message: 'ok' + } + return res +} export const fabOrders = (data) => { let res = [