Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
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
1
Merge Requests
1
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
qinjianhui
factory_front
Commits
c6122b30
Commit
c6122b30
authored
Mar 01, 2025
by
zhuzhequan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ts 报错
parent
aeb4f4a5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
69 additions
and
90 deletions
+69
-90
components.d.ts
+3
-1
src/components/CardPods.vue
+3
-3
src/types/api/podOrder.ts
+14
-14
src/views/order/ProductInfo.vue
+4
-1
src/views/order/index.vue
+1
-0
src/views/order/pod/index.vue
+44
-71
No files found.
components.d.ts
View file @
c6122b30
...
...
@@ -7,8 +7,11 @@ export {}
declare
module
'vue'
{
export
interface
GlobalComponents
{
CardPods
:
typeof
import
(
'./src/components/CardPods.vue'
)[
'default'
]
CardWrapper
:
typeof
import
(
'./src/components/CardWrapper.vue'
)[
'default'
]
ElButton
:
typeof
import
(
'element-plus/es'
)[
'ElButton'
]
ElCarousel
:
typeof
import
(
'element-plus/es'
)[
'ElCarousel'
]
ElCarouselItem
:
typeof
import
(
'element-plus/es'
)[
'ElCarouselItem'
]
ElCheckbox
:
typeof
import
(
'element-plus/es'
)[
'ElCheckbox'
]
ElCol
:
typeof
import
(
'element-plus/es'
)[
'ElCol'
]
ElConfigProvider
:
typeof
import
(
'element-plus/es'
)[
'ElConfigProvider'
]
...
...
@@ -49,7 +52,6 @@ declare module 'vue' {
RouterView
:
typeof
import
(
'vue-router'
)[
'RouterView'
]
ShipmentOrderDetail
:
typeof
import
(
'./src/components/ShipmentOrderDetail.vue'
)[
'default'
]
SplitDiv
:
typeof
import
(
'./src/components/splitDiv/splitDiv.vue'
)[
'default'
]
TableColumn
:
typeof
import
(
'./src/components/TableColumn.vue'
)[
'default'
]
TableView
:
typeof
import
(
'./src/components/TableView.vue'
)[
'default'
]
UploadImage
:
typeof
import
(
'./src/components/UploadImage.vue'
)[
'default'
]
WangEditor
:
typeof
import
(
'./src/components/WangEditor.vue'
)[
'default'
]
...
...
src/components/CardPods.vue
View file @
c6122b30
...
...
@@ -3,7 +3,7 @@
<div
class=
"commodity-card-image"
>
<div
class=
"before"
></div>
<div
class=
"image"
>
<img
:src=
"
cardItem.variantImage
"
/>
<img
:src=
"
typeof cardItem.variantImage === 'string' ? cardItem.variantImage : ''
"
/>
</div>
<div
class=
"img_top_left"
>
<span
class=
"select-icon"
></span>
...
...
@@ -27,10 +27,10 @@
<
script
setup
lang=
"ts"
>
import
{
PropType
}
from
'vue'
import
{
PodProductList
}
from
'@/types/api/podOrder'
import
{
PodProductList
,
CardOrderData
}
from
'@/types/api/podOrder'
defineProps
({
cardItem
:
{
type
:
Object
as
PropType
<
PodProductList
>
,
type
:
Object
as
PropType
<
PodProductList
|
CardOrderData
>
,
required
:
true
,
},
})
...
...
src/types/api/podOrder.ts
View file @
c6122b30
...
...
@@ -47,11 +47,11 @@ export interface CardOrderData {
lanshouPost
:
string
|
null
manuscriptUrl
:
string
|
null
manuscriptStatus
:
number
|
null
createTime
:
string
|
null
updateTime
:
string
|
null
createTime
:
string
|
undefined
updateTime
:
string
|
undefined
remark
:
string
|
null
userMark
:
string
|
null
namespace
:
string
|
null
namespace
:
string
|
undefined
productList
:
PodProductList
[]
internalMemoList
:
string
|
null
[
propName
:
string
]:
string
|
number
|
boolean
|
undefined
|
unknown
...
...
@@ -68,31 +68,31 @@ export interface imageAryInter {
}
export
interface
PodProductList
{
id
:
number
podOrderId
:
number
podOrderId
?
:
number
thirdSubOrderNumber
?:
string
factorySubOrderNumber
?:
string
factoryOrderNumber
?:
string
|
null
factoryOrderNumber
?:
string
|
undefined
shopNumber
?:
string
supplierItemNo
?:
string
|
null
baseSku
?:
string
productName
?:
string
variantSku
?:
string
variantImage
?:
string
imageAry
?:
string
|
imageAryInter
[]
|
null
images
?:
cardImages
[]
|
null
designImages
?:
string
|
null
process
?:
string
|
null
podProcessName
?:
string
|
null
productionFileId
?:
string
|
null
imageAry
?:
string
|
imageAryInter
[]
|
undefined
images
?:
cardImages
[]
|
undefined
designImages
?:
string
|
undefined
process
?:
string
|
undefined
podProcessName
?:
string
|
undefined
productionFileId
?:
string
|
undefined
customizedQuantity
?:
number
num
?:
number
|
string
shipmentNu
?:
number
costPrice
?:
number
price
?:
number
processPrice
?:
number
weight
?:
number
|
null
version
?:
number
|
null
remark
?:
string
|
null
weight
?:
number
|
undefined
version
?:
number
|
undefined
remark
?:
string
|
undefined
createTime
?:
string
updateTime
?:
string
[
propName
:
string
]:
string
|
number
|
boolean
|
undefined
|
unknown
...
...
src/views/order/ProductInfo.vue
View file @
c6122b30
...
...
@@ -163,9 +163,12 @@
</div>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
未发数:
</span>
<span
class=
"order-list-expand_item_value"
>
{{
<span
v-if=
"!isPod"
class=
"order-list-expand_item_value"
>
{{
(
item
.
num
||
0
)
-
((
item
.
shipmentNum
||
0
)
-
(
item
.
notPassNum
||
0
))
}}
</span>
<span
v-else
class=
"order-list-expand_item_value"
>
{{
(
item
.
num
||
0
)
-
(
item
.
shipmentNum
||
0
)
}}
</span>
</div>
<div
class=
"order-list-expand_item_info_title"
>
<span
class=
"order-list-expand_item_label"
>
工艺:
</span>
...
...
src/views/order/index.vue
View file @
c6122b30
...
...
@@ -291,6 +291,7 @@
>
<
ProductInfo
:
row
=
"row"
:
is
-
pod
=
"false"
:
status
=
"statusCode"
@
update
-
remark
=
"handleUpdateRemark"
@
again
-
generated
=
"handleAgainGenerated"
...
...
src/views/order/pod/index.vue
View file @
c6122b30
This diff is collapsed.
Click to expand it.
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