Browse Source

fix(core): 修复

wjx 1 năm trước cách đây
mục cha
commit
3ceff4cb36
2 tập tin đã thay đổi với 19 bổ sung15 xóa
  1. 10 8
      src/pages/MyTask/index.tsx
  2. 9 7
      src/pages/Task/index.tsx

+ 10 - 8
src/pages/MyTask/index.tsx

@@ -278,19 +278,21 @@ const MyTask: React.FC = () => {
                       style={{ width: 165, height: '100%' }}
                       gap={10}
                       vertical={true}
-                      align="center"
+                      align="flex-end"
                       justify="space-between"
                     >
-                      {TaskStatusEle[item.status]}
+                      <Flex vertical={true} align="flex-end" gap={4}>
+                        {TaskStatusEle[item.status]}
+                        <Tag color="error" style={{ marginInlineEnd: 0 }}>
+                          结算:
+                          {item.checkoutType === 'CHECKOUT_TYPE_SCALE'
+                            ? `总消耗 ${item.checkout * 100}%`
+                            : `${item.checkout}元(审核合格)`}
+                        </Tag>
+                      </Flex>
                       <Button type="primary" onClick={() => editHandle(item)}>
                         修改任务
                       </Button>
-                      <Tag color="error">
-                        结算:
-                        {item.checkoutType === 'CHECKOUT_TYPE_SCALE'
-                          ? `总消耗 ${item.checkout * 100}%`
-                          : `${item.checkout}元(审核合格)`}
-                      </Tag>
                     </Flex>
                   </Flex>
                 }

+ 9 - 7
src/pages/Task/index.tsx

@@ -169,7 +169,15 @@ const Task: React.FC = () => {
                       align="flex-end"
                       justify="space-between"
                     >
-                      {TaskStatusEle[item.status]}
+                      <Flex vertical={true} align="flex-end" gap={4}>
+                        {TaskStatusEle[item.status]}
+                        <Tag color="error" style={{ marginInlineEnd: 0 }}>
+                          结算:
+                          {item.checkoutType === 'CHECKOUT_TYPE_SCALE'
+                            ? `总消耗 ${item.checkout * 100}%`
+                            : `${item.checkout}元(审核合格)`}
+                        </Tag>
+                      </Flex>
                       {item.status === 'STATUS_NORMAL' && (
                         <SubmitTask
                           taskId={item.id}
@@ -179,12 +187,6 @@ const Task: React.FC = () => {
                           onChange={() => getTaskMemberList.refresh()}
                         />
                       )}
-                      <Tag color="error" style={{ marginInlineEnd: 0 }}>
-                        结算:
-                        {item.checkoutType === 'CHECKOUT_TYPE_SCALE'
-                          ? `总消耗 ${item.checkout * 100}%`
-                          : `${item.checkout}元(审核合格)`}
-                      </Tag>
                     </Flex>
                   </Flex>
                 }