Skip to content

E
electron-printer
Commit ad42f0fe by linjinhong
Options

fix：修改黄点模提示

parent 5befc9f7
Showing with 30 additions and 15 deletions
src/views/design/head/index.vue
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
if ( if (
!this.checked && !this.checked &&
this.detail.diyId && this.detail.diyId &&
this.detail.adjustable && this.detail.adjustable == 1 &&
designImagesCanvasJsonList && designImagesCanvasJsonList &&
this.desktopDevice !== 3 this.desktopDevice !== 3
) { ) {
...@@ -461,7 +461,20 @@ export default { ...@@ -461,7 +461,20 @@ export default {
if (designImagesCanvasJsonList) { if (designImagesCanvasJsonList) {
designImagesCanvasJsonList = JSON.parse(designImagesCanvasJsonList); designImagesCanvasJsonList = JSON.parse(designImagesCanvasJsonList);
// 惠立彩 带黄点摸的订单直接展示错误弹窗 // 惠立彩 带黄点摸的订单直接展示错误弹窗
if (!designImagesCanvasJsonList[0].images) { if (
this.detail.productMark == "custom_part" &&
this.detail.adjustable == 1 &&
!designImagesCanvasJsonList[0].images
) {
this.showforcedProduc = true;
this.dialogVisible = true;
return;
}
if (
(this.detail.productMark == "custom_part" &&
this.detail.adjustable == 0) ||
this.detail.productMark !== "custom_part"
) {
this.showforcedProduc = true; this.showforcedProduc = true;
this.dialogVisible = true; this.dialogVisible = true;
return; return;
...@@ -530,7 +543,7 @@ export default { ...@@ -530,7 +543,7 @@ export default {
if ( if (
this.detail.mssWidth && this.detail.mssWidth &&
this.detail.adjustable && this.detail.adjustable == 1 &&
this.detail.mssHeight this.detail.mssHeight
) { ) {
obj.size = { obj.size = {
...@@ -1188,15 +1201,17 @@ export default { ...@@ -1188,15 +1201,17 @@ export default {
<div <div
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 style=" "> 此单素材屈于历史不规范素材，无法直接打印。请更换打印设备
素材效果已经超出台版范围，无法直接打印。
请更换打印设备，或者进行强制生产
</div> </div>
<div v-else>
<!-- 备注：灰色+小字号，弱化处理 --> <div>
<div style=""> 素材效果已经超出台版范围，无法直接打印。
注:“自动强制生产”会让每次生产都强制生产 请更换打印设备，或者进行强制生产
</div>
<div>
注:“自动强制生产”会让每次生产都强制生产
</div>
</div> </div>
</div> </div>
......
src/views/design/main/index.vue
...@@ -533,7 +533,7 @@ export default { ...@@ -533,7 +533,7 @@ export default {
let size = null; let size = null;
if ( if (
this.detail.mssWidth && this.detail.mssWidth &&
this.detail.adjustable && this.detail.adjustable == 1 &&
this.detail.mssHeight this.detail.mssHeight
) { ) {
size = { size = {
...@@ -1286,7 +1286,7 @@ export default { ...@@ -1286,7 +1286,7 @@ export default {
if ( if (
this.detail && this.detail &&
this.detail.mssWidth && this.detail.mssWidth &&
this.detail.adjustable && this.detail.adjustable == 1 &&
this.detail.mssHeight this.detail.mssHeight
) { ) {
this.detail.designImageSize = { this.detail.designImageSize = {
...@@ -1792,7 +1792,7 @@ export default { ...@@ -1792,7 +1792,7 @@ export default {
v-if=" v-if="
productMark == 'custom_part' && productMark == 'custom_part' &&
selectImgList.length && selectImgList.length &&
detail.adjustable && detail.adjustable == 1 &&
!isOver && !isOver &&
!isMove && !isMove &&
!selectImgList.some((el) => el.isCut) && !selectImgList.some((el) => el.isCut) &&
...@@ -1806,7 +1806,7 @@ export default { ...@@ -1806,7 +1806,7 @@ export default {
:style="{ left: isView ? '' : '6%' }" :style="{ left: isView ? '' : '6%' }"
v-if=" v-if="
productMark == 'custom_part' && productMark == 'custom_part' &&
detail.adjustable && detail.adjustable == 1 &&
selectImgList.length && selectImgList.length &&
!selectImgList.some((el) => el.isCut) && !selectImgList.some((el) => el.isCut) &&
isOver && isOver &&
......
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