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
52a39979
Commit
52a39979
authored
Feb 12, 2025
by
shida.liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 加权限
parent
d7a8240a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
permission.config.js
config/permission.config.js
+5
-0
index.jsx
src/pages/PopGoodsManage/index.jsx
+2
-2
index.jsx
src/pages/PopOrderManage/batchDelivery/index.jsx
+2
-2
index.jsx
src/pages/PopOrderManage/pendingDeliveryOrder/index.jsx
+2
-2
No files found.
config/permission.config.js
View file @
52a39979
...
...
@@ -52,6 +52,11 @@ export const POP_BATCH_DELIVERY = {
EDITABLE
:
'
0205021
'
,
// 新增/修改
};
// POP商品管理-(应付审计的,没有实际用处)
export
const
POP_GOOD_MANAGE
=
{
EDITABLE
:
'
0201021
'
,
// 新增/修改
};
// 订单查询
export
const
QUERY_ORDER
=
{
LIST
:
'
020601
'
,
// 订单查询列表
...
...
src/pages/PopGoodsManage/index.jsx
View file @
52a39979
...
...
@@ -27,7 +27,7 @@ import InfoAudit from './infoAudit';
import
DraftModal
from
'
./DraftModal
'
;
import
Takeaway
from
'
./Takeaway
'
;
import
{
GOOD_MANAGE
}
from
'
@/../config/permission.config
'
;
import
{
GOOD_MANAGE
,
POP_GOOD_MANAGE
}
from
'
@/../config/permission.config
'
;
import
LocalStroage
from
'
@/utils/localStorage
'
;
import
configApi
from
'
@/../config/env.config
'
;
import
{
GoldCategory
}
from
'
@/config/app.config
'
;
...
...
@@ -425,7 +425,7 @@ class popGoodsManage extends Component {
const
canAddService
=
permissions
[
GOOD_MANAGE
.
ADD_SERVICE_GOODS
];
const
canAddNormal
=
permissions
[
GOOD_MANAGE
.
ADD_NORMAL_GOODS
];
const
canAddTakeaway
=
permissions
[
GOOD_MANAGE
.
ADD_TAKEAWAY_GOODS
];
this
.
canEditable
=
permissions
[
GOOD_MANAGE
.
EDITABLE
];
this
.
canEditable
=
permissions
[
POP_
GOOD_MANAGE
.
EDITABLE
];
// console.log('serviceData', this.state.serviceData);
// console.log('shopList', this.shopList);
// console.log('treeData', this.state.treeData);
...
...
src/pages/PopOrderManage/batchDelivery/index.jsx
View file @
52a39979
...
...
@@ -3,7 +3,7 @@ import React, { useRef } from 'react';
import
{
PageHeaderWrapper
}
from
'
@ant-design/pro-layout
'
;
import
ProTable
from
'
@ant-design/pro-table
'
;
import
{
connect
}
from
'
dva
'
;
import
{
BATCH_DELIVERY
}
from
'
@/../config/permission.config
'
;
import
{
POP_
BATCH_DELIVERY
}
from
'
@/../config/permission.config
'
;
import
{
queryToBatchSend
,
uploadFile
,
...
...
@@ -14,7 +14,7 @@ import {
const
TableList
=
props
=>
{
const
actionRef
=
useRef
(
null
);
const
{
permissions
}
=
props
;
const
canEditable
=
permissions
[
BATCH_DELIVERY
.
EDITABLE
];
const
canEditable
=
permissions
[
POP_
BATCH_DELIVERY
.
EDITABLE
];
const
columns
=
[
{
...
...
src/pages/PopOrderManage/pendingDeliveryOrder/index.jsx
View file @
52a39979
...
...
@@ -6,7 +6,7 @@ import ProTable from '@ant-design/pro-table';
import
{
FormInstance
}
from
'
antd/lib/form
'
;
import
moment
from
'
moment
'
;
import
{
connect
}
from
'
dva
'
;
import
{
POP_PENDING_DELIVERY_ORDER
,
DELIVERY_ORDER
}
from
'
@/../config/permission.config
'
;
import
{
POP_PENDING_DELIVERY_ORDER
,
POP_
DELIVERY_ORDER
}
from
'
@/../config/permission.config
'
;
import
style
from
'
./index.less
'
;
import
LogisticsForm
from
'
./components/LogisticsForm
'
;
import
PopoverDom
from
'
./components/PreviewImage
'
;
...
...
@@ -33,7 +33,7 @@ const TableList = props => {
// 因待发货 和 已发货都使用当前组件,功能且相同,所以只要授权其中一个均可获得发货物流权限
const
canEditable
=
permissions
[
POP_PENDING_DELIVERY_ORDER
.
EDITABLE
]
||
permissions
[
DELIVERY_ORDER
.
EDITABLE
];
permissions
[
POP_PENDING_DELIVERY_ORDER
.
EDITABLE
]
||
permissions
[
POP_
DELIVERY_ORDER
.
EDITABLE
];
const
[
companys
,
setCompanys
]
=
useState
([]);
const
[
LogisticsModalVisible
,
handleModalVisible
]
=
useState
(
false
);
const
[
skuList
,
setSkuList
]
=
useState
([]);
...
...
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