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
17709532
Commit
17709532
authored
Oct 18, 2024
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 建模管理优化
parent
3b0fd13a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
21 deletions
+62
-21
src/components/CardWrapper.vue
+5
-1
src/types/api/typesetting.ts
+3
-0
src/views/typesetting/TypesettingManagement.vue
+50
-16
src/views/typesetting/submitReviewModal.vue
+4
-4
No files found.
src/components/CardWrapper.vue
View file @
17709532
...
...
@@ -23,7 +23,11 @@
<img
:src=
"c.imagePath"
/>
</div>
</div>
<div
class=
"commodity-card-name-price flex flex-justify-space-between"
>
<slot
name=
"time"
></slot>
<div
v-if=
"cardItem.productName"
class=
"commodity-card-name-price flex flex-justify-space-between"
>
<slot
name=
"productName"
></slot>
<slot
name=
"price"
></slot>
</div>
...
...
src/types/api/typesetting.ts
View file @
17709532
...
...
@@ -28,6 +28,9 @@ export interface TypesettingListData {
confirm
?:
boolean
personInChargeId
?:
number
personInChargeName
?:
string
createTime
?:
string
updateTime
?:
string
assignmentTime
?:
string
}
export
interface
SearchForm
{
...
...
src/views/typesetting/TypesettingManagement.vue
View file @
17709532
...
...
@@ -81,7 +81,7 @@
cardItem
.
productName
}}
<
/span
>
<
/template
>
<
template
#
price
>
<
template
v
-
if
=
"cardItem.retailPrice"
#
price
>
<
span
class
=
"price"
>
{{
cardItem
.
retailPrice
?
'$'
:
''
}}
{{
cardItem
.
retailPrice
}}
...
...
@@ -94,6 +94,14 @@
<
/template
>
<
/Icon
>
<
Icon
name
=
"chakanxiangqing"
@
click
.
stop
=
"submitReview(cardItem)"
>
<
template
#
title
>
<
title
>
查看详情
<
/title
>
<
/template
>
<
/Icon
>
<
Icon
v
-
if
=
"treeId === '201'"
name
=
"querenshenhexunjia"
@
click
.
stop
=
"confirm(cardItem)"
...
...
@@ -110,7 +118,15 @@
@
click
.
stop
=
"submitReview(cardItem)"
>
<
template
#
title
>
<
title
>
提交审核
<
/title
>
<
title
>
{{
cardItem
?.
state
===
'301'
||
cardItem
?.
state
===
'501'
?
'打版完成'
:
cardItem
?.
state
===
'401'
?
'修改'
:
''
}}
<
/title
>
<
/template
>
<
/Icon
>
<
Icon
...
...
@@ -119,19 +135,22 @@
@
click
.
stop
=
"submitReview(cardItem)"
>
<
template
#
title
>
<
title
>
报价
<
/title
>
<
/template
>
<
/Icon
>
<
Icon
v
-
if
=
"treeId === '701' || treeId === '901'"
name
=
"chakanxiangqing"
@
click
.
stop
=
"submitReview(cardItem)"
>
<
template
#
title
>
<
title
>
查看
<
/title
>
<
title
>
上传稿件
<
/title
>
<
/template
>
<
/Icon
>
<
/template
>
<
template
#
time
>
<
div
class
=
"product-time"
>
<
div
class
=
"create-time"
>
<
span
class
=
"label"
>
创建时间
:
<
/span
>
<
span
class
=
"value"
>
{{
cardItem
.
createTime
}}
<
/span
>
<
/div
>
<
div
class
=
"assign-time"
>
<
span
class
=
"label"
>
分派时间
:
<
/span
>
<
span
class
=
"value"
>
{{
cardItem
.
assignmentTime
}}
<
/span
>
<
/div
>
<
/div
>
<
/template
>
<
/CardWrapper
>
<
/div
>
<
/div
>
...
...
@@ -161,7 +180,13 @@
<
submitReviewModal
ref
=
"submitReviewModelRef"
v
-
model
=
"submitReviewVisible"
title
=
"提交审核"
:
title
=
"
row?.state === '301' || row?.state === '501'
? '打版完成'
: row?.state === '401'
? '修改'
: '上传稿件'
"
:
row
=
"row"
@
refresh
=
"onRefreshPage"
><
/submitReviewModal
>
...
...
@@ -293,9 +318,9 @@ const submitReviewModelRef = ref()
const
submitReview
=
async
(
data
:
TypesettingListData
)
=>
{
try
{
submitReviewModelRef
.
value
?.
getExamineInfo
(
data
)
if
(
data
.
state
===
'701'
||
data
.
state
===
'901'
)
{
submitReviewModelRef
.
value
?.
getPriceDetail
(
data
)
}
//
if (data.state === '701' || data.state === '901')
{
submitReviewModelRef
.
value
?.
getPriceDetail
(
data
)
//
}
const
res
=
await
getTypesettingDetail
(
data
.
id
)
row
.
value
=
res
.
data
nextTick
(()
=>
{
...
...
@@ -424,4 +449,13 @@ const reject = async () => {
.
svg
-
icon
{
margin
-
left
:
5
px
;
}
.
product
-
time
{
margin
-
bottom
:
10
px
;
.
create
-
time
,
.
assign
-
time
{
height
:
26
px
;
line
-
height
:
26
px
;
}
}
<
/style
>
src/views/typesetting/submitReviewModal.vue
View file @
17709532
...
...
@@ -129,7 +129,7 @@
</ElTabPane>
<ElTabPane
v-if=
"row?.state === '601' || row?.state === '701' || row?.state === '901'"
label=
"
报价信息
"
label=
"
上传稿件
"
name=
"second"
>
<div
v-loading=
"loading"
class=
"review-info"
>
...
...
@@ -154,13 +154,13 @@
</div>
<div
class=
"price-form"
>
<div
class=
"modals-image-title"
>
<span>
报价信息
</span>
<span>
上传稿件
</span>
</div>
<ElForm
ref=
"priceFormRef"
:model=
"priceForm"
label-width=
"100px"
>
<ElFormItem
label=
"
工艺单
"
label=
"
稿件
"
prop=
"craftImage"
:rules=
"[
{ required: true, message: '请上传
工艺单
' }]"
:rules=
"[
{ required: true, message: '请上传
稿件
' }]"
>
<UploadImage
v-model=
"priceForm.craftImage"
...
...
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