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
b4e94350
Commit
b4e94350
authored
May 06, 2025
by
guang.wu
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 处理g显示问题
parent
41a1755f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
159 additions
and
155 deletions
+159
-155
FormPriceOrStock.jsx
src/pages/ServiceGoods/components/FormPriceOrStock.jsx
+2
-2
config.js
src/pages/ServiceGoods/config.js
+156
-153
index.jsx
src/pages/ServiceGoods/index.jsx
+1
-0
No files found.
src/pages/ServiceGoods/components/FormPriceOrStock.jsx
View file @
b4e94350
...
...
@@ -315,7 +315,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
inputType
:
'
text
'
,
});
}
// console.log('customer.isGold :>> ', customer.isGold);
// isGoodsManage用来判断是否是popGoodsManage页面,这个页面是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这个字段,这就用第一个数据就好了
const
isGoodsManage
=
window
.
location
.
pathname
.
indexOf
(
'
popGoodsManage
'
)
<
0
;
const
dynamicColumns
=
[
...
...
@@ -456,7 +456,7 @@ const FormPriceOrStock = forwardRef((props, ref) => {
setMergeTable
(
Boolean
(
editData
.
secondSpecValue
&&
editData
.
secondSpecValue
.
length
));
setTableData
(
fliterSkuListSortData
(
skuList
)
||
[]);
}
},
[
customer
.
isEdit
,
customer
.
isUseCache
,
editData
,
skuList
]);
},
[
customer
.
isEdit
,
customer
.
isUseCache
,
editData
,
skuList
,
customer
.
isGold
]);
useEffect
(()
=>
{
if
(
!
editData
)
{
...
...
src/pages/ServiceGoods/config.js
View file @
b4e94350
...
...
@@ -159,7 +159,9 @@ export const WeeksList = [
value
:
7
,
},
];
export
const
StaticColumns
=
customer
=>
[
export
const
StaticColumns
=
customer
=>
// console.log('StaticColumns customer.isGold :>> ', customer.isGold);
[
{
title
:
'
供货价
'
,
dataIndex
:
'
supplyPrice
'
,
...
...
@@ -322,7 +324,8 @@ export const StaticColumns = customer => [
roleRules
:
{
required
:
false
},
disabeldRender
:
()
=>
customer
.
isDisabled
,
},
];
];
// 这部分是用来应付审计团队的,没有实际功能,这里删掉了供货价字段,正常业务逻辑不用考虑这里
export
const
StaticColumnsPop
=
customer
=>
[
{
...
...
src/pages/ServiceGoods/index.jsx
View file @
b4e94350
...
...
@@ -527,6 +527,7 @@ const ServiceGoods = options => {
isUseCache
,
// 是否使用缓存数据
onEventBus
,
};
// console.log('providerValue.isGold :>> ', providerValue.isGold);
return
(
<
Modal
...
...
靳野
@ye.jin
mentioned in commit
de85055d
·
May 07, 2025
mentioned in commit
de85055d
mentioned in commit de85055d049c9eb662c3f308718887d85bdb2152
Toggle commit list
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