Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
electron-printer
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhuzhequan
electron-printer
Commits
0b16d3ff
Commit
0b16d3ff
authored
May 07, 2026
by
wusiyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 添加客户保存记录ID展示 #1004396
parent
1a3ca431
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
85 additions
and
77 deletions
+85
-77
src/views/design/main/index.vue
+85
-77
No files found.
src/views/design/main/index.vue
View file @
0b16d3ff
...
@@ -21,14 +21,14 @@ const {
...
@@ -21,14 +21,14 @@ const {
getLocation
,
getLocation
,
getOrderInfoMap
,
getOrderInfoMap
,
setOrderInfo
,
setOrderInfo
,
clearMaxLimitRecord
,
clearMaxLimitRecord
}
=
require
(
"@/server/utils/store"
);
}
=
require
(
"@/server/utils/store"
);
export
default
{
export
default
{
components
:
{
components
:
{
PrintDialog
,
PrintDialog
,
VueDragResizeRotate
,
VueDragResizeRotate
,
ImgSetting
,
ImgSetting
},
},
props
:
{
factoryType
:
{
type
:
String
,
default
:
"CN"
}
},
props
:
{
factoryType
:
{
type
:
String
,
default
:
"CN"
}
},
destroyed
()
{
destroyed
()
{
...
@@ -76,7 +76,7 @@ export default {
...
@@ -76,7 +76,7 @@ export default {
v
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
value
,
v
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
value
,
h
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
h
,
h
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
h
,
row
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
row
,
row
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
row
,
col
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
col
,
col
:
this
.
grid
[
this
.
systemSetting
.
gridValue
].
col
};
};
},
},
gridSpacing
()
{
gridSpacing
()
{
...
@@ -86,7 +86,7 @@ export default {
...
@@ -86,7 +86,7 @@ export default {
if
(
unit
===
"mm"
)
{
if
(
unit
===
"mm"
)
{
return
{
return
{
w
:
gridSpacing
+
"px"
,
w
:
gridSpacing
+
"px"
,
h
:
gridSpacing
+
"px"
,
h
:
gridSpacing
+
"px"
};
};
}
else
if
(
unit
===
"inch"
)
{
}
else
if
(
unit
===
"inch"
)
{
let
w
=
this
.
grid
[
this
.
systemSetting
.
gridValue
].
w
;
let
w
=
this
.
grid
[
this
.
systemSetting
.
gridValue
].
w
;
...
@@ -96,7 +96,7 @@ export default {
...
@@ -96,7 +96,7 @@ export default {
return
{
return
{
// w: gridSpacing * ((w - row + 1) / row) + "px",
// w: gridSpacing * ((w - row + 1) / row) + "px",
w
:
gridSpacing
*
(
w
/
row
)
+
"px"
,
w
:
gridSpacing
*
(
w
/
row
)
+
"px"
,
h
:
gridSpacing
*
(
h
/
col
)
+
"px"
,
h
:
gridSpacing
*
(
h
/
col
)
+
"px"
};
};
}
}
return
{
w
:
"480px"
,
h
:
"540px"
};
return
{
w
:
"480px"
,
h
:
"540px"
};
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
if
(
unit
===
"mm"
)
{
if
(
unit
===
"mm"
)
{
return
{
return
{
w
:
gridSpacing
+
"px"
,
w
:
gridSpacing
+
"px"
,
h
:
gridSpacing
+
"px"
,
h
:
gridSpacing
+
"px"
};
};
}
else
if
(
unit
===
"inch"
)
{
}
else
if
(
unit
===
"inch"
)
{
let
w
=
480
;
let
w
=
480
;
...
@@ -117,7 +117,7 @@ export default {
...
@@ -117,7 +117,7 @@ export default {
let
h
=
540
;
let
h
=
540
;
return
{
return
{
w
:
gridSpacing
*
(
w
/
row
)
+
"px"
,
w
:
gridSpacing
*
(
w
/
row
)
+
"px"
,
h
:
gridSpacing
*
(
h
/
col
)
+
"px"
,
h
:
gridSpacing
*
(
h
/
col
)
+
"px"
};
};
}
}
return
{
w
:
"480px"
,
h
:
"540px"
};
return
{
w
:
"480px"
,
h
:
"540px"
};
...
@@ -157,8 +157,8 @@ export default {
...
@@ -157,8 +157,8 @@ export default {
"windowWH"
,
"windowWH"
,
"countryList"
,
"countryList"
,
"desktoVersion"
,
"desktoVersion"
,
"orderType"
,
"orderType"
])
,
])
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -176,7 +176,7 @@ export default {
...
@@ -176,7 +176,7 @@ export default {
"hsva(120, 40, 94, 0.5)"
,
"hsva(120, 40, 94, 0.5)"
,
"hsl(181, 100%, 37%)"
,
"hsl(181, 100%, 37%)"
,
"hsla(209, 100%, 56%, 0.73)"
,
"hsla(209, 100%, 56%, 0.73)"
,
"#c7158577"
,
"#c7158577"
],
],
actionList
:
[],
actionList
:
[],
checkList
:
[],
checkList
:
[],
...
@@ -229,7 +229,7 @@ export default {
...
@@ -229,7 +229,7 @@ export default {
isMove
:
false
,
isMove
:
false
,
isOver
:
false
,
isOver
:
false
,
dialogVisible
:
false
,
dialogVisible
:
false
,
isForcedProduction
:
false
,
isForcedProduction
:
false
};
};
},
},
watch
:
{
watch
:
{
...
@@ -237,7 +237,7 @@ export default {
...
@@ -237,7 +237,7 @@ export default {
async
handler
()
{
async
handler
()
{
this
.
$store
.
commit
(
"changeImgList"
,
this
.
imgList
);
this
.
$store
.
commit
(
"changeImgList"
,
this
.
imgList
);
},
},
deep
:
true
,
deep
:
true
// immediate: true,
// immediate: true,
},
},
selectIndex
(
val
)
{
selectIndex
(
val
)
{
...
@@ -279,7 +279,7 @@ export default {
...
@@ -279,7 +279,7 @@ export default {
this
.
logList
.
unshift
(
this
.
logList
.
unshift
(
`订单:
${
this
.
detail
.
newId
}
-
${
`订单:
${
this
.
detail
.
newId
}
-
${
this
.
selectImgList
.
length
>
1
?
this
.
faceType
:
"S"
this
.
selectImgList
.
length
>
1
?
this
.
faceType
:
"S"
}
面 已查询`
,
}
面 已查询`
);
);
}
}
try
{
try
{
...
@@ -323,7 +323,7 @@ export default {
...
@@ -323,7 +323,7 @@ export default {
18
:
{
left
:
"22%"
,
top
:
"52%"
},
18
:
{
left
:
"22%"
,
top
:
"52%"
},
21
:
{
left
:
"22%"
,
top
:
"56%"
},
21
:
{
left
:
"22%"
,
top
:
"56%"
},
22
:
{
left
:
"19%"
,
top
:
"60%"
},
22
:
{
left
:
"19%"
,
top
:
"60%"
},
24
:
{
left
:
"12%"
,
top
:
"56%"
}
,
24
:
{
left
:
"12%"
,
top
:
"56%"
}
};
};
// 查找对应的位置设置
// 查找对应的位置设置
...
@@ -336,11 +336,11 @@ export default {
...
@@ -336,11 +336,11 @@ export default {
if
(
this
.
imgList
?.
length
)
{
if
(
this
.
imgList
?.
length
)
{
this
.
getBackFile
({
this
.
getBackFile
({
files
:
this
.
imgList
,
files
:
this
.
imgList
,
size
:
this
.
detail
.
designImageSize
||
null
,
size
:
this
.
detail
.
designImageSize
||
null
});
});
}
}
},
},
immediate
:
true
,
immediate
:
true
},
},
isView
:
{
isView
:
{
...
@@ -358,7 +358,7 @@ export default {
...
@@ -358,7 +358,7 @@ export default {
this
.
imgDom
=
""
;
this
.
imgDom
=
""
;
}
}
},
},
immediate
:
true
,
immediate
:
true
},
},
systemSetting
:
{
systemSetting
:
{
handler
()
{
handler
()
{
...
@@ -366,7 +366,7 @@ export default {
...
@@ -366,7 +366,7 @@ export default {
this
.
$refs
.
imgSetting
?.
getCurrentItem
(
this
.
imgList
[
this
.
selectIndex
]);
this
.
$refs
.
imgSetting
?.
getCurrentItem
(
this
.
imgList
[
this
.
selectIndex
]);
}
}
},
},
deep
:
true
,
deep
:
true
},
},
newDesktopDevice
:
{
newDesktopDevice
:
{
handler
(
val
)
{
handler
(
val
)
{
...
@@ -380,8 +380,8 @@ export default {
...
@@ -380,8 +380,8 @@ export default {
this
.
$store
.
commit
(
"setGrid"
);
this
.
$store
.
commit
(
"setGrid"
);
}
}
},
},
immediate
:
true
,
immediate
:
true
}
,
}
},
},
methods
:
{
methods
:
{
// 重构为可手动触发的方法
// 重构为可手动触发的方法
...
@@ -405,8 +405,8 @@ export default {
...
@@ -405,8 +405,8 @@ export default {
formData
.
append
(
"file"
,
files
[
i
]);
formData
.
append
(
"file"
,
files
[
i
]);
let
{
data
}
=
await
that
.
$api
.
post
(
"/uploadImage"
,
formData
,
{
let
{
data
}
=
await
that
.
$api
.
post
(
"/uploadImage"
,
formData
,
{
headers
:
{
headers
:
{
"Content-Type"
:
"application/x-www-form-urlencoded"
,
"Content-Type"
:
"application/x-www-form-urlencoded"
}
,
}
});
});
that
.
selectImgIndex
=
0
;
that
.
selectImgIndex
=
0
;
that
.
addFile
(
data
,
()
=>
{
that
.
addFile
(
data
,
()
=>
{
...
@@ -435,7 +435,7 @@ export default {
...
@@ -435,7 +435,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"y"
,
"y"
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
y
)
-
1
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
y
)
-
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
}
}
...
@@ -444,7 +444,7 @@ export default {
...
@@ -444,7 +444,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"y"
,
"y"
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
y
)
+
1
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
y
)
+
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
}
}
...
@@ -453,7 +453,7 @@ export default {
...
@@ -453,7 +453,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"x"
,
"x"
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
x
)
-
1
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
x
)
-
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
}
}
...
@@ -462,7 +462,7 @@ export default {
...
@@ -462,7 +462,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"x"
,
"x"
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
x
)
+
1
,
Number
(
this
.
imgList
[
this
.
selectIndex
].
x
)
+
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
}
}
...
@@ -509,14 +509,14 @@ export default {
...
@@ -509,14 +509,14 @@ export default {
return
mm1
.
width
;
return
mm1
.
width
;
},
},
setDesignImg
(
title
)
{
setDesignImg
(
title
)
{
let
img
=
this
.
selectImgList
.
find
(
(
it
)
=>
it
.
title
===
title
);
let
img
=
this
.
selectImgList
.
find
(
it
=>
it
.
title
===
title
);
if
(
img
)
{
if
(
img
)
{
// console.log(this.detail.designImageSize, "this.detail.size");
// console.log(this.detail.designImageSize, "this.detail.size");
this
.
getBackFile
(
this
.
getBackFile
(
{
files
:
[
img
],
size
:
this
.
detail
.
designImageSize
},
{
files
:
[
img
],
size
:
this
.
detail
.
designImageSize
},
()
=>
{
()
=>
{
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
}
,
}
);
);
}
}
},
},
...
@@ -526,7 +526,7 @@ export default {
...
@@ -526,7 +526,7 @@ export default {
}
}
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
// this.selectImgIndexList.push(i)
// this.selectImgIndexList.push(i)
let
item
=
this
.
imgList
.
find
(
(
img
)
=>
img
.
fileName
===
it
.
fileName
);
let
item
=
this
.
imgList
.
find
(
img
=>
img
.
fileName
===
it
.
fileName
);
if
(
item
)
return
;
if
(
item
)
return
;
this
.
selectImgIndex
=
index
;
this
.
selectImgIndex
=
index
;
// console.log(this.detail.designImageSize);
// console.log(this.detail.designImageSize);
...
@@ -538,7 +538,7 @@ export default {
...
@@ -538,7 +538,7 @@ export default {
)
{
)
{
size
=
{
size
=
{
width
:
this
.
detail
.
mssWidth
,
width
:
this
.
detail
.
mssWidth
,
height
:
this
.
detail
.
mssHeight
,
height
:
this
.
detail
.
mssHeight
};
};
}
}
this
.
getBackFile
({
files
:
[
it
],
size
},
()
=>
{
this
.
getBackFile
({
files
:
[
it
],
size
},
()
=>
{
...
@@ -615,7 +615,7 @@ export default {
...
@@ -615,7 +615,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"zIndex"
,
"zIndex"
,
this
.
imgList
[
this
.
selectIndex
].
zIndex
+
1
,
this
.
imgList
[
this
.
selectIndex
].
zIndex
+
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
break
;
break
;
...
@@ -625,7 +625,7 @@ export default {
...
@@ -625,7 +625,7 @@ export default {
this
.
$set
(
this
.
$set
(
this
.
imgList
[
this
.
selectIndex
],
this
.
imgList
[
this
.
selectIndex
],
"zIndex"
,
"zIndex"
,
this
.
imgList
[
this
.
selectIndex
].
zIndex
-
1
,
this
.
imgList
[
this
.
selectIndex
].
zIndex
-
1
);
);
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
)));
break
;
break
;
...
@@ -738,14 +738,14 @@ export default {
...
@@ -738,14 +738,14 @@ export default {
},
},
getComputedName
(
title
)
{
getComputedName
(
title
)
{
let
img
=
this
.
selectImgList
.
find
(
let
img
=
this
.
selectImgList
.
find
(
(
it
)
=>
it
.
title
===
title
||
it
.
title
.
includes
(
title
),
it
=>
it
.
title
===
title
||
it
.
title
.
includes
(
title
)
);
);
return
img
?.
designId
;
return
img
?.
designId
;
},
},
getComputedTitle
(
title
)
{
getComputedTitle
(
title
)
{
// console.log(this.selectImgList, "this.selectImgList");
// console.log(this.selectImgList, "this.selectImgList");
let
img
=
this
.
selectImgList
.
find
(
let
img
=
this
.
selectImgList
.
find
(
(
it
)
=>
it
.
title
===
title
||
it
.
title
.
includes
(
title
),
it
=>
it
.
title
===
title
||
it
.
title
.
includes
(
title
)
);
);
return
img
?.
productionFile
;
return
img
?.
productionFile
;
},
},
...
@@ -815,7 +815,7 @@ export default {
...
@@ -815,7 +815,7 @@ export default {
x
,
x
,
y
,
y
,
h
:
height_px
,
h
:
height_px
,
r
:
0
,
r
:
0
});
});
that
.
selectIndex
=
that
.
imgList
.
length
-
1
;
that
.
selectIndex
=
that
.
imgList
.
length
-
1
;
...
@@ -850,7 +850,7 @@ export default {
...
@@ -850,7 +850,7 @@ export default {
let
that
=
this
;
let
that
=
this
;
let
bw
=
document
.
getElementById
(
"line"
).
clientWidth
;
let
bw
=
document
.
getElementById
(
"line"
).
clientWidth
;
that
.
$nextTick
(()
=>
{
that
.
$nextTick
(()
=>
{
that
.
getImageSize
(
file
.
url
).
then
(
(
data
)
=>
{
that
.
getImageSize
(
file
.
url
).
then
(
data
=>
{
let
w
=
document
.
getElementById
(
"line"
).
clientWidth
/
2
;
let
w
=
document
.
getElementById
(
"line"
).
clientWidth
/
2
;
let
rate
=
data
.
height
/
data
.
width
;
let
rate
=
data
.
height
/
data
.
width
;
that
.
imgList
=
[];
that
.
imgList
=
[];
...
@@ -863,7 +863,7 @@ export default {
...
@@ -863,7 +863,7 @@ export default {
x
:
w
,
x
:
w
,
y
:
(
bw
*
(
2
/
3
)
*
rate
)
/
2
,
y
:
(
bw
*
(
2
/
3
)
*
rate
)
/
2
,
h
:
bw
*
(
2
/
3
)
*
rate
,
h
:
bw
*
(
2
/
3
)
*
rate
,
r
:
0
,
r
:
0
});
});
that
.
selectIndex
=
that
.
imgList
.
length
-
1
;
that
.
selectIndex
=
that
.
imgList
.
length
-
1
;
that
.
showImgSetting
=
true
;
that
.
showImgSetting
=
true
;
...
@@ -888,7 +888,7 @@ export default {
...
@@ -888,7 +888,7 @@ export default {
image
.
onload
=
function
()
{
image
.
onload
=
function
()
{
resolve
({
resolve
({
width
:
image
.
width
,
width
:
image
.
width
,
height
:
image
.
height
,
height
:
image
.
height
});
});
};
};
image
.
onerror
=
function
()
{
image
.
onerror
=
function
()
{
...
@@ -962,7 +962,7 @@ export default {
...
@@ -962,7 +962,7 @@ export default {
this
.
checkList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
selectImgList
));
this
.
checkList
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
selectImgList
));
try
{
try
{
const
processQueue
=
await
Promise
.
all
(
const
processQueue
=
await
Promise
.
all
(
this
.
checkList
.
map
(
async
(
el
)
=>
{
this
.
checkList
.
map
(
async
el
=>
{
try
{
try
{
const
outputDir
=
path
.
dirname
(
el
.
productionFile
);
const
outputDir
=
path
.
dirname
(
el
.
productionFile
);
...
@@ -970,26 +970,26 @@ export default {
...
@@ -970,26 +970,26 @@ export default {
const
outputPath
=
path
.
join
(
outputDir
,
outputFileName
);
const
outputPath
=
path
.
join
(
outputDir
,
outputFileName
);
const
params
=
{
const
params
=
{
inputPath
:
el
.
productionFile
,
inputPath
:
el
.
productionFile
,
outputPath
:
outputPath
,
outputPath
:
outputPath
};
};
const
res
=
await
this
.
$api
.
post
(
"/processImage"
,
params
);
const
res
=
await
this
.
$api
.
post
(
"/processImage"
,
params
);
return
{
return
{
fileName
:
outputFileName
,
fileName
:
outputFileName
,
productionFile
:
res
.
msg
[
0
]?.
outputPath
,
productionFile
:
res
.
msg
[
0
]?.
outputPath
,
designId
:
el
.
designId
,
designId
:
el
.
designId
};
};
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
error
(
`处理失败:
${
el
.
productionFile
}
`
,
error
);
console
.
error
(
`处理失败:
${
el
.
productionFile
}
`
,
error
);
}
}
})
,
})
);
);
// 等待所有异步操作完成
// 等待所有异步操作完成
await
new
Promise
(
(
resolve
)
=>
setTimeout
(
resolve
,
100
));
await
new
Promise
(
resolve
=>
setTimeout
(
resolve
,
100
));
const
newMap
=
new
Map
(
processQueue
.
map
(
(
el
)
=>
[
el
.
designId
,
el
]));
const
newMap
=
new
Map
(
processQueue
.
map
(
el
=>
[
el
.
designId
,
el
]));
this
.
selectImgList
.
forEach
(
(
el
)
=>
{
this
.
selectImgList
.
forEach
(
el
=>
{
if
(
newMap
.
has
(
el
.
designId
))
{
if
(
newMap
.
has
(
el
.
designId
))
{
el
.
fileName
=
newMap
.
get
(
el
.
designId
).
fileName
;
el
.
fileName
=
newMap
.
get
(
el
.
designId
).
fileName
;
el
.
url
=
newMap
.
get
(
el
.
designId
).
productionFile
;
el
.
url
=
newMap
.
get
(
el
.
designId
).
productionFile
;
...
@@ -1000,7 +1000,7 @@ export default {
...
@@ -1000,7 +1000,7 @@ export default {
if
(
this
.
imgList
.
length
)
{
if
(
this
.
imgList
.
length
)
{
const
fileNameExists
=
this
.
checkList
.
some
(
const
fileNameExists
=
this
.
checkList
.
some
(
(
el
)
=>
el
.
fileName
===
this
.
imgList
[
0
].
fileName
,
el
=>
el
.
fileName
===
this
.
imgList
[
0
].
fileName
);
);
if
(
fileNameExists
)
{
if
(
fileNameExists
)
{
this
.
imgList
=
[];
this
.
imgList
=
[];
...
@@ -1036,24 +1036,24 @@ export default {
...
@@ -1036,24 +1036,24 @@ export default {
{
{
ids
:
[
this
.
detail
.
id
],
ids
:
[
this
.
detail
.
id
],
device
:
this
.
newDesktopDevice
,
device
:
this
.
newDesktopDevice
,
orderType
:
this
.
orderType
,
orderType
:
this
.
orderType
}
,
}
);
);
if
(
res
.
data
.
length
===
0
)
return
this
.
$message
.
warning
(
"未找到素材图!"
);
if
(
res
.
data
.
length
===
0
)
return
this
.
$message
.
warning
(
"未找到素材图!"
);
let
imgList
=
[];
let
imgList
=
[];
res
.
data
.
forEach
(
(
el
)
=>
{
res
.
data
.
forEach
(
el
=>
{
imgList
=
imgList
.
concat
(
el
.
list
||
[]);
imgList
=
imgList
.
concat
(
el
.
list
||
[]);
});
});
let
arr
=
[];
let
arr
=
[];
res
.
data
.
forEach
(
(
el
)
=>
{
res
.
data
.
forEach
(
el
=>
{
if
(
el
.
list
)
{
if
(
el
.
list
)
{
el
.
list
.
forEach
(
(
it
)
=>
{
el
.
list
.
forEach
(
it
=>
{
arr
.
push
(
it
);
arr
.
push
(
it
);
});
});
}
}
});
});
res
.
data
=
arr
res
.
data
=
arr
.
filter
(
(
el
)
=>
el
.
type
!==
1
)
.
filter
(
el
=>
el
.
type
!==
1
)
.
map
((
el
,
index
)
=>
{
.
map
((
el
,
index
)
=>
{
el
.
designId
=
el
.
designId
||
index
;
el
.
designId
=
el
.
designId
||
index
;
el
.
title
=
extractValue
(
el
.
designId
);
el
.
title
=
extractValue
(
el
.
designId
);
...
@@ -1192,8 +1192,8 @@ export default {
...
@@ -1192,8 +1192,8 @@ export default {
{
{
confirmButtonText
:
"确定"
,
confirmButtonText
:
"确定"
,
cancelButtonText
:
"取消"
,
cancelButtonText
:
"取消"
,
type
:
"warning"
,
type
:
"warning"
}
,
}
).
then
(
async
()
=>
{
).
then
(
async
()
=>
{
try
{
try
{
this
.
imgList
=
[];
this
.
imgList
=
[];
...
@@ -1226,7 +1226,7 @@ export default {
...
@@ -1226,7 +1226,7 @@ export default {
return
text
return
text
.
replace
(
.
replace
(
`订单:
${
this
.
detail
.
newId
}
`
,
`订单:
${
this
.
detail
.
newId
}
`
,
`<strong>订单:
${
this
.
detail
.
newId
}
</strong>`
,
`<strong>订单:
${
this
.
detail
.
newId
}
</strong>`
)
)
.
replace
(
/生产完成/
,
'<span style="color:#85ce61">生产完成</span>'
)
.
replace
(
/生产完成/
,
'<span style="color:#85ce61">生产完成</span>'
)
...
@@ -1258,13 +1258,13 @@ export default {
...
@@ -1258,13 +1258,13 @@ export default {
},
},
async
forcedProductionFN
(
bool
)
{
async
forcedProductionFN
(
bool
)
{
if
(
bool
)
this
.
isForcedProduction
=
true
;
if
(
bool
)
this
.
isForcedProduction
=
true
;
}
,
}
},
},
mounted
()
{
mounted
()
{
this
.
imgHeight
=
window
.
screen
.
height
+
"px"
;
this
.
imgHeight
=
window
.
screen
.
height
+
"px"
;
this
.
systemSetting
=
this
.
$dataStore
.
get
(
"setting"
);
this
.
systemSetting
=
this
.
$dataStore
.
get
(
"setting"
);
bus
.
$on
(
"busEmit"
,
(
v
)
=>
{
bus
.
$on
(
"busEmit"
,
v
=>
{
let
{
type
,
value
,
size
,
productMark
}
=
v
;
let
{
type
,
value
,
size
,
productMark
}
=
v
;
switch
(
type
)
{
switch
(
type
)
{
...
@@ -1288,7 +1288,7 @@ export default {
...
@@ -1288,7 +1288,7 @@ export default {
)
{
)
{
this
.
detail
.
designImageSize
=
{
this
.
detail
.
designImageSize
=
{
width
:
this
.
detail
.
mssWidth
,
width
:
this
.
detail
.
mssWidth
,
height
:
this
.
detail
.
mssHeight
,
height
:
this
.
detail
.
mssHeight
};
};
}
}
...
@@ -1297,7 +1297,7 @@ export default {
...
@@ -1297,7 +1297,7 @@ export default {
this
.
indexChange
(
value
);
this
.
indexChange
(
value
);
break
;
break
;
case
"bg"
:
case
"bg"
:
this
.
changeImageColor
(
value
,
(
res
)
=>
{
this
.
changeImageColor
(
value
,
res
=>
{
this
.
img
=
res
;
this
.
img
=
res
;
});
});
break
;
break
;
...
@@ -1324,7 +1324,7 @@ export default {
...
@@ -1324,7 +1324,7 @@ export default {
if
(
v
.
faceType
)
{
if
(
v
.
faceType
)
{
this
.
faceType
=
v
.
faceType
;
this
.
faceType
=
v
.
faceType
;
const
index
=
this
.
selectImgList
.
findIndex
(
const
index
=
this
.
selectImgList
.
findIndex
(
(
el
)
=>
el
.
title
===
v
.
faceType
,
el
=>
el
.
title
===
v
.
faceType
);
);
this
.
selectImgIndex
=
index
;
this
.
selectImgIndex
=
index
;
}
}
...
@@ -1336,13 +1336,13 @@ export default {
...
@@ -1336,13 +1336,13 @@ export default {
this
.
getBackFile
(
this
.
getBackFile
(
{
{
files
:
[
value
[
this
.
selectImgIndex
]],
files
:
[
value
[
this
.
selectImgIndex
]],
size
:
this
.
detail
.
designImageSize
||
null
,
size
:
this
.
detail
.
designImageSize
||
null
},
},
()
=>
{
()
=>
{
this
.
imgHistoryList
.
push
(
this
.
imgHistoryList
.
push
(
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
))
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
imgList
))
);
);
}
,
}
);
);
}
}
}
}
...
@@ -1365,7 +1365,7 @@ export default {
...
@@ -1365,7 +1365,7 @@ export default {
if
(
this
.
deviceStoreWatcher
)
{
if
(
this
.
deviceStoreWatcher
)
{
this
.
deviceStoreWatcher
();
// 调用 electron-store 监听器返回的函数,移除监听
this
.
deviceStoreWatcher
();
// 调用 electron-store 监听器返回的函数,移除监听
}
}
}
,
}
};
};
</
script
>
</
script
>
...
@@ -1486,7 +1486,7 @@ export default {
...
@@ -1486,7 +1486,7 @@ export default {
style=
"margin-left: 5px"
style=
"margin-left: 5px"
v-if=
"detail.podProductionNo"
v-if=
"detail.podProductionNo"
:style=
"
{
:style=
"
{
color: detail.customizedQuantity > 1 ? 'red' : '#67C23A'
,
color: detail.customizedQuantity > 1 ? 'red' : '#67C23A'
}"
}"
>
>
{{
detail
.
customizedQuantity
>
1
?
"多"
:
"单"
}}
{{
detail
.
customizedQuantity
>
1
?
"多"
:
"单"
}}
...
@@ -1582,16 +1582,24 @@ export default {
...
@@ -1582,16 +1582,24 @@ export default {
<div
class=
"item-label"
>
工厂:
</div>
<div
class=
"item-label"
>
工厂:
</div>
<div
class=
"item-value"
>
{{
detail
.
factoryCode
}}
</div>
<div
class=
"item-value"
>
{{
detail
.
factoryCode
}}
</div>
</div>
</div>
<div
:title=
"detail.shopNumber"
class=
"div-item"
style=
"flex: 50%;"
>
<div>
店铺单号:
</div>
<div>
{{
detail
.
shopNumber
}}
</div>
</div>
<div
<div
:title=
"detail.
shopNumber
"
:title=
"detail.
endProductId
"
class=
"div-item"
class=
"div-item"
style=
"flex:
10
0%;"
style=
"flex:
5
0%;"
>
>
<div>
<div>
店铺单号
:
客户保存记录ID
:
</div>
</div>
<div>
<div>
{{
detail
.
shopNumber
}}
{{
detail
.
endProductId
}}
</div>
</div>
</div>
</div>
<div
<div
...
@@ -1733,7 +1741,7 @@ export default {
...
@@ -1733,7 +1741,7 @@ export default {
:class=
"{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:class=
"{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style=
"{
:style=
"{
width: gridWH.row * 30 + 'px',
width: gridWH.row * 30 + 'px',
height: gridWH.col * 30 + 'px'
,
height: gridWH.col * 30 + 'px'
}"
}"
class=
"grid"
class=
"grid"
style=
"border-style:dashed"
style=
"border-style:dashed"
...
@@ -1780,9 +1788,9 @@ export default {
...
@@ -1780,9 +1788,9 @@ export default {
:draggable=
"true"
:draggable=
"true"
:resizable=
"true"
:resizable=
"true"
:rotatable=
"true"
:rotatable=
"true"
@
dragstop=
"
(a)
=> dragStop(a, item)"
@
dragstop=
"
a
=> dragStop(a, item)"
@
resizestop=
"
(a)
=> resizeStop(a, item)"
@
resizestop=
"
a
=> resizeStop(a, item)"
@
rotatestop=
"
(a)
=> rotating(a, item)"
@
rotatestop=
"
a
=> rotating(a, item)"
@
drag=
"getDrag"
@
drag=
"getDrag"
:angle=
"item.r"
:angle=
"item.r"
>
>
...
@@ -1822,7 +1830,7 @@ export default {
...
@@ -1822,7 +1830,7 @@ export default {
:class=
"{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:class=
"{ 'no-border-grid': systemSetting.gridShow !== 1 }"
:style=
"{
:style=
"{
width: gridWH.w + 'px',
width: gridWH.w + 'px',
height: gridWH.h + 'px'
,
height: gridWH.h + 'px'
}"
}"
class=
"grid"
class=
"grid"
id=
"grid"
id=
"grid"
...
@@ -1830,7 +1838,7 @@ export default {
...
@@ -1830,7 +1838,7 @@ export default {
<div
<div
:style=
"{
:style=
"{
height: gridSpacing.h,
height: gridSpacing.h,
lineHeight: gridSpacing.h
,
lineHeight: gridSpacing.h
}"
}"
class=
"grid-row"
class=
"grid-row"
v-for=
"it in 100"
v-for=
"it in 100"
...
@@ -1855,7 +1863,7 @@ export default {
...
@@ -1855,7 +1863,7 @@ export default {
detail.adjustable &&
detail.adjustable &&
!isOver &&
!isOver &&
!isMove &&
!isMove &&
!selectImgList.some(
(el)
=> el.isCut) &&
!selectImgList.some(
el
=> el.isCut) &&
newDesktopDevice !== 3
newDesktopDevice !== 3
"
"
>
>
...
@@ -1868,7 +1876,7 @@ export default {
...
@@ -1868,7 +1876,7 @@ export default {
productMark == 'custom_part' &&
productMark == 'custom_part' &&
detail.adjustable &&
detail.adjustable &&
selectImgList.length &&
selectImgList.length &&
!selectImgList.some(
(el)
=> el.isCut) &&
!selectImgList.some(
el
=> el.isCut) &&
isOver &&
isOver &&
newDesktopDevice !== 3
newDesktopDevice !== 3
"
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment