|
|
@ -176,7 +176,8 @@ |
|
|
|
renderList: [], |
|
|
|
renderList: [], |
|
|
|
// 数据是否加载完毕 |
|
|
|
// 数据是否加载完毕 |
|
|
|
isEnd: false, |
|
|
|
isEnd: false, |
|
|
|
warehouseId: '' |
|
|
|
warehouseId: '', |
|
|
|
|
|
|
|
questNum: '' |
|
|
|
}) |
|
|
|
}) |
|
|
|
const placeholder = ref('请输入') |
|
|
|
const placeholder = ref('请输入') |
|
|
|
const isDropdownOpen = ref(false) // 控制下拉选择列表的显示隐藏 |
|
|
|
const isDropdownOpen = ref(false) // 控制下拉选择列表的显示隐藏 |
|
|
@ -214,6 +215,7 @@ |
|
|
|
details.id = data.id |
|
|
|
details.id = data.id |
|
|
|
details.warehouseId = data.warehouseId |
|
|
|
details.warehouseId = data.warehouseId |
|
|
|
details.marketName = data.marketName |
|
|
|
details.marketName = data.marketName |
|
|
|
|
|
|
|
details.questNum = data.questNum |
|
|
|
|
|
|
|
|
|
|
|
if (details.pageType === 3) { |
|
|
|
if (details.pageType === 3) { |
|
|
|
infodata.value = data |
|
|
|
infodata.value = data |
|
|
@ -277,6 +279,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
// 下拉刷新 |
|
|
|
// 下拉刷新 |
|
|
|
onPullDownRefresh(() => { |
|
|
|
onPullDownRefresh(() => { |
|
|
|
|
|
|
|
console.log('111 :>> ', 111); |
|
|
|
// 重置页码 |
|
|
|
// 重置页码 |
|
|
|
details.page.current = 1 |
|
|
|
details.page.current = 1 |
|
|
|
// 恢复结束状态 |
|
|
|
// 恢复结束状态 |
|
|
@ -294,25 +297,27 @@ |
|
|
|
async function initPage() { |
|
|
|
async function initPage() { |
|
|
|
try { |
|
|
|
try { |
|
|
|
let res : any = null |
|
|
|
let res : any = null |
|
|
|
|
|
|
|
uni.showLoading({ |
|
|
|
|
|
|
|
mask: true, |
|
|
|
|
|
|
|
title: '数据加载中' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
if (details.pageType === 1) return |
|
|
|
if (details.pageType === 2) { |
|
|
|
if (details.pageType === 2) { |
|
|
|
// 货位id |
|
|
|
// 货位id |
|
|
|
// type: 搜索的type, 1是手输, 2是扫描 |
|
|
|
// type: 搜索的type, 1是手输, 2是扫描 |
|
|
|
res = await getWarehouseTaskAllocationList({ |
|
|
|
res = await getWarehouseTaskAllocationList({ |
|
|
|
questId: details.id |
|
|
|
...details.page, |
|
|
|
|
|
|
|
questId: details.id, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
else if (details.pageType === 3) { |
|
|
|
else if (details.pageType === 3) { |
|
|
|
pgetContractList({ |
|
|
|
res = await pgetContractList({ |
|
|
|
|
|
|
|
...details.page, |
|
|
|
taskId: infodata.value.id, |
|
|
|
taskId: infodata.value.id, |
|
|
|
warehouseId: infodata.value.warehouseId |
|
|
|
warehouseId: infodata.value.warehouseId, |
|
|
|
}).then(res => { |
|
|
|
questNum: details.questNum |
|
|
|
if (res.code = 200 && res.data) { |
|
|
|
|
|
|
|
details.renderList = res.data.records |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
// console.log(res.data.records); |
|
|
|
|
|
|
|
// details.renderList=res.data.records |
|
|
|
|
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -322,7 +327,9 @@ |
|
|
|
console.log('res :>> ', res); |
|
|
|
console.log('res :>> ', res); |
|
|
|
const { code, data } = res |
|
|
|
const { code, data } = res |
|
|
|
if (code === 200 && data) { |
|
|
|
if (code === 200 && data) { |
|
|
|
details.renderList = data |
|
|
|
if (details.pageType === 3) { |
|
|
|
|
|
|
|
details.renderList = res.data.records |
|
|
|
|
|
|
|
} else details.renderList = data |
|
|
|
if (data.length < details.page.size) details.isEnd = true |
|
|
|
if (data.length < details.page.size) details.isEnd = true |
|
|
|
} else if (code === 3001) { |
|
|
|
} else if (code === 3001) { |
|
|
|
const msg = data.audio |
|
|
|
const msg = data.audio |
|
|
@ -337,6 +344,7 @@ |
|
|
|
//TODO handle the exception |
|
|
|
//TODO handle the exception |
|
|
|
console.log('error :>> ', error); |
|
|
|
console.log('error :>> ', error); |
|
|
|
} finally { |
|
|
|
} finally { |
|
|
|
|
|
|
|
uni.hideLoading() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -344,7 +352,8 @@ |
|
|
|
console.log('details.id :>> ', details.id); |
|
|
|
console.log('details.id :>> ', details.id); |
|
|
|
const submitData : any = { |
|
|
|
const submitData : any = { |
|
|
|
...details.page, |
|
|
|
...details.page, |
|
|
|
taskId: details.id |
|
|
|
taskId: details.id, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
} |
|
|
|
} |
|
|
|
submitData.trayCode = details.scancode |
|
|
|
submitData.trayCode = details.scancode |
|
|
|
console.log('submitData :>> ', submitData); |
|
|
|
console.log('submitData :>> ', submitData); |
|
|
@ -366,12 +375,13 @@ |
|
|
|
if (details.pageType === 2) { |
|
|
|
if (details.pageType === 2) { |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
questId: details.id, |
|
|
|
questId: details.id, |
|
|
|
allocationId: details.scancode |
|
|
|
allocationId: details.scancode, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res); |
|
|
|
console.log(res); |
|
|
|
if (res.code != 403) { |
|
|
|
if (res.code != 403) { |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}` |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
@ -384,7 +394,8 @@ |
|
|
|
goodsType: selectedValue.value.value, |
|
|
|
goodsType: selectedValue.value.value, |
|
|
|
warehouseId: details.warehouseId, |
|
|
|
warehouseId: details.warehouseId, |
|
|
|
type: '1', |
|
|
|
type: '1', |
|
|
|
code: details.scancode |
|
|
|
code: details.scancode, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res, 'res==='); |
|
|
|
console.log(res, 'res==='); |
|
|
|
utils.ttsspke(res.audio) |
|
|
|
utils.ttsspke(res.audio) |
|
|
@ -411,7 +422,8 @@ |
|
|
|
type: data[0].goodsType, |
|
|
|
type: data[0].goodsType, |
|
|
|
marketName: details.marketName, |
|
|
|
marketName: details.marketName, |
|
|
|
// 是否阻止初始化请求 |
|
|
|
// 是否阻止初始化请求 |
|
|
|
holdBackFirstPost: true |
|
|
|
holdBackFirstPost: true, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
} |
|
|
|
} |
|
|
|
console.log('info :>> ', info); |
|
|
|
console.log('info :>> ', info); |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
@ -431,12 +443,13 @@ |
|
|
|
const searchStorage = () => { |
|
|
|
const searchStorage = () => { |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
questId: details.id, |
|
|
|
questId: details.id, |
|
|
|
allocationId: details.scancode |
|
|
|
allocationId: details.scancode, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log('res >>>>>>>>', res); |
|
|
|
console.log('res >>>>>>>>', res); |
|
|
|
if (res.code !== 403) { |
|
|
|
if (res.code !== 403) { |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${details.scancode}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}` |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
@ -447,12 +460,13 @@ |
|
|
|
console.log('val :>> ', val); |
|
|
|
console.log('val :>> ', val); |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
getWarehouseTaskAllocationDetailByStrip({ |
|
|
|
questId: details.id, |
|
|
|
questId: details.id, |
|
|
|
allocationId: val.allocationId |
|
|
|
allocationId: val.allocationId, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res); |
|
|
|
console.log(res); |
|
|
|
if (res.code != 403) { |
|
|
|
if (res.code != 403) { |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}` |
|
|
|
url: `/pagesTask/pages/storageLocationCheckDetails/storageLocationCheckDetails?allocationId=${val.allocationId}&questId=${details.id}&marketName=${JSON.stringify(details.marketName)}&questNum=${details.questNum}` |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
@ -482,7 +496,8 @@ |
|
|
|
// 商城数组 |
|
|
|
// 商城数组 |
|
|
|
marketName: details.marketName, |
|
|
|
marketName: details.marketName, |
|
|
|
// 是否阻止初始化请求 |
|
|
|
// 是否阻止初始化请求 |
|
|
|
holdBackFirstPost: false |
|
|
|
holdBackFirstPost: false, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
} |
|
|
|
} |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pagesTask/pages/trayCheckDetails/trayCheckDetails?info=${JSON.stringify(info)}` |
|
|
|
url: `/pagesTask/pages/trayCheckDetails/trayCheckDetails?info=${JSON.stringify(info)}` |
|
|
@ -492,7 +507,7 @@ |
|
|
|
// 按合同号盘点,点击进入详情 |
|
|
|
// 按合同号盘点,点击进入详情 |
|
|
|
const contract = (val) => { |
|
|
|
const contract = (val) => { |
|
|
|
uni.navigateTo({ |
|
|
|
uni.navigateTo({ |
|
|
|
url: `/pagesTask/pages/contracts/contracts?warehouseId=${details.warehouseId}&taskId=${details.id}&orderCode=${val.orderCode}&isInventory=${val.isInventory}&marketName=${JSON.stringify(details.marketName)}&martialCode=${val.martialCode}` |
|
|
|
url: `/pagesTask/pages/contracts/contracts?warehouseId=${details.warehouseId}&taskId=${details.id}&orderCode=${val.orderCode}&isInventory=${val.isInventory}&marketName=${JSON.stringify(details.marketName)}&martialCode=${val.martialCode}&questNum=${details.questNum}` |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
// 按合同搜索按钮 |
|
|
|
// 按合同搜索按钮 |
|
|
@ -502,7 +517,8 @@ |
|
|
|
goodsType: selectedValue.value.value, |
|
|
|
goodsType: selectedValue.value.value, |
|
|
|
warehouseId: details.warehouseId, |
|
|
|
warehouseId: details.warehouseId, |
|
|
|
type: '2', |
|
|
|
type: '2', |
|
|
|
incomingBatch: details.scancode |
|
|
|
incomingBatch: details.scancode, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
console.log(res, 'res==='); |
|
|
|
console.log(res, 'res==='); |
|
|
|
utils.ttsspke(res.audio) |
|
|
|
utils.ttsspke(res.audio) |
|
|
@ -513,14 +529,13 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 监听Input当输入框没有值重新渲染 |
|
|
|
// 监听Input当输入框没有值重新渲染 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const handleInputChange = () => { |
|
|
|
const handleInputChange = () => { |
|
|
|
console.log(details.searchText.taryText); |
|
|
|
console.log(details.searchText.taryText); |
|
|
|
if (!details.scancode) { |
|
|
|
if (!details.scancode) { |
|
|
|
pgetContractList({ |
|
|
|
pgetContractList({ |
|
|
|
taskId: infodata.value.id, |
|
|
|
taskId: infodata.value.id, |
|
|
|
warehouseId: infodata.value.warehouseId, |
|
|
|
warehouseId: infodata.value.warehouseId, |
|
|
|
|
|
|
|
questNum: details.questNum |
|
|
|
}).then(res => { |
|
|
|
}).then(res => { |
|
|
|
if (res.code = 200 && res.data) { |
|
|
|
if (res.code = 200 && res.data) { |
|
|
|
details.renderList = res.data.records |
|
|
|
details.renderList = res.data.records |
|
|
|