Parcourir la source

feat: 软件锁服务记录的修改

outaozhen il y a 4 ans
Parent
commit
880c4d930d

+ 22 - 6
src/pages/Product/Lock/LockStore/components/LockDetail/TabList.tsx

@@ -111,9 +111,23 @@ const LockTabList: React.FC<LockTabListProps> = props => {
   const renderServiceLogItem = (item: API.ServiceLogItem) => {
     return (
       <div className="flex justify-start">
-        <div className="flex">daad</div>
-        <div className="flex flex-col items-center ml-2">
-          <div>操作:{servicelogEnum[item.status]} </div>
+        <div className="">
+          <div className="flex flex-col items-start 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 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 &&
@@ -123,9 +137,11 @@ const LockTabList: React.FC<LockTabListProps> = props => {
                 onConfirm={() => delLonglelog(item.id)}
                 okText="确认"
                 cancelText="取消">
-                <Button className="mt-2" type="primary" ghost size="small" danger>
-                  删除
-                </Button>
+                <div>
+                  <Button className="mt-2" type="primary" ghost size="small" danger>
+                    删除
+                  </Button>
+                </div>
               </Popconfirm>
             ) : null}
           </div>

+ 2 - 2
src/pages/Product/Lock/LockStore/index.jsx

@@ -19,11 +19,11 @@ export const ProductLabel = ({ data }) => {
     newData = data.split('+')
   }
   return (
-    <div className="!children:m-2px">
+    <span className="!children:m-2px">
       {newData.map((item, idx) => (
         <Tag key={item + idx}>{item}</Tag>
       ))}
-    </div>
+    </span>
   )
 }