فهرست منبع

feat: 软件锁相关修改

outaozhen 4 سال پیش
والد
کامیت
2edc31c6b0

+ 1 - 13
src/pages/Product/Lock/LockStore/components/LockDetail/LowerList.tsx

@@ -30,19 +30,7 @@ const LockLowerList: React.FC<LockLowerListProps> = props => {
       dataIndex: 'operatorName',
       dataIndex: 'operatorName',
       key: 'operatorName',
       key: 'operatorName',
       ellipsis: true,
       ellipsis: true,
-      width: 115,
-      render: (_, record) => (
-        <div className="flex items-center flex-row ml-2">
-          <img
-            className="w-full max-w-30px h-30px border rounded-30px"
-            src={
-              (isDevMode() ? 'http://cld2qa.com' : 'http://zhcld.com') +
-              (record?.avatar ?? consts.DEFAULT_AVATAR)
-            }
-          />
-          <span className="ml-1">{record.operatorName}</span>
-        </div>
-      )
+      width: 115
     },
     },
     {
     {
       title: '操作',
       title: '操作',

+ 75 - 30
src/pages/Product/Lock/LockStore/components/LockDetail/TabList.tsx

@@ -18,6 +18,34 @@ type LockTabListProps = {
   }
   }
   serviceList: API.ServiceLogItem[]
   serviceList: API.ServiceLogItem[]
 }
 }
+export enum LockStockStatusNum {
+  /** 接收 */
+  RECEIVE = 0,
+  /** 出库 */
+  CHUKU = 1,
+  /** 生成 */
+  CREATE = 2
+}
+export enum LockSellStatusNum {
+  /** 没有设置 */
+  NONE = 0,
+  /** 销售 */
+  SALES = 1,
+  /** 借出 */
+  LENDING = 2,
+  /** 赠送 */
+  GIFT = 3
+}
+export enum LockPreserveStatusNum {
+  /** 没有设置 */
+  NONE = 0,
+  /** 维护 */
+  SAFEGUARD = 1,
+  /** 升级 */
+  UPGRADE = 2,
+  /** 更换 */
+  REPLACE = 3
+}
 const LockTabList: React.FC<LockTabListProps> = props => {
 const LockTabList: React.FC<LockTabListProps> = props => {
   const {
   const {
     longle: { id: longleId, keyNum, status, stockStatus, sellStatus, preserveStatus } = {},
     longle: { id: longleId, keyNum, status, stockStatus, sellStatus, preserveStatus } = {},
@@ -110,40 +138,57 @@ const LockTabList: React.FC<LockTabListProps> = props => {
 
 
   const renderServiceLogItem = (item: API.ServiceLogItem) => {
   const renderServiceLogItem = (item: API.ServiceLogItem) => {
     return (
     return (
-      <div className="flex justify-start">
-        <div className="">
-          <div className="flex flex-col items-start mr-2">
+      <div className="flex">
+        <div className="basis-36">
+          <div className="flex">
+            <div className="mr-2">
+              <div
+                className="rounded-1/2 w-8 h-8"
+                style={{
+                  backgroundImage: `url(${
+                    (isDevMode() ? 'http://cld2qa.com' : 'http://zhcld.com') +
+                    (item.avatar ?? consts.DEFAULT_AVATAR)
+                  })`,
+                  backgroundSize: 'cover'
+                }}
+              />
+            </div>
             <div>
             <div>
-              <span
-                className="textPurple text-hex-967bbd cursor-pointer"
-                onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: item.clientId })}>
-                {item.status !== 6 ? <>{item.client}</> : null}
-              </span>
+              <div className="flex flex-col mr-2">
+                <div>
+                  <span
+                    className="textPurple text-hex-967bbd cursor-pointer"
+                    onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: item.clientId })}>
+                    {item.status !== 6 ? <>{item.client}</> : null}
+                  </span>
+                </div>
+                <div>{dayjsFormat(item.createTime, 'HH:mm:ss')}</div>
+              </div>
             </div>
             </div>
-            <div>{dayjsFormat(item.createTime, 'HH:mm:ss')}</div>
           </div>
           </div>
         </div>
         </div>
-        <div className="flex flex-col items-start">
-          <div>
-            操作:{servicelogEnum[item.status]}{' '}
-            <span className="textPurple text-hex-967bbd cursor-pointer ml-1">{item.operator}</span>
-          </div>
-          <div>
-            服务内容:{renderLongleCon(item)}
-            {hasAddPerm &&
-            (item.status === 3 || item.status === 4 || item.status === 5 || item.status === 9) ? (
-              <Popconfirm
-                title="确认删除"
-                onConfirm={() => delLonglelog(item.id)}
-                okText="确认"
-                cancelText="取消">
-                <div>
-                  <Button className="mt-2" type="primary" ghost size="small" danger>
-                    删除
-                  </Button>
-                </div>
-              </Popconfirm>
-            ) : null}
+        <div className="basis-auto">
+          <div className="flex flex-col">
+            <div>
+              操作:{servicelogEnum[item.status]} <span className="ml-1">{item.operator}</span>
+            </div>
+            <div>
+              服务内容:{renderLongleCon(item)}
+              {hasAddPerm &&
+              (item.status === 3 || item.status === 4 || item.status === 5 || item.status === 9) ? (
+                <Popconfirm
+                  title="确认删除"
+                  onConfirm={() => delLonglelog(item.id)}
+                  okText="确认"
+                  cancelText="取消">
+                  <div>
+                    <Button className="mt-2" type="primary" ghost size="small" danger>
+                      删除
+                    </Button>
+                  </div>
+                </Popconfirm>
+              ) : null}
+            </div>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>