|
|
|
@ -53,6 +53,7 @@ |
|
|
|
<!-- 控件 --> |
|
|
|
<!-- 控件 --> |
|
|
|
<view class="control"> |
|
|
|
<view class="control"> |
|
|
|
<view class="button" @click="showControl = true" v-show="!showControl">批量操作</view> |
|
|
|
<view class="button" @click="showControl = true" v-show="!showControl">批量操作</view> |
|
|
|
|
|
|
|
<view class="button" @click="grounding" v-show="!showControl">添加物料</view> |
|
|
|
<template v-if="showControl"> |
|
|
|
<template v-if="showControl"> |
|
|
|
<view class="button" @click="handleInvertSelection">反选</view> |
|
|
|
<view class="button" @click="handleInvertSelection">反选</view> |
|
|
|
|
|
|
|
|
|
|
|
@ -233,7 +234,8 @@ |
|
|
|
pcontractQuestDetailList, |
|
|
|
pcontractQuestDetailList, |
|
|
|
getWarehouseUpdateQuestDetail, |
|
|
|
getWarehouseUpdateQuestDetail, |
|
|
|
postqueryupdateQuestDetailAllocation, |
|
|
|
postqueryupdateQuestDetailAllocation, |
|
|
|
getWarehouseDeleteQuestDetail |
|
|
|
getWarehouseDeleteQuestDetail, |
|
|
|
|
|
|
|
getWarehouseSaveNewQuestDetail |
|
|
|
} from '@/api/user.js'; |
|
|
|
} from '@/api/user.js'; |
|
|
|
import utils from '@/utils/utils.js'; |
|
|
|
import utils from '@/utils/utils.js'; |
|
|
|
|
|
|
|
|
|
|
|
@ -284,6 +286,8 @@ |
|
|
|
'', |
|
|
|
'', |
|
|
|
'red' |
|
|
|
'red' |
|
|
|
], |
|
|
|
], |
|
|
|
|
|
|
|
marketName: [], |
|
|
|
|
|
|
|
goodsType: '' |
|
|
|
}) |
|
|
|
}) |
|
|
|
const infos = ref({})//路由传入进来的参数 |
|
|
|
const infos = ref({})//路由传入进来的参数 |
|
|
|
// 定制品 |
|
|
|
// 定制品 |
|
|
|
@ -365,6 +369,7 @@ |
|
|
|
// 页面初始化执行回调 |
|
|
|
// 页面初始化执行回调 |
|
|
|
onLoad((info) => { |
|
|
|
onLoad((info) => { |
|
|
|
infos.value = info |
|
|
|
infos.value = info |
|
|
|
|
|
|
|
details.marketName = JSON.parse(info.marketName) |
|
|
|
console.log(info, 'infos=========='); |
|
|
|
console.log(info, 'infos=========='); |
|
|
|
Tjinfo()//初始化请求数据 |
|
|
|
Tjinfo()//初始化请求数据 |
|
|
|
}) |
|
|
|
}) |
|
|
|
@ -390,38 +395,38 @@ |
|
|
|
// 触底加载 |
|
|
|
// 触底加载 |
|
|
|
function reachBottomInitPage() { |
|
|
|
function reachBottomInitPage() { |
|
|
|
// 数据请求完毕, 不再请求 |
|
|
|
// 数据请求完毕, 不再请求 |
|
|
|
if (option.isEnd) { |
|
|
|
// if (option.isEnd) { |
|
|
|
return uni.showToast({ |
|
|
|
// return uni.showToast({ |
|
|
|
icon: 'success', |
|
|
|
// icon: 'success', |
|
|
|
title: '数据已加载完毕' |
|
|
|
// title: '数据已加载完毕' |
|
|
|
}) |
|
|
|
// }) |
|
|
|
} |
|
|
|
// } |
|
|
|
if (antiShake) { |
|
|
|
// if (antiShake) { |
|
|
|
uni.hideLoading() |
|
|
|
// uni.hideLoading() |
|
|
|
// 清空定时器 |
|
|
|
// // 清空定时器 |
|
|
|
clearTimeout(antiShake) |
|
|
|
// clearTimeout(antiShake) |
|
|
|
return antiShake = null |
|
|
|
// return antiShake = null |
|
|
|
} |
|
|
|
// } |
|
|
|
// 显示Loading, 并阻止点击屏幕 |
|
|
|
// // 显示Loading, 并阻止点击屏幕 |
|
|
|
uni.showLoading({ |
|
|
|
// uni.showLoading({ |
|
|
|
title: '正在加载', |
|
|
|
// title: '正在加载', |
|
|
|
mask: true |
|
|
|
// mask: true |
|
|
|
}) |
|
|
|
// }) |
|
|
|
antiShake = setTimeout(async () => { |
|
|
|
// antiShake = setTimeout(async () => { |
|
|
|
// 触底请求 |
|
|
|
// // 触底请求 |
|
|
|
console.log('触底') |
|
|
|
// console.log('触底') |
|
|
|
// 定制品 |
|
|
|
// // 定制品 |
|
|
|
if (tabBarCode.value === 1) { Tjinfo() } |
|
|
|
// if (tabBarCode.value === 1) { Tjinfo() } |
|
|
|
// 零担 |
|
|
|
// // 零担 |
|
|
|
if (tabBarCode.value === 2) { Tjinfo() } |
|
|
|
// if (tabBarCode.value === 2) { Tjinfo() } |
|
|
|
// 库存品 |
|
|
|
// // 库存品 |
|
|
|
if (tabBarCode.value === 3) { Tjinfo() } |
|
|
|
// if (tabBarCode.value === 3) { Tjinfo() } |
|
|
|
|
|
|
|
|
|
|
|
// 关闭Loading效果 |
|
|
|
// // 关闭Loading效果 |
|
|
|
uni.hideLoading() |
|
|
|
// uni.hideLoading() |
|
|
|
// 清空定时器 |
|
|
|
// // 清空定时器 |
|
|
|
antiShake = null |
|
|
|
// antiShake = null |
|
|
|
}, 1000) |
|
|
|
// }, 1000) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 请求页面数据 |
|
|
|
// 请求页面数据 |
|
|
|
@ -436,12 +441,20 @@ |
|
|
|
|
|
|
|
|
|
|
|
// 公共判断 |
|
|
|
// 公共判断 |
|
|
|
function Tjinfo() { |
|
|
|
function Tjinfo() { |
|
|
|
pcontractQuestDetailList({ |
|
|
|
const FormData = { |
|
|
|
warehouseId: infos.value.warehouseId, |
|
|
|
warehouseId: infos.value.warehouseId, |
|
|
|
taskId: infos.value.taskId, |
|
|
|
taskId: infos.value.taskId, |
|
|
|
orderId: infos.value.orderId, |
|
|
|
orderCode: infos.value.orderCode, |
|
|
|
isInventory: infos.value.isInventory |
|
|
|
isInventory: infos.value.isInventory |
|
|
|
}).then(res => { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log('infos :>> ', infos); |
|
|
|
|
|
|
|
if (infos.value.isInventory === '1') { |
|
|
|
|
|
|
|
FormData.orderCode = infos.value.martialCode |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
pcontractQuestDetailList(FormData).then(res => { |
|
|
|
console.log(res); |
|
|
|
console.log(res); |
|
|
|
// 库存品 |
|
|
|
// 库存品 |
|
|
|
if (res.data.isInventory == 1) { |
|
|
|
if (res.data.isInventory == 1) { |
|
|
|
@ -464,6 +477,9 @@ |
|
|
|
article.finishNum = res.data.unTotal//已盘数 |
|
|
|
article.finishNum = res.data.unTotal//已盘数 |
|
|
|
details.renderList = res.data.packagelistVOList |
|
|
|
details.renderList = res.data.packagelistVOList |
|
|
|
details.checkList = details.renderList.map(() => false) |
|
|
|
details.checkList = details.renderList.map(() => false) |
|
|
|
|
|
|
|
if (stock.isInventory === 1) details.goodsType = '库存品' |
|
|
|
|
|
|
|
else if (zero.isZero === 1) details.goodsType = '零担' |
|
|
|
|
|
|
|
else details.goodsType = '定制品' |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -492,9 +508,38 @@ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 扫描后执行的回调 |
|
|
|
// 扫描后执行的回调 |
|
|
|
function scandata() { |
|
|
|
async function scandata() { |
|
|
|
details.isScan = true |
|
|
|
if (details.goodsType !== '定制品') return |
|
|
|
Tjinfo() |
|
|
|
details.scancode |
|
|
|
|
|
|
|
const flag = details.renderList.find(val => val.orderPackageCode === details.scancode) |
|
|
|
|
|
|
|
console.log('flag :>> ', flag); |
|
|
|
|
|
|
|
// 当包件存在 |
|
|
|
|
|
|
|
if (flag) { |
|
|
|
|
|
|
|
const questDetailList = [{ |
|
|
|
|
|
|
|
id: flag.questDetailId, |
|
|
|
|
|
|
|
// 在库数 |
|
|
|
|
|
|
|
stockNum: flag.quantity, |
|
|
|
|
|
|
|
// 丢失 |
|
|
|
|
|
|
|
lossNum: 0, |
|
|
|
|
|
|
|
// 配送 |
|
|
|
|
|
|
|
deliveNum: 0, |
|
|
|
|
|
|
|
// 破损 |
|
|
|
|
|
|
|
wornNum: 0, |
|
|
|
|
|
|
|
// 不可修复 |
|
|
|
|
|
|
|
noRepairNum: 0, |
|
|
|
|
|
|
|
// 未入库 |
|
|
|
|
|
|
|
noReceivedNum: 0, |
|
|
|
|
|
|
|
}] |
|
|
|
|
|
|
|
const res = await getWarehouseUpdateQuestDetail({ questDetailList, questId: infos.value.taskId }) |
|
|
|
|
|
|
|
const { code, msg } = res |
|
|
|
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
|
|
|
if (code === 200) { |
|
|
|
|
|
|
|
Tjinfo() |
|
|
|
|
|
|
|
utils.ttsspke(msg) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
grounding() |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 改变选项卡激活状态 |
|
|
|
// 改变选项卡激活状态 |
|
|
|
@ -856,6 +901,126 @@ |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 新增物料 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
function grounding() { |
|
|
|
|
|
|
|
const marketName = Array.from(details.marketName) |
|
|
|
|
|
|
|
console.log('marketName :>> ', marketName); |
|
|
|
|
|
|
|
let goodsType = details.goodsType |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tiplists.value.setdetails({ |
|
|
|
|
|
|
|
title: '新增', |
|
|
|
|
|
|
|
isshow: true, |
|
|
|
|
|
|
|
tipstate: 5, |
|
|
|
|
|
|
|
upform: { |
|
|
|
|
|
|
|
article: { |
|
|
|
|
|
|
|
// 合同号 |
|
|
|
|
|
|
|
contractNumber: '', |
|
|
|
|
|
|
|
// 包条码 |
|
|
|
|
|
|
|
orderPackageCode: details.scancode |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
stock: {} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
marketName, |
|
|
|
|
|
|
|
// goodsType: '库存品', |
|
|
|
|
|
|
|
goodsType, |
|
|
|
|
|
|
|
confirmTxt: '确认新增', |
|
|
|
|
|
|
|
isonecheck: true, |
|
|
|
|
|
|
|
success: async (deta) => { |
|
|
|
|
|
|
|
let submitData : any = {} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (goodsType === '定制品') submitData = articleAdd(deta) |
|
|
|
|
|
|
|
if (goodsType === '零担') { |
|
|
|
|
|
|
|
uni.showToast({ |
|
|
|
|
|
|
|
title: '功能还在开发中' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
tiplists.value.setdetails({ isshow: false }) |
|
|
|
|
|
|
|
return submitData = zeroAdd(deta) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (goodsType === '库存品') submitData = stockAdd(deta) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const res = await getWarehouseSaveNewQuestDetail(submitData) |
|
|
|
|
|
|
|
console.log('res :>> ', res); |
|
|
|
|
|
|
|
const { code } = res |
|
|
|
|
|
|
|
if (code === 200) { |
|
|
|
|
|
|
|
Tjinfo() |
|
|
|
|
|
|
|
uni.showToast({ |
|
|
|
|
|
|
|
title: '操作成功', |
|
|
|
|
|
|
|
icon: 'success' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
tiplists.value.setdetails({ isshow: false }) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
cancel: () => { |
|
|
|
|
|
|
|
tiplists.value.setdetails({ isshow: false }) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
close: () => { |
|
|
|
|
|
|
|
tiplists.value.setdetails({ isshow: false }) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 定制品添加 |
|
|
|
|
|
|
|
function articleAdd(deta) { |
|
|
|
|
|
|
|
const { upform: { article: { contractNumber, orderPackageCode } } } = deta |
|
|
|
|
|
|
|
if (!contractNumber) return uni.showToast({ |
|
|
|
|
|
|
|
title: '请输入合同号', |
|
|
|
|
|
|
|
icon: 'none' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!orderPackageCode) return uni.showToast({ |
|
|
|
|
|
|
|
title: '请输入或扫描包条码', |
|
|
|
|
|
|
|
icon: 'none' |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const submitData = { |
|
|
|
|
|
|
|
questDetail: { |
|
|
|
|
|
|
|
ordePackageCode: orderPackageCode, |
|
|
|
|
|
|
|
orderCode: contractNumber, |
|
|
|
|
|
|
|
stockNum: 1, |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
orderCode: article.allocationCode, |
|
|
|
|
|
|
|
questTarget: 1, |
|
|
|
|
|
|
|
questType: 3, |
|
|
|
|
|
|
|
questId: infos.value.taskId, |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return submitData |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 零担添加 |
|
|
|
|
|
|
|
function zeroAdd(deta) { } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 库存品添加 |
|
|
|
|
|
|
|
function stockAdd(deta) { |
|
|
|
|
|
|
|
console.log('deta :>> ', deta); |
|
|
|
|
|
|
|
const { upform: { stock: { orderCode, stockNum, marketName, incomingBatch } } } = deta |
|
|
|
|
|
|
|
// if (!contractNumber) return uni.showToast({ |
|
|
|
|
|
|
|
// title: '请输入合同号', |
|
|
|
|
|
|
|
// icon: 'none' |
|
|
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if (!orderPackageCode) return uni.showToast({ |
|
|
|
|
|
|
|
// title: '请输入或扫描包条码', |
|
|
|
|
|
|
|
// icon: 'none' |
|
|
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
console.log('data :>> ', deta); |
|
|
|
|
|
|
|
const submitData = { |
|
|
|
|
|
|
|
questDetail: { |
|
|
|
|
|
|
|
orderCode: orderCode, |
|
|
|
|
|
|
|
stockNum: stockNum, |
|
|
|
|
|
|
|
marketName, |
|
|
|
|
|
|
|
incomingBatch |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
orderCode: article.allocationCode, |
|
|
|
|
|
|
|
questTarget: 3, |
|
|
|
|
|
|
|
questType: 3, |
|
|
|
|
|
|
|
questId: infos.value.taskId, |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return submitData |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// watch([articleList, zeroList, stockList, tabBarCode], () => { |
|
|
|
// watch([articleList, zeroList, stockList, tabBarCode], () => { |
|
|
|
// // 定制品 |
|
|
|
// // 定制品 |
|
|
|
// if (tabBarCode.value === 1) { |
|
|
|
// if (tabBarCode.value === 1) { |
|
|
|
|
