yangchunlong/orico-supplier-ts-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 🧩 修复装箱模块序列号拦截提示语

Browse Source
This commit is contained in:
yangchunlong
2025-06-04 09:50:19 +08:00
parent c5646c9b3c
commit 06d168f90b
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/supplier/code/boxCode/index.vue
View File

@@ -299,7 +299,9 @@ const handleBeforeClose = async () => {
if (!item.isOldData) {
let obj = {
materialNumber: item.materialNumber,
serialNumber: item.serialNumber // item.isNumber ? item.numberCode : item.serialNumber
serialNumber: item.isNumber ? item.numberCode : item.serialNumber,
twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : ""
// twoNumberCode: item?.twoNumberCode ? item?.twoNumberCode : ""
};
newParamsArray.push(obj);
}
@@ -348,6 +350,7 @@ const isNumeric = (str: any) => {
const handleKeyupEnterInputValue = async (params: any) => {
const { item, index } = params;
const { orgCode } = userStore;
//获取用户输入的序列号(数字序列号)
let serialNumber = datas.formTableData[index][item.prop];
if (!serialNumber) {
msgHtml("序列号不能为空,请输入序列号 !");
@@ -377,25 +380,19 @@ const handleKeyupEnterInputValue = async (params: any) => {
let length = datas.formTableData.length;
for (let i = 0; i < length; i++) {
//判断当前序列号是否已经扫描过
if (
(i !== index && datas.formTableData[i].serialNumber === data.serialNumber) ||
datas.formTableData[i].twoSerialNumber === data.serialNumber
) {
// (i !== index && datas.formTableData[i].serialNumber === data.serialNumber) ||
// datas.formTableData[i].twoSerialNumber === data.serialNumber ||
// datas.formTableData[i].suitNumber === data.suitNumber)
//判断当前序列号是否已经扫描过
if (i !== index && datas.formTableData[i].suitNumber === data.suitNumber) {
datas.formTableData[index]["serialNumber"] = "";
formTableRef.value.inputElement[index].focus();
msgHtml("此序列号已扫描,无需再次扫描 !");
return;
}
}
//twoSerialNumber
// for (let i = 0; i < length; i++) {
// if (i !== index && datas.formTableData[i].twoSerialNumber === data.serialNumber) {
// datas.formTableData[index]["serialNumber"] = "";
// formTableRef.value.inputElement[index].focus();
// msgHtml("此序列号已扫描,无需再次扫描 !");
// return;
// }
// }
//判断是不是数字序列号,如果是数字序列号的话就传数字序列号
data.isNumber = isNumeric(serialNumber);
//当前行复制

4
src/views/supplier/code/boxCode/init/save.ts
View File

@@ -53,8 +53,8 @@ export const initSave = (datas: any, type: any, formTableRef: any, refInput: any
if (!item.isOldData) {
let obj = {
materialNumber: item.materialNumber,
serialNumber: item.serialNumber, // item.isNumber ? item.numberCode : item.serialNumber
twoSerialNumber: item.twoSerialNumber ? item.twoSerialNumber : ""
serialNumber: item.isNumber ? item.numberCode : item.serialNumber,
twoSerialNumber: item?.twoSerialNumber ? item?.twoSerialNumber : ""
};
newParamsArray.push(obj);
}