lanjianrong 4 năm trước cách đây
mục cha
commit
6b25a1eee8

+ 6 - 6
src/pages/Hr/Contacts/index.tsx

@@ -71,12 +71,12 @@ const Contacts: React.FC<ContactsProps> = props => {
       search: false,
       width: 100
     },
-    {
-      title: '生日',
-      dataIndex: 'birthday',
-      search: false,
-      width: 150
-    },
+    // {
+    //   title: '生日',
+    //   dataIndex: 'birthday',
+    //   search: false,
+    //   width: 150
+    // },
     {
       title: '入职时间',
       dataIndex: 'hiredate',

+ 7 - 8
src/pages/Product/Lock/LockStore/components/LockDetail/TabList.tsx

@@ -165,7 +165,7 @@ const LockTabList: React.FC<LockTabListProps> = ({
                     {item.status !== 6 ? <>{item.client}</> : null}
                   </span>
                 </div>
-                <div className="text-black text-opacity-40">{dayjsFormat(item.createTime, 'HH:mm:ss')}</div>
+                <div className="text-black text-opacity-40">{dayjsFormat(item.dateline, 'HH:mm:ss')}</div>
               </div>
             </div>
           </div>
@@ -180,7 +180,7 @@ const LockTabList: React.FC<LockTabListProps> = ({
               <span className="text-black text-opacity-60">服务内容:</span>
               {renderLongleCon(item)}
               <div>
-                {hasAddPerm && item.status === 8 && item.isOperation ? (
+                {item.status === 8 && item.isOperation ? (
                   <span className="mr-2">
                     <Button
                       className="mt-2"
@@ -192,12 +192,11 @@ const LockTabList: React.FC<LockTabListProps> = ({
                     </Button>
                   </span>
                 ) : null}
-                {hasAddPerm &&
-                (item.status === 3 ||
-                  item.status === 4 ||
-                  item.status === 5 ||
-                  item.status === 9 ||
-                  (item.status === 8 && item.isOperation)) ? (
+                {item.status === 3 ||
+                item.status === 4 ||
+                item.status === 5 ||
+                item.status === 9 ||
+                (item.status === 8 && item.isOperation) ? (
                   <Popconfirm
                     title="确认删除"
                     onConfirm={() => delLonglelog(item.id)}