outaozhen 4 anos atrás
pai
commit
5b17736d63

+ 12 - 17
src/pages/Product/Lock/LockStore/components/LocksDetail/TabList.jsx

@@ -120,8 +120,7 @@ const LockTabList = props => {
             {`${newLongleService[0]} ->`}
             <span
               className="textPurple text-hex-967bbd cursor-pointer"
-              onClick={() => showLongleClick(longleService.newLongleId)}
-            >
+              onClick={() => showLongleClick(longleService.newLongleId)}>
               {newLongleService[1]}
             </span>
           </>
@@ -129,13 +128,16 @@ const LockTabList = props => {
       }
       return newLongleService[0]
     }
+    if (longleService.status === showMarkStatus) {
+      return <span>{longleService.mark}</span>
+    }
     return (
       <>
         {showProductsStatus.includes(longleService.status) && (
           <ProductLabel data={longleService.product} />
         )}
         {showNewLongleStatus.includes(longleService.status) && renderNewLog()}
-        {showMarkStatus.includes(longleService.status) ? <span>{longleService.mark}</span> : null}
+        {/* {showMarkStatus.includes(longleService.status) ? <span>{longleService.mark}</span> : null} */}
       </>
     )
   }
@@ -174,8 +176,7 @@ const LockTabList = props => {
                         {servicelogEnum[item.status]}{' '}
                         <span
                           className="textPurple text-hex-967bbd cursor-pointer"
-                          onClick={handleClientClick}
-                        >
+                          onClick={handleClientClick}>
                           {item.status !== 6 ? <>{item.client}</> : null}
                         </span>
                         <br />
@@ -199,8 +200,7 @@ const LockTabList = props => {
                             title="确认删除"
                             onConfirm={() => delLonglelog(item.id)}
                             okText="确认"
-                            cancelText="取消"
-                          >
+                            cancelText="取消">
                             <Button className="mt-2" type="primary" ghost size="small" danger>
                               删除
                             </Button>
@@ -224,8 +224,7 @@ const LockTabList = props => {
             className="mr-3px"
             onClick={() =>
               setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.RECEIVE })
-            }
-          >
+            }>
             接收
           </Button>
         ) : null}
@@ -237,8 +236,7 @@ const LockTabList = props => {
             className="mr-3px"
             onClick={() =>
               setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.SALE })
-            }
-          >
+            }>
             借销赠
           </Button>
         ) : null}
@@ -265,8 +263,7 @@ const LockTabList = props => {
                 visible: true,
                 type: lockTypeEnum.CHANGE
               })
-            }
-          >
+            }>
             更换
           </Button>
         ) : null}
@@ -278,8 +275,7 @@ const LockTabList = props => {
             className="mr-1"
             onClick={() =>
               setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.RECOVER })
-            }
-          >
+            }>
             收回
           </Button>
         ) : null}
@@ -289,8 +285,7 @@ const LockTabList = props => {
           size="small"
           onClick={() =>
             setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.REMARK })
-          }
-        >
+          }>
           备注
         </Button>