Ver código fonte

bug修改

master
yangpeilai 1 semana atrás
pai
commit
0c66cc3965

+ 38
- 54
src/views/inventoryControl/newInventory/allocationManagement/addOrUpdate.vue Ver arquivo

@@ -525,12 +525,10 @@ function onSuccess(response: any) {
BaseService.postN('/invw/api/transfer/import', {fileUrl: response.data.ossFilePath}).then((res: any) => {
if (res && res.code === 0) {
let bizContent = res.data;
let info = bizContent.transferDetails || "";
let data = bizContent.transferDetails
let newarr: any = []
data.forEach((column, index) => {

return newarr.push(
newarr.push(
{
startId: column.startId,
endId: column.endId,
@@ -538,16 +536,17 @@ function onSuccess(response: any) {
isShowBtn: false
}
);
nextTick(()=>{
handleApplyCount(column,index)
})
return newarr
})
addForm.value.detailList = newarr;
ElMessage.success(info)

ElMessage.success("导入成功")
} else {
ElMessage.error(res.message)
}

})

}

// 初始化还原数据
@@ -585,14 +584,14 @@ function validHandle(row: IObject, index) {
// successTotal: bizContent.successTotal,
// total: bizContent.total,
// }
// summary.value = true;
// addForm.value.detailList[index] = {
// ...addForm.value.detailList[index],
summary.value = true;
addForm.value.detailList[index] = {
...addForm.value.detailList[index],
// isShowBtn: true,
// failTotal: bizContent.failTotal,
// successTotal: bizContent.successTotal,
successTotal: row.count,
// total: bizContent.total,
// }
}
// let msg = `${bizContent.info}, 总数:${bizContent.total},成功:${bizContent.successTotal},失败:${bizContent.failTotal}`
ElMessage.success(res.message);
} else {
@@ -646,7 +645,6 @@ function addMoreHandle(row: IObject) {
addForm.value.detailList.push({
startId: "",
endId: "",
// warranty: "",
count: 0,
isShowBtn: false,
failTotal: 0,
@@ -835,8 +833,7 @@ function saveHandle() {

// 确认入库
function sureHandle() {
console.log(addForm.value, idex);

// console.log(addForm.value, idex);
if (idex) {
let params = {
id: idex
@@ -849,22 +846,6 @@ function sureHandle() {
emit("closeHandle");
ElMessage.success("确认入库成功");
clearData();
// let bizContent = res.data
// let url = bizContent.url || "";
// let fileName = bizContent.fileName ? `${bizContent.fileName}` : '初始设备入库明细'
// if (url) {
// //window.open(url)
// //处理下载有文件名
// BaseService.getDownloadFileName(import.meta.env.VITE_APP_UPLOAD_URL + url, fileName)
// btnLoding.value = false;
// clearData();
// emit("refreshDataList");
// emit("closeHandle");
// ElMessage.success("确认入库成功");
// } else {
// ElMessage.error("入库成功文件未返回");
// }

} else {
btnLoding.value = false;
ElMessage.error(res.message);
@@ -875,24 +856,22 @@ function sureHandle() {

// 计算conut
function handleApplyCount(row: IObject, index) {
let startId = row.startId;
let endId = row.endId;
let inventoryType = addForm.value.inventoryType;
let num = 0;
if (inventoryType === 'CARD' && startId && endId) {
let start: any = startId.toString().slice(3);
let end: any = endId.toString().slice(3);
let tem = bigNumSub(end, start);
num = bigNumAdd(tem, '1');
} else if (inventoryType === 'OBU' && startId && endId) {
let tem = bigNumSub(endId, startId);
num = bigNumAdd(tem, '1');
}
//解决合计刷新
let receiveVoValue = cloneDeep(addForm.value.detailList);
receiveVoValue[index].count = num;
addForm.value.detailList = receiveVoValue;
if(row.startId.length == row.endId.length && (row.startId.length == 20 || row.startId.length == 16)) {
let startId = row.startId;
let endId = row.endId;
let num = 0;
if (startId && endId) {
let start: any = startId.toString();
let end: any = endId.toString();
let tem = bigNumSub(end, start);
num = bigNumAdd(tem, '1');
}

//解决合计刷新
let receiveVoValue = cloneDeep(addForm.value.detailList);
receiveVoValue[index].count = num;
addForm.value.detailList = receiveVoValue;
}
}

// 合并合计行
@@ -912,6 +891,7 @@ function arraySpanMethod({row, column, rowIndex, columnIndex}) {
// 合计行计算
function getSummaries(param) {
//table自定义合计行方法summary-method
// console.log("====>",param)
const {columns, data} = param;
const sums: any = [];
columns.forEach((column, index) => {
@@ -931,12 +911,16 @@ function getSummaries(param) {
if (sums[1]) {
str = `共${data.length}号段,${sums[1]}个设备`;
if (summary.value) {
console.log(data, '-----');
const successTotal = data.map((item) => Number(item.successTotal));
let totalNum = sums[1] = successTotal.reduce((prev, curr) => {
return prev + curr
}, 0)
str = str + '已校验可入库数量' + totalNum
// console.log(data, '-----');
// 计算 successTotal 总和(自动过滤无效值)
const totalNum = data.reduce((sum, item) => {
const num = Number(item.successTotal);
return sum + (isNaN(num) ? 0 : num);
}, 0);

// 更新 sums 和字符串(避免直接修改外部变量)
sums[1] = totalNum;
str = str + ',已校验可入库数量' + totalNum
}
}
sums[1] = str;

Carregando…
Cancelar
Salvar