Kaynağa Gözat

fix: 软件锁 表头展示,排序调整

outaozhen 5 yıl önce
ebeveyn
işleme
48af875520
1 değiştirilmiş dosya ile 58 ekleme ve 86 silme
  1. 58 86
      src/pages/Product/Lock/Lockstore/index.jsx

+ 58 - 86
src/pages/Product/Lock/Lockstore/index.jsx

@@ -34,35 +34,35 @@ export const ProductLabel = ({ data }) => {
   )
 }
 
-const longleStatusNum = {
-  1: {
-    text: '生成'
-  },
-  2: {
-    text: '接收'
-  },
-  3: {
-    text: '借出'
-  },
-  4: {
-    text: '销售'
-  },
-  5: {
-    text: '升级'
-  },
-  6: {
-    text: '更换'
-  },
-  7: {
-    text: '收回'
-  },
-  8: {
-    text: '备注'
-  },
-  9: {
-    text: '赠送'
-  }
-}
+// const longleStatusNum = {
+//   1: {
+//     text: '生成'
+//   },
+//   2: {
+//     text: '接收'
+//   },
+//   3: {
+//     text: '借出'
+//   },
+//   4: {
+//     text: '销售'
+//   },
+//   5: {
+//     text: '升级'
+//   },
+//   6: {
+//     text: '更换'
+//   },
+//   7: {
+//     text: '收回'
+//   },
+//   8: {
+//     text: '备注'
+//   },
+//   9: {
+//     text: '赠送'
+//   }
+// }
 
 // 出库状态
 const longleStockStatusNum = {
@@ -195,8 +195,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (keyNum, record) => (
         <span
           onClick={() => showDrawer(record.id)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {keyNum}
         </span>
       )
@@ -218,39 +217,11 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       }, {}),
       render: (_, record) => <ProductLabel data={record.product} />
     },
-    // {
-    //   title: '出库时间',
-    //   dataIndex: 'makeDay',
-    //   key: 'makeDay',
-    //   valueType: 'date',
-    //   filters: true,
-    //   sorter: true,
-    //   width: 150
-    // },
-    {
-      title: '出库时间',
-      dataIndex: 'stockTime',
-      key: 'stockTime',
-      valueType: 'date',
-      filters: true,
-      sorter: true,
-      width: 90
-    },
-    {
-      title: '状态',
-      dataIndex: 'status',
-      width: 60,
-      filters: true,
-      onFilter: true,
-      valueType: 'select',
-      valueEnum: longleStatusNum,
-      renderText: (_, { status }) => longleStatusNum[status]?.text
-    },
     {
       title: '出库状态',
       dataIndex: 'stockStatus',
       key: 'stockStatus',
-      width: 60,
+      width: 70,
       render: (_, { stockStatus }) => {
         return <>{longleStockStatusNum[stockStatus]?.text}</>
       }
@@ -260,13 +231,25 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       dataIndex: 'stockTime',
       valueType: 'date',
       key: 'stockTime',
+      // filters: true,
+      // sorter: true,
       width: 90
     },
+    // {
+    //   title: '状态',
+    //   dataIndex: 'status',
+    //   width: 60,
+    //   filters: true,
+    //   onFilter: true,
+    //   valueType: 'select',
+    //   valueEnum: longleStatusNum,
+    //   renderText: (_, { status }) => longleStatusNum[status]?.text
+    // },
     {
       title: '销售状态',
       dataIndex: 'sellStatus',
       key: 'sellStatus',
-      width: 60,
+      width: 70,
       render: (_, { sellStatus }) => {
         return <>{longleSellStatusNum[sellStatus]?.text}</>
       }
@@ -274,6 +257,7 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
     {
       title: '销售时间',
       dataIndex: 'sellTime',
+      valueType: 'date',
       key: 'sellTime',
       width: 90
     },
@@ -294,14 +278,14 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       width: 90
     },
     {
-      title: '负责人',
-      dataIndex: 'responsible',
-      width: 80,
+      title: '客户',
+      dataIndex: 'client',
+      key: 'client',
+      width: 150,
       render: (text, record) => (
         <span
-          onClick={() => showDrawerResponsible(record.responsibleId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          onClick={() => showDrawerClient(record.clientId)}
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )
@@ -314,22 +298,19 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       render: (text, record) => (
         <span
           onClick={() => showCompanyDrawer(record.customerId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )
     },
     {
-      title: '客户',
-      dataIndex: 'client',
-      key: 'client',
-      width: 150,
+      title: '负责人',
+      dataIndex: 'responsible',
+      width: 80,
       render: (text, record) => (
         <span
-          onClick={() => showDrawerClient(record.clientId)}
-          className="text-primary cursor-pointer hover:text-[#967bbd]"
-        >
+          onClick={() => showDrawerResponsible(record.responsibleId)}
+          className="text-primary cursor-pointer hover:text-[#967bbd]">
           {text}
         </span>
       )
@@ -345,21 +326,12 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
       width: 90
     },
     {
-      title: '部门',
+      title: '纵横部门',
       dataIndex: 'departmentName',
       width: 90
     }
   ]
   const columnsStateMap = {
-    stockStatus: {
-      show: false
-    },
-    sellStatus: {
-      show: false
-    },
-    sellTime: {
-      show: false
-    },
     preserveStatus: {
       show: false
     },