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
28982397
Commit
28982397
authored
Apr 16, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 操作单添加类型
parent
33332d5f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
4 deletions
+43
-4
src/views/order/factoryOrderNew/component/CardLayout.vue
+28
-1
src/views/order/factoryOrderNew/index.vue
+15
-3
No files found.
src/views/order/factoryOrderNew/component/CardLayout.vue
View file @
28982397
<
template
>
<div
v-loading=
"loading"
class=
"card-layout"
>
<div
v-loading=
"loading"
element-loading-text=
"加载中..."
class=
"card-layout"
>
<div
v-if=
"cardData.length > 0"
class=
"card-content"
>
<div
class=
"card-grid"
>
<div
...
...
@@ -103,6 +103,16 @@
<
template
#
operations
>
<div
class=
"flex-row flex-row-gap6"
>
<div
v-if=
"
item?.productMark === 'custom_normal' ||
item?.productMark === 'normal'
"
class=
"product-mark-badge"
:title=
"`类型:$
{setProductMark(item?.productMark)}面`"
>
{{
setProductMark
(
item
?.
productMark
)
}}
</div>
<div
v-if=
"item.customizedQuantity"
class=
"quantity-badge"
:class=
"
...
...
@@ -414,6 +424,12 @@ const clearSelection = () => {
selectedItems
.
value
=
[]
emit
(
'selection-change'
,
[])
}
function
setProductMark
(
productMark
:
string
)
{
if
(
!
productMark
)
return
''
if
(
productMark
===
'custom_normal'
)
return
'CB'
if
(
productMark
===
'normal'
)
return
'G'
return
''
}
const
getSelectedIds
=
()
=>
selectedItems
.
value
.
map
((
i
)
=>
i
.
id
)
const
getPlatformImg
=
(
code
:
string
)
=>
{
...
...
@@ -509,6 +525,17 @@ defineExpose({ clearSelection, getSelectedIds, refresh })
background-color
:
#e6a23c
;
}
.product-mark-badge
{
border
:
2px
solid
#F56C6C
;
color
:
#F56C6C
;
font-weight
:
700
;
height
:
28px
;
width
:
28px
;
text-align
:
center
;
border-radius
:
6px
;
font-size
:
16px
;
}
.card-info-grid
{
display
:
grid
;
grid-template-columns
:
1
fr
150px
;
...
...
src/views/order/factoryOrderNew/index.vue
View file @
28982397
...
...
@@ -665,7 +665,11 @@
<
div
v
-
if
=
"isTableLayout"
class
=
"table-content"
>
<
splitDiv
size
=
"55"
>
<
template
#
top
>
<
div
v
-
loading
=
"loading"
class
=
"table-list flex-1 overflow-hidden"
>
<
div
v
-
loading
=
"loading"
element
-
loading
-
text
=
"加载中..."
class
=
"table-list flex-1 overflow-hidden"
>
<
TableView
ref
=
"tableRef"
highlight
-
current
-
row
...
...
@@ -749,7 +753,11 @@
@
tab
-
click
=
"handleTabClick"
>
<
el
-
tab
-
pane
name
=
"product"
label
=
"包含商品"
>
<
div
v
-
loading
=
"subLoading"
class
=
"sub-table-wrapper"
>
<
div
v
-
loading
=
"subLoading"
element
-
loading
-
text
=
"加载中..."
class
=
"sub-table-wrapper"
>
<
TableView
:
paginated
-
data
=
"productList"
:
columns
=
"productColumns"
...
...
@@ -758,7 +766,11 @@
<
/div
>
<
/el-tab-pane
>
<
el
-
tab
-
pane
name
=
"log"
label
=
"操作日志"
>
<
div
v
-
loading
=
"subLoading"
class
=
"detail-table-content"
>
<
div
v
-
loading
=
"subLoading"
element
-
loading
-
text
=
"加载中..."
class
=
"detail-table-content"
>
<
LogList
style
=
"height: 100%"
:
log
-
list
=
"logList"
/>
<
div
v
-
if
=
"!logList.length"
class
=
"empty-content"
>
暂无数据
...
...
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