Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/pages/supplier/category/CategoryLibraryManage/index.tsx

@@ -142,7 +142,6 @@ const CategoryLibraryManage: React.FC = () => {
       align: 'center',
       render: (val: number, record: any) => (
         <a
-          style={{ color: '#1677ff' }}
           onClick={() => {
             setCurrentStoreId(record.id);
             setSupplierListVisible(true);
@@ -158,9 +157,8 @@ const CategoryLibraryManage: React.FC = () => {
       align: 'center',
       render: (record: any) => (
         <>
-          {record.approveStatus === 0 && (
+         
             <a
-              style={{ color: '#1677ff' }}
               onClick={() => {
                 setCurrentStoreId(record.id);
                 setLockModalVisible(true);
@@ -168,7 +166,7 @@ const CategoryLibraryManage: React.FC = () => {
             >
               解锁/锁定
             </a>
-          )}
+         
 
         </>
       ),

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 ? (
-          <a style={{ color: '#1677ff' }} onClick={() => handleApproval(record.id)}>
+          <a  onClick={() => handleApproval(record.id)}>
             提交审核
           </a>
         ) : (
           <a
-            style={{ color: '#1677ff' }}
             onClick={() => {
               setCurrentStoreId(record.id);
               setViewVisible(true);

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) => (
         <>
           <Button
             size="small"
             type="link"
-            icon={<PlusOutlined />}
             disabled={record.type === '1'}
             onClick={() => {
               setModalType('add');
@@ -72,7 +71,6 @@ const CategoryManageTable: React.FC = () => {
           <Button
             size="small"
             type="link"
-            icon={<EditOutlined />}
             onClick={() => {
               setModalType('edit');
               setCurrentNode(record);
@@ -95,7 +93,6 @@ const CategoryManageTable: React.FC = () => {
               size="small"
               danger
               type="link"
-              icon={<DeleteOutlined />}
               disabled={!!(record.children && record.children.length > 0)}
             >删除</Button>
           </Popconfirm>

src/pages/supplier/category/SupplierEntryManage/index.tsx

@@ -142,7 +142,6 @@ const SupplierEntryManage: React.FC = () => {
         <>
           {record.approveStatus === 1 && (
             <a
-              style={{ color: '#1677ff' }}
               onClick={() => {
                 setCurrentStoreId(record.id);
                 setAddSupplierVisible(true);

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 ? (
-          <a style={{ color: '#1677ff' }} onClick={() => handleApproval(record.id)}>
+          <a onClick={() => handleApproval(record.id)}>
             提交审核
           </a>
         ) : (
           <a
-            style={{ color: '#1677ff' }}
             onClick={() => {
               setCurrentStoreId(record.id);
               setViewVisible(true);