Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
merchant-manage-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ui
merchant-manage-ui
Commits
5a1ffce2
Commit
5a1ffce2
authored
May 06, 2025
by
靳野
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "feat: 修改投资金转换问题"
This reverts commit
41a1755f
.
parent
de85055d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
13 deletions
+6
-13
FormPriceOrStock.jsx
src/pages/ServiceGoods/components/FormPriceOrStock.jsx
+2
-9
index.jsx
src/pages/ServiceGoods/index.jsx
+4
-4
No files found.
src/pages/ServiceGoods/components/FormPriceOrStock.jsx
View file @
5a1ffce2
...
...
@@ -229,6 +229,7 @@ const CreateBatchFormItems = ({ specInitValue, batchChange, defaultColumns }) =>
const
FormPriceOrStock
=
forwardRef
((
props
,
ref
)
=>
{
const
{
specList
,
editData
,
skuList
=
[],
onSpecChange
}
=
props
;
const
editRef
=
useRef
(
null
);
const
packageRef
=
useRef
(
null
);
const
customer
=
useContext
(
ServiceContext
);
...
...
@@ -456,15 +457,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
setMergeTable
(
Boolean
(
editData
.
secondSpecValue
&&
editData
.
secondSpecValue
.
length
));
setTableData
(
fliterSkuListSortData
(
skuList
)
||
[]);
}
},
[
customer
.
isEdit
,
customer
.
isUseCache
,
editData
,
skuList
]);
useEffect
(()
=>
{
if
(
!
editData
)
{
onFinish
();
return
;
}
CreateColumnsEvent
(
editData
);
},
[
customer
.
isGold
]);
},
[
customer
.
isEdit
,
customer
.
isUseCache
,
editData
]);
return
(
<>
...
...
src/pages/ServiceGoods/index.jsx
View file @
5a1ffce2
...
...
@@ -377,7 +377,7 @@ const ServiceGoods = options => {
}
setPageLoading
(
false
);
})();
},
[
SourceData
]);
},
[
SourceData
,
categoryIds
]);
useEffect
(()
=>
{
if
(
options
.
visible
)
{
...
...
@@ -443,10 +443,10 @@ const ServiceGoods = options => {
const
onCategoryChange
=
e
=>
{
setCategoryIds
(
e
);
let
txt
=
''
;
if
(
e
.
includes
(
GoldCategory
))
{
txt
=
'
克
'
;
}
else
if
(
categoryIds
.
includes
(
GoldCategory
)
&&
!
e
.
includes
(
GoldCategory
))
{
if
(
categoryIds
.
includes
(
GoldCategory
))
{
txt
=
'
千克
'
;
}
else
if
(
e
.
includes
(
GoldCategory
))
{
txt
=
'
克
'
;
}
if
(
txt
)
{
message
.
warning
(
`商品品类已切换,规格重量单位已自动切换为
${
txt
}
`
,
6
);
...
...
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