生产补料验证
This commit is contained in:
@@ -138,6 +138,7 @@
|
||||
state.locationData = obj.locationData
|
||||
if (state.warehouseData.FIsOpenLocation) {
|
||||
state.NoLocationList = true
|
||||
|
||||
state.NoLocationListText = t('index.ksmcw')
|
||||
} else {
|
||||
state.NoLocationList = false
|
||||
@@ -167,29 +168,28 @@
|
||||
//首次数据校验&修正
|
||||
const dataValidation = () => {
|
||||
//批号校验
|
||||
if (state.receiveBillScanData.FIsBatchManage === 'True') {
|
||||
if (state.scanFrame.batchNumberStr !== '' && state.scanFrame.batchNumberStr !== state.receiveBillScanData.FLot_Text) {
|
||||
state.show = true
|
||||
uni.showModal({
|
||||
title: t('index.ts'), content: '与默认批号不同,是否替换新的批号', cancelText: '取消', confirmText: '替换',
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text
|
||||
} else if (res.cancel) {
|
||||
console.log('用户点击取消');
|
||||
}
|
||||
}
|
||||
});
|
||||
} else if (state.scanFrame.batchNumberStr == '') {
|
||||
state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text
|
||||
}
|
||||
} else {
|
||||
state.scanFrame.batchNumberStr = '',
|
||||
state.batchNumberStrState = true
|
||||
state.batchNumberStrPdr = '批号未启用'
|
||||
}
|
||||
|
||||
|
||||
// if (state.receiveBillScanData.FIsBatchManage === 'True') {
|
||||
// if (state.scanFrame.batchNumberStr !== '' && state.scanFrame.batchNumberStr !== state.receiveBillScanData.FLot_Text) {
|
||||
// state.show = true
|
||||
// uni.showModal({
|
||||
// title: t('index.ts'), content: '与默认批号不同,是否替换新的批号', cancelText: '取消', confirmText: '替换',
|
||||
// success(res) {
|
||||
// if (res.confirm) {
|
||||
// state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text
|
||||
// } else if (res.cancel) {
|
||||
// console.log('用户点击取消');
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// } else if (state.scanFrame.batchNumberStr == '') {
|
||||
// state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text
|
||||
// }
|
||||
// } else {
|
||||
// state.scanFrame.batchNumberStr = ''
|
||||
// state.batchNumberStrState = true
|
||||
// state.batchNumberStrPdr = '批号未启用'
|
||||
// }
|
||||
state.scanFrame.batchNumberStr = state.receiveBillScanData.FLot_Text
|
||||
//仓库校验
|
||||
if (Object.keys(state.warehouseData).length !== 0 && Object.keys(state.receiveBillScanData.StockId).length !== 0) {
|
||||
console.log('断点1');
|
||||
@@ -214,6 +214,7 @@
|
||||
FNAME: formatLangTextValue(state.receiveBillScanData.StockId.Name),
|
||||
FNUMBER: state.receiveBillScanData.StockId.Number,
|
||||
FSTOCKID: state.receiveBillScanData.StockId.Id,
|
||||
|
||||
}
|
||||
if (state.warehouseData.FIsOpenLocation) {
|
||||
state.NoLocationList = true
|
||||
@@ -232,7 +233,6 @@
|
||||
}
|
||||
state.scanFrame.articlesStr = state.receiveBillScanData.MaterialNumber
|
||||
state.scanFrame.barCodeStr = state.receiveBillScanData.queryString
|
||||
|
||||
//如果开启了异常弹出,则自动返回数据
|
||||
if (!state.receiveBillScanData.scanFrameShowSate && !state.show) {
|
||||
if (dataVerifyFun()) {
|
||||
@@ -247,7 +247,7 @@
|
||||
eimts('confirmation', { ...state.scanFrame, warehouseData: state.warehouseData, locationData: state.locationData || {}, id: state.receiveBillScanData.Id })
|
||||
dataErase()
|
||||
state.show = false
|
||||
eimts('boxShow',state.show)
|
||||
eimts('boxShow', state.show)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -302,11 +302,11 @@
|
||||
*/
|
||||
const close = () => {
|
||||
state.show = false
|
||||
console.log('===================<><><><><><>=====================',state.show);
|
||||
eimts('boxShow',state.show)
|
||||
console.log('===================<><><><><><>=====================', state.show);
|
||||
eimts('boxShow', state.show)
|
||||
}
|
||||
const open = () => {
|
||||
eimts('boxShow',state.show)
|
||||
const open = () => {
|
||||
eimts('boxShow', state.show)
|
||||
} //待使用
|
||||
const stateShow = (val : boolean) => { state.show = val }
|
||||
|
||||
@@ -321,7 +321,6 @@
|
||||
}
|
||||
const warehouseDataFun = (item : any) => {
|
||||
state.warehouseData = item
|
||||
console.log(item);
|
||||
state.scanFrame.warehouseStr = item.FNAME
|
||||
state.warehouse = false
|
||||
state.locationData = {}
|
||||
|
||||
Reference in New Issue
Block a user