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
46cd83d3
Commit
46cd83d3
authored
Mar 27, 2023
by
陈万宝
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:修改库存
parent
0f8e5501
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
18 deletions
+45
-18
FormTakeaway.jsx
src/pages/ServiceGoods/components/FormTakeaway.jsx
+35
-18
service.js
src/pages/ServiceGoods/service.js
+10
-0
No files found.
src/pages/ServiceGoods/components/FormTakeaway.jsx
View file @
46cd83d3
...
@@ -36,7 +36,7 @@ import AddSellTimeModal from './AddSellTimeModal';
...
@@ -36,7 +36,7 @@ import AddSellTimeModal from './AddSellTimeModal';
import
styles
from
'
../common.less
'
;
import
styles
from
'
../common.less
'
;
import
AddRepertoryModal
from
'
./AddRepertoryModal
'
;
import
AddRepertoryModal
from
'
./AddRepertoryModal
'
;
import
AddMultiSpecModal
from
'
./AddMultiSpecModal
'
;
import
AddMultiSpecModal
from
'
./AddMultiSpecModal
'
;
import
{
apiTagList
,
apiUnits
}
from
'
../service
'
;
import
{
apiTagList
,
apiUnits
,
apiGetShopDetail
}
from
'
../service
'
;
import
{
localAutoSaveKey
}
from
'
../utils
'
;
import
{
localAutoSaveKey
}
from
'
../utils
'
;
import
localStorage
from
'
@/utils/localStorage
'
;
import
localStorage
from
'
@/utils/localStorage
'
;
...
@@ -77,7 +77,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -77,7 +77,7 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
const
[
intactData
,
setIntactData
]
=
useState
({});
const
[
intactData
,
setIntactData
]
=
useState
({});
const
[
repertoryState
,
setRepertoryState
]
=
useState
(
''
);
const
[
repertoryState
,
setRepertoryState
]
=
useState
(
''
);
const
[
repertoryModel
,
setRepertoryModel
]
=
useState
({});
const
[
repertoryModel
,
setRepertoryModel
]
=
useState
({});
const
[
tempMultiSpu
,
setTempMultiSpu
]
=
useState
([]);
const
[
tempMultiSpu
,
setTempMultiSpu
]
=
useState
([]);
const
initialDealValue
=
[
const
initialDealValue
=
[
{
{
specGroupName
:
''
,
specGroupName
:
''
,
...
@@ -246,19 +246,19 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -246,19 +246,19 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
}
}
// console.log('multiSpu', multiSpu);
// console.log('multiSpu', multiSpu);
console.log(
"multiSpu===1111",
multiSpu);
console.log(
'multiSpu===1111',
multiSpu);
if
(tempMultiSpu.length)
{
if
(tempMultiSpu.length)
{
multiSpu.forEach((item,
index)=>
{
multiSpu.forEach((item,
index) =>
{
tempMultiSpu.forEach((itm,
idx)=>
{
tempMultiSpu.forEach((itm,
idx) =>
{
if
(item.unique === itm.unique )
{
if
(item.unique === itm.unique)
{
item.serviceItem =
itm.serviceItem
item.serviceItem =
objectComparison(item.serviceItem, itm);
}
}
})
})
;
})
})
;
}
}
// debugger
// debugger
console.log(
"multiSpu===2222",
multiSpu);
console.log(
'multiSpu===2222',
multiSpu);
setMultiSpu(multiSpu);
setMultiSpu(multiSpu);
}
}
...
@@ -277,13 +277,20 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -277,13 +277,20 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
categoryId: (
categoryId: (
infoMation?.categoryId && infoMation?.categoryId.slice(infoMation.categoryId.length - 1)
infoMation?.categoryId && infoMation?.categoryId.slice(infoMation.categoryId.length - 1)
).toString(),
).toString(),
// storageRackIds:infoMation?.storageRackIds ? infoMation?.storageRackIds:[],
};
};
console.log('intactData======>', intactData);
console.log('intactData======>', intactData);
setIntactData(intactDataTemp);
setIntactData(intactDataTemp);
return intactData;
return intactData;
};
};
// 过滤对象
const objectComparison = (item, itm) => {
let {
serviceItem: { maxStock, autoStock, productStock },
} = itm;
let params = { maxStock, autoStock, productStock };
let temp = { ...item, ...params };
return temp;
};
const onChange = () => {};
const onChange = () => {};
const onDealFinish = values => {
const onDealFinish = values => {
console.log('Received values of form:', values);
console.log('Received values of form:', values);
...
@@ -310,11 +317,11 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -310,11 +317,11 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
}
}
return item;
return item;
});
});
let temp
= JSON.parse(JSON.stringify(multiSpu))
let temp
= JSON.parse(JSON.stringify(multiSpu));
tempMultiSpu.push(...temp)
tempMultiSpu.push(...temp)
;
setTempMultiSpu(tempMultiSpu)
setTempMultiSpu(tempMultiSpu)
;
setMultiSpu(temp);
setMultiSpu(temp);
console.log('33333========>', multiSpu,tempMultiSpu);
console.log('33333========>', multiSpu,
tempMultiSpu);
// if (intactData?.items.length) {
// if (intactData?.items.length) {
// intactData.items[+idx].serviceItem.productStock = productStock;
// intactData.items[+idx].serviceItem.productStock = productStock;
...
@@ -340,6 +347,14 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -340,6 +347,14 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
return false;
return false;
};
};
const querGetShopDetail = async () => {
let params = {
id: '638899799727110',
shopId: 15,
};
const result = await apiGetShopDetail(params);
console.log('result', result);
};
const fileterBrandOptions = (input, options) => options.children.includes(input);
const fileterBrandOptions = (input, options) => options.children.includes(input);
const filterCategoryOptions = (inputValue, path) =>
const filterCategoryOptions = (inputValue, path) =>
...
@@ -457,6 +472,8 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
...
@@ -457,6 +472,8 @@ const TakeawayGoodsInfo = forwardRef((props, ref) => {
const res = await apiUnits();
const res = await apiUnits();
setUnitsList(res.data || []);
setUnitsList(res.data || []);
}
}
querGetShopDetail();
setTempMultiSpu([])
return false;
return false;
};
};
useEffect(() => {
useEffect(() => {
...
...
src/pages/ServiceGoods/service.js
View file @
46cd83d3
...
@@ -157,3 +157,13 @@ export const apiShopIds = data =>
...
@@ -157,3 +157,13 @@ export const apiShopIds = data =>
prefix
:
goodsApi
,
prefix
:
goodsApi
,
data
,
data
,
});
});
// 获取店铺详情 http://yapi.quantgroups.com/project/389/interface/api/57589
export
const
apiGetShopDetail
=
data
=>
request
.
post
(
'
/product/api/merchant/detail
'
,
{
prefix
:
goodsApi
,
data
:
stringify
(
_
.
omitBy
(
data
,
v
=>
!
v
)),
headers
:
{
'
Content-Type
'
:
'
application/x-www-form-urlencoded
'
,
},
});
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