Browse Source

feat: 5.31 daily commit

lanjianrong 4 years atrás
parent
commit
c6d1dd2ff3

+ 32 - 45
src/pages/Customer/Client/components/ClientDetail/TabList.jsx

@@ -55,35 +55,28 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
       title: '产品',
       dataIndex: 'product',
       width: 230,
-      ellipsis: true,
-      render: (_, record) => (
-        <>
-          {record.preserveStatus === 3 ? (
-            <Text delete type="secondary">
-              {record.product}
-            </Text>
-          ) : (
-            <ProductLabel data={record.product} />
-          )}
-        </>
-      )
+      render: (_, record) =>
+        record.preserveStatus === 3 ? (
+          <Text delete type="secondary">
+            {record.product}
+          </Text>
+        ) : (
+          <ProductLabel data={record.product} />
+        )
     },
     {
       title: '销售状态',
       dataIndex: 'sellStatus',
       width: 90,
       ellipsis: true,
-      render: (_, record) => (
-        <>
-          {record.preserveStatus === 3 ? (
-            <Text delete type="secondary">
-              {longleSellStatusNum[record.sellStatus]?.text}
-            </Text>
-          ) : (
-            <>{longleSellStatusNum[record.sellStatus]?.text}</>
-          )}
-        </>
-      )
+      render: (_, record) =>
+        record.preserveStatus === 3 ? (
+          <Text delete type="secondary">
+            {longleSellStatusNum[record.sellStatus]?.text}
+          </Text>
+        ) : (
+          <>{longleSellStatusNum[record.sellStatus]?.text}</>
+        )
     },
     {
       title: '维护状态',
@@ -91,34 +84,28 @@ const ClientTabList = ({ clientId, software, updatePayload }) => {
       key: 'preserveStatus',
       width: 90,
       ellipsis: true,
-      render: (_, record) => (
-        <>
-          {record.preserveStatus === 3 ? (
-            <Text delete type="secondary">
-              {longlePreserveStatusNum[record.preserveStatus]?.text}
-            </Text>
-          ) : (
-            <>{longlePreserveStatusNum[record.preserveStatus]?.text}</>
-          )}
-        </>
-      )
+      render: (_, record) =>
+        record.preserveStatus === 3 ? (
+          <Text delete type="secondary">
+            {longlePreserveStatusNum[record.preserveStatus]?.text}
+          </Text>
+        ) : (
+          <>{longlePreserveStatusNum[record.preserveStatus]?.text}</>
+        )
     },
     {
       title: '责任人',
       dataIndex: 'responsible',
       width: 70,
       ellipsis: true,
-      render: (_, record) => (
-        <>
-          {record.preserveStatus === 3 ? (
-            <Text delete type="secondary">
-              {record.responsible}
-            </Text>
-          ) : (
-            <>{record.responsible}</>
-          )}
-        </>
-      )
+      render: (_, record) =>
+        record.preserveStatus === 3 ? (
+          <Text delete type="secondary">
+            {record.responsible}
+          </Text>
+        ) : (
+          <>{record.responsible}</>
+        )
     }
   ]
 

+ 1 - 1
src/pages/Customer/Client/components/ClientDetail/index.jsx

@@ -77,7 +77,7 @@ const ClientDetail = props => {
             <Row>
               <Col span={9} className="sheet-box-left">
                 {orderIds.length ? (
-                  <div className="mb-3px">
+                  <div className="mb-1">
                     <Tooltip title="上一条记录">
                       <Up
                         fill={flipConsts.disableUpBtn ? '#BDBDBE' : '#886ab5'}

+ 94 - 3
src/services/typding.d.ts

@@ -51,10 +51,101 @@ declare namespace API {
 
   /** @description 日志 */
   type LogItem = {
-    id?: string
-    createTime?: string
-    operatorName?: string
+    id: string
     operationType?: string
+    avatar?: string
+    clientId?: string
+    clientName?: string
+    customerId?: string
+    customerName?: any
+    longleId?: string
+    longleName?: any
+    businessId?: string
+    businessName?: string
+    staffId?: string
+    staffName?: string
+    operatorId?: string
+    operatorName?: string
     content?: string
+    createTime?: string
+  }
+
+  /** @description 客户 */
+  type ClientItem = {
+    id: string
+    companyId?: string
+    staffId?: string
+    sourceId?: string
+    sourceName?: string
+    staffName?: string
+    districtIds?: string[]
+    districtName?: string
+    tagIds?: string[]
+    tagName?: string[]
+    tagCooperationIds?: string[]
+    tagCooperationName?: string[]
+    gender?: string
+    niceName?: string
+    qq?: string
+    telephone?: string
+    phone?: string
+    email?: string
+    clientName?: string
+    keynum?: string
+    companyName?: string
+    unit?: string
+    fax?: string
+    webservice?: string
+    department?: string
+    position?: string
+    office?: string
+    address?: string
+    tooltip?: string
+    ride?: string
+    stay?: string
+    landmarks?: string
+    mark?: string
+    priority?: string
+    createTime?: string
+    serviceTime?: any
+  }
+
+  enum SellStatus {}
+
+  enum preserveStatus {}
+
+  /** 软件锁 */
+  type SoftwareLongleItem = {
+    id: string
+    categoryId?: string
+    clientId?: string
+    responsibleId?: string
+    customerId?: string
+    departmentId?: string
+    departmentName?: string
+    customerName?: string
+    category?: string
+    status?: number
+    stockStatus?: number
+    sellStatus?: SellStatus
+    preserveStatus?: preserveStatus
+    stockTime?: string
+    sellTime?: string
+    preserveTime?: string
+    statusLog?: string
+    statusT?: string
+    keyNum?: string
+    serialNumber?: string
+    product?: string
+    allotedTime?: string
+    makeDay?: string
+    responsible?: string
+    version?: string
+    client?: string
+    licences?: string
+    authorizeStr?: string
+    authorizeFile?: string
+    updateStr?: string
+    updateFile?: string
   }
 }