diff --git a/src/pages/supplier/category/CategoryLibraryManage/index.tsx b/src/pages/supplier/category/CategoryLibraryManage/index.tsx index 8626839..f47effc 100644 --- a/src/pages/supplier/category/CategoryLibraryManage/index.tsx +++ b/src/pages/supplier/category/CategoryLibraryManage/index.tsx @@ -142,7 +142,6 @@ const CategoryLibraryManage: React.FC = () => { align: 'center', render: (val: number, record: any) => ( { setCurrentStoreId(record.id); setSupplierListVisible(true); @@ -158,9 +157,8 @@ const CategoryLibraryManage: React.FC = () => { align: 'center', render: (record: any) => ( <> - {record.approveStatus === 0 && ( + { setCurrentStoreId(record.id); setLockModalVisible(true); @@ -168,7 +166,7 @@ const CategoryLibraryManage: React.FC = () => { > 解锁/锁定 - )} + ), diff --git a/src/pages/supplier/category/CategoryLibraryReview/index.tsx b/src/pages/supplier/category/CategoryLibraryReview/index.tsx index 79cb5f6..2b44822 100644 --- a/src/pages/supplier/category/CategoryLibraryReview/index.tsx +++ b/src/pages/supplier/category/CategoryLibraryReview/index.tsx @@ -167,12 +167,11 @@ const CategoryLibraryManage: React.FC = () => { render: (record: any) => { const showSubmit = record.approveStatus === 0; return showSubmit ? ( - handleApproval(record.id)}> + handleApproval(record.id)}> 提交审核 ) : ( { setCurrentStoreId(record.id); setViewVisible(true); diff --git a/src/pages/supplier/category/CategoryManage/index.tsx b/src/pages/supplier/category/CategoryManage/index.tsx index 985a6fb..20cf99b 100644 --- a/src/pages/supplier/category/CategoryManage/index.tsx +++ b/src/pages/supplier/category/CategoryManage/index.tsx @@ -48,13 +48,12 @@ const CategoryManageTable: React.FC = () => { { title: '操作', key: 'action', - width: 280, + width: 200, render: (_:any, record:any) => ( <> diff --git a/src/pages/supplier/category/SupplierEntryManage/index.tsx b/src/pages/supplier/category/SupplierEntryManage/index.tsx index 0cd5b0d..ba5bd19 100644 --- a/src/pages/supplier/category/SupplierEntryManage/index.tsx +++ b/src/pages/supplier/category/SupplierEntryManage/index.tsx @@ -142,7 +142,6 @@ const SupplierEntryManage: React.FC = () => { <> {record.approveStatus === 1 && ( { setCurrentStoreId(record.id); setAddSupplierVisible(true); diff --git a/src/pages/supplier/category/SupplierEntryReview/index.tsx b/src/pages/supplier/category/SupplierEntryReview/index.tsx index b9140d5..ee8ea09 100644 --- a/src/pages/supplier/category/SupplierEntryReview/index.tsx +++ b/src/pages/supplier/category/SupplierEntryReview/index.tsx @@ -134,8 +134,8 @@ const CategoryLibraryManage: React.FC = () => { { title: '申请时间', - dataIndex: 'createTime', - key: 'createTime', + dataIndex: 'applyTime', + key: 'applyTime', align: 'center', ellipsis: true, }, @@ -152,14 +152,14 @@ const CategoryLibraryManage: React.FC = () => { key: 'option', align: 'center', render: (record: any) => { - const showSubmit = record.approveStatus === '0'; + const showSubmit = record.processStatusName === '未开始'; + return showSubmit ? ( - handleApproval(record.id)}> + handleApproval(record.id)}> 提交审核 ) : ( { setCurrentStoreId(record.id); setViewVisible(true);