Commit 205e3d15 by linjinhong

fix:修改问题

parent 3dcb6d83
...@@ -416,7 +416,7 @@ export default { ...@@ -416,7 +416,7 @@ export default {
isForcedProduction, isForcedProduction,
) { ) {
let imageResList = []; let imageResList = [];
console.log(431, designImagesCanvasJsonList);
this.showforcedProduc = false; this.showforcedProduc = false;
// 当adjustable有值时 直接赋值宽高 // 当adjustable有值时 直接赋值宽高
if ( if (
...@@ -443,18 +443,6 @@ export default { ...@@ -443,18 +443,6 @@ export default {
}); });
imageResList = Sres.data; imageResList = Sres.data;
console.log("imageResList", imageResList); console.log("imageResList", imageResList);
} else {
// designImagesCanvasJsonList.forEach((el) => {
// el.images.forEach((item) => {
// imageResList.push({
// productionFile: item,
// title: el.title,
// });
// });
// });
// for (let item of imageResList) {
// item.productionFile = await this.saveImgByUrl(item.productionFile);
// }
} }
} }
if (this.desktopDevice == 3) { if (this.desktopDevice == 3) {
...@@ -480,6 +468,15 @@ export default { ...@@ -480,6 +468,15 @@ export default {
return; return;
} }
} }
if (
(this.detail.productMark == "custom_part" &&
!this.detail.adjustable) ||
this.detail.productMark !== "custom_part"
) {
this.showforcedProduc = true;
this.dialogVisible = true;
return;
}
} }
// 根据生产单号查找 素材图片 下载到本地 然后返回本地地址去显示 // 根据生产单号查找 素材图片 下载到本地 然后返回本地地址去显示
...@@ -1202,7 +1199,7 @@ export default { ...@@ -1202,7 +1199,7 @@ export default {
style="font-size: 16px; line-height: 1.6; padding: 10px 0;font-weight: bold;color: #333;" style="font-size: 16px; line-height: 1.6; padding: 10px 0;font-weight: bold;color: #333;"
> >
<div v-if="showforcedProduc"> <div v-if="showforcedProduc">
此单素材于历史不规范素材,无法直接打印。请更换打印设备 此单素材于历史不规范素材,无法直接打印。请更换打印设备
</div> </div>
<div v-else> <div v-else>
<div> <div>
......
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