Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
0ea22848
Commit
0ea22848
authored
Nov 18, 2022
by
季圣华
Browse files
给库存相关的界面增加大的计量单位的库存展示提示
parent
fd842ecc
Changes
3
Hide whitespace changes
Inline
Side-by-side
jshERP-web/src/views/material/MaterialList.vue
View file @
0ea22848
...
...
@@ -146,6 +146,11 @@
<a-icon
v-if=
"record.imgName"
style=
"font-size: 18px"
theme=
"twoTone"
type=
"file-image"
/>
</a-popover>
</template>
<
template
slot=
"customRenderStock"
slot-scope=
"text, record"
>
<a-tooltip
:title=
"record.bigUnitStock"
>
{{
text
}}
</a-tooltip>
</
template
>
<
template
slot=
"customRenderEnabled"
slot-scope=
"enabled"
>
<a-tag
v-if=
"enabled"
color=
"green"
>
启用
</a-tag>
<a-tag
v-if=
"!enabled"
color=
"orange"
>
禁用
</a-tag>
...
...
@@ -254,7 +259,9 @@
},
{
title
:
'
基础重量
'
,
dataIndex
:
'
weight
'
,
width
:
80
},
{
title
:
'
保质期
'
,
dataIndex
:
'
expiryNum
'
,
width
:
60
},
{
title
:
'
库存
'
,
dataIndex
:
'
stock
'
,
width
:
80
},
{
title
:
'
库存
'
,
dataIndex
:
'
stock
'
,
width
:
80
,
scopedSlots
:
{
customRender
:
'
customRenderStock
'
}
},
{
title
:
'
采购价
'
,
dataIndex
:
'
purchaseDecimal
'
,
width
:
80
},
{
title
:
'
零售价
'
,
dataIndex
:
'
commodityDecimal
'
,
width
:
80
},
{
title
:
'
销售价
'
,
dataIndex
:
'
wholesaleDecimal
'
,
width
:
80
},
...
...
jshERP-web/src/views/report/InOutStockReport.vue
View file @
0ea22848
...
...
@@ -60,6 +60,11 @@
:scroll=
"scroll"
:loading=
"loading"
@
change=
"handleTableChange"
>
<template
slot=
"customRenderStock"
slot-scope=
"text, record"
>
<a-tooltip
:title=
"record.bigUnitStock"
>
{{
text
}}
</a-tooltip>
</
template
>
</a-table>
<a-row
:gutter=
"24"
style=
"margin-top: 8px;text-align:right;"
>
<a-col
:md=
"24"
:sm=
"24"
>
...
...
@@ -140,7 +145,9 @@
{
title
:
'
上月结存数量
'
,
dataIndex
:
'
prevSum
'
,
sorter
:
(
a
,
b
)
=>
a
.
prevSum
-
b
.
prevSum
,
width
:
80
},
{
title
:
'
入库数量
'
,
dataIndex
:
'
inSum
'
,
sorter
:
(
a
,
b
)
=>
a
.
inSum
-
b
.
inSum
,
width
:
60
},
{
title
:
'
出库数量
'
,
dataIndex
:
'
outSum
'
,
sorter
:
(
a
,
b
)
=>
a
.
outSum
-
b
.
outSum
,
width
:
60
},
{
title
:
'
本月结存数量
'
,
dataIndex
:
'
thisSum
'
,
sorter
:
(
a
,
b
)
=>
a
.
thisSum
-
b
.
thisSum
,
width
:
80
},
{
title
:
'
本月结存数量
'
,
dataIndex
:
'
thisSum
'
,
sorter
:
(
a
,
b
)
=>
a
.
thisSum
-
b
.
thisSum
,
width
:
80
,
scopedSlots
:
{
customRender
:
'
customRenderStock
'
}
},
{
title
:
'
结存金额
'
,
dataIndex
:
'
thisAllPrice
'
,
sorter
:
(
a
,
b
)
=>
a
.
thisAllPrice
-
b
.
thisAllPrice
,
width
:
60
}
],
url
:
{
...
...
jshERP-web/src/views/report/MaterialStock.vue
View file @
0ea22848
...
...
@@ -72,6 +72,11 @@
<span
slot=
"action"
slot-scope=
"text, record"
>
<a
@
click=
"showMaterialInOutList(record)"
>
{{
record
.
id
?
'
流水
'
:
''
}}
</a>
</span>
<template
slot=
"customRenderStock"
slot-scope=
"text, record"
>
<a-tooltip
:title=
"record.bigUnitStock"
>
{{
text
}}
</a-tooltip>
</
template
>
</a-table>
<a-row
:gutter=
"24"
style=
"margin-top: 8px;text-align:right;"
>
<a-col
:md=
"24"
:sm=
"24"
>
...
...
@@ -158,7 +163,9 @@
{
title
:
'
单位
'
,
dataIndex
:
'
unitName
'
,
width
:
60
,
ellipsis
:
true
},
{
title
:
'
单价
'
,
dataIndex
:
'
purchaseDecimal
'
,
sorter
:
(
a
,
b
)
=>
a
.
purchaseDecimal
-
b
.
purchaseDecimal
,
width
:
60
},
{
title
:
'
初始库存
'
,
dataIndex
:
'
initialStock
'
,
sorter
:
(
a
,
b
)
=>
a
.
initialStock
-
b
.
initialStock
,
width
:
60
},
{
title
:
'
库存
'
,
dataIndex
:
'
currentStock
'
,
sorter
:
(
a
,
b
)
=>
a
.
currentStock
-
b
.
currentStock
,
width
:
60
},
{
title
:
'
库存
'
,
dataIndex
:
'
currentStock
'
,
sorter
:
(
a
,
b
)
=>
a
.
currentStock
-
b
.
currentStock
,
width
:
60
,
scopedSlots
:
{
customRender
:
'
customRenderStock
'
}
},
{
title
:
'
库存金额
'
,
dataIndex
:
'
currentStockPrice
'
,
sorter
:
(
a
,
b
)
=>
a
.
currentStockPrice
-
b
.
currentStockPrice
,
width
:
80
}
],
url
:
{
...
...
Write
Preview
Supports
Markdown
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