Commit 1fa9964a by linjinhong

fix:修改强制生产多面情况

parent 2d7e7247
......@@ -175,10 +175,12 @@ export default {
return res.json(data);
}
console.log("data", data);
let path, processDesign;
let path, processDesign, processDesignA, processDesignB;
if (data.data) {
path = data.data.path;
processDesign = data.data.processDesign;
processDesignA = data.data.processDesignA;
processDesignB = data.data.processDesignB;
} else {
path = data.message;
}
......@@ -194,7 +196,11 @@ export default {
const downloadFunc =
params.device === 2 ? downloadOtherImage : downloadImage;
const result = await downloadFunc(files, processDesign);
const result = await downloadFunc(files, {
processDesign,
processDesignA,
processDesignB,
});
console.log("result200", result);
res.json({ code: 200, data: result });
......
......@@ -141,17 +141,27 @@ export const downloadImage = (list, isForcedProduction) => {
if (isArchive) {
// 处理压缩文件
item.list = await zip(filePath, dirPath);
if (Object.keys(isForcedProduction).length > 0) {
item.list = item.list.map((el) => {
if (el.designId.includes("A")) {
el.isForcedProduction = isForcedProduction.processDesignA;
} else if (el.designId.includes("B")) {
el.isForcedProduction = isForcedProduction.processDesignB;
}
return { ...el };
});
}
console.log("list", item.list);
} else {
// 处理普通图片文件
if (!item.list) item.list = [];
const originalName = item.url.split("/").pop();
if (isForcedProduction) {
if (isForcedProduction.processDesign) {
item.list.push({
fileName,
productionFile: filePath,
designId: originalName.split("_GCPS")[0],
isForcedProduction: isForcedProduction,
isForcedProduction: isForcedProduction.processDesign,
});
} else {
item.list.push({
......
......@@ -1829,16 +1829,16 @@ export default {
<b
style="color:#f2e403"
v-if="
selectImgList.some((el) => el.isForcedProduction) &&
selectImgList.length
selectImgList.length &&
selectImgList[selectImgIndex].isForcedProduction
"
>该生产单素材已经被强制调整适配台版大小,请关注</b
>
<b
style="color:green"
v-if="
!selectImgList.some((el) => el.isForcedProduction) &&
selectImgList.length
selectImgList.length &&
!selectImgList[selectImgIndex].isForcedProduction
"
>该单无需拖动设计,直接打印</b
>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment