优化：任务订单结算

src/pages/orderManage/demandOrder/orderDetail/comp/orderSettle/index.tsx

@@ -16,7 +16,10 @@ type DetailType = InterDataType<serviceOrderFormDetailsType>;
 // 列表类型
 type ListType = InterDataType<getOrderAmountDetailsType>;
 
-const OrderSettleView: React.FC<{ detail: DetailType }> = ({ detail }) => {
+const OrderSettleView: React.FC<{ detail: DetailType; onRefresh: () => void }> = ({
+  detail,
+  onRefresh,
+}) => {
   // 表格列表
   const [tableData, setTableData] = useState<ListType>([]);
   // 新增弹窗是否开启
@@ -30,19 +33,7 @@ const OrderSettleView: React.FC<{ detail: DetailType }> = ({ detail }) => {
     });
     if (res && res.code === '200') {
       const list = res.result || [];
-      // const list = new Array(1).fill(undefined).map((_i, j) => ({
-      //   id: j + 1,
-      //   workDate: dayjs().add(j, 'day').format('YYYY-MM-DD'),
-      //   dailyWage: 11,
-      //   highTemperatureSubsidy: 22,
-      //   realWages: 33,
-      //   rentalSubsidy: 44,
-      //   requirementsInfoId: 55,
-      //   settleAccountsProportion: 66,
-      //   subsidyFestival: 77,
-      //   trafficSubsidy: 88,
-      // }));
-      console.log('获取列表数据 --->', getTableTotal(list));
+      // console.log('获取列表数据 --->', getTableTotal(list));
       setTableData(getTableTotal(list));
     }
   };
@@ -121,6 +112,7 @@ const OrderSettleView: React.FC<{ detail: DetailType }> = ({ detail }) => {
     if (res && res.code === '200') {
       message.success('操作成功');
       await getTableData();
+      onRefresh();
     }
   };
   // 组件挂载
@@ -144,7 +136,8 @@ const OrderSettleView: React.FC<{ detail: DetailType }> = ({ detail }) => {
       dataIndex: 'action',
       align: 'center',
       render: (_value, record, index) =>
-        index !== tableData.length - 1 && (
+        index !== tableData.length - 1 &&
+        detail?.serviceOrderFormDetailsDTO?.orderStatus === '400' && (
           <>
             <Button
               type='link'
@@ -166,24 +159,28 @@ const OrderSettleView: React.FC<{ detail: DetailType }> = ({ detail }) => {
     <>
       <div className='order-settle'>
         <div className='settle-title'>订单结算</div>
-        <Button
-          size='middle'
-          type='primary'
-          icon={<PlusOutlined />}
-          style={{ marginBottom: '10px' }}
-          onClick={() => setAddEditVisible(true)}
-        >
-          添加
-        </Button>
-        <Table size='small' rowKey='id' bordered columns={columns} dataSource={tableData} />
-        <div className='settle-action'>
-          <Button size='middle' type='primary' onClick={handleSubmit}>
-            确认修改
-          </Button>
-          <Button size='middle' onClick={getTableData}>
-            重置
+        {detail?.serviceOrderFormDetailsDTO?.orderStatus === '400' && (
+          <Button
+            size='middle'
+            type='primary'
+            icon={<PlusOutlined />}
+            style={{ marginBottom: '10px' }}
+            onClick={() => setAddEditVisible(true)}
+          >
+            添加
           </Button>
-        </div>
+        )}
+        <Table size='small' rowKey='id' bordered columns={columns} dataSource={tableData} />
+        {detail?.serviceOrderFormDetailsDTO?.orderStatus === '400' && (
+          <div className='settle-action'>
+            <Button size='middle' type='primary' onClick={handleSubmit}>
+              确认修改
+            </Button>
+            <Button size='middle' onClick={getTableData}>
+              重置
+            </Button>
+          </div>
+        )}
       </div>
       <OrderSettleModal
         open={addEditVisible}

src/pages/orderManage/demandOrder/orderDetail/index.tsx

@@ -168,6 +168,10 @@ const DemandOrderDetail = () => {
       return [];
     }
   };
+  // 刷新详情信息
+  const handleRefresh = () => {
+    getServiceOrderFormDetails(Number(searchParams.get('id')));
+  };
 
   useEffect(() => {
     getServiceOrderFormDetails(Number(searchParams.get('id')));
@@ -203,8 +207,8 @@ const DemandOrderDetail = () => {
         <Descriptions.Item label='订单编号'>
           {demandDetail?.serviceOrderFormDetailsDTO?.publisherNumber}
         </Descriptions.Item>
-        <Descriptions.Item label='订单金额'>
-          {demandDetail?.serviceOrderFormDetailsDTO?.orderAmount.toFixed(2).toLocaleString()}
+        <Descriptions.Item label='订单描述'>
+          {demandDetail?.serviceOrderFormDetailsDTO?.requireDescription}
         </Descriptions.Item>
         <Descriptions.Item label='任务时间'>
           {demandDetail?.serviceOrderFormDetailsDTO?.taskStartTime}~
@@ -213,6 +217,9 @@ const DemandOrderDetail = () => {
         <Descriptions.Item label='任务地址'>
           {demandDetail?.serviceOrderFormDetailsDTO?.taskAddress}
         </Descriptions.Item>
+        <Descriptions.Item label='订单金额'>
+          {demandDetail?.serviceOrderFormDetailsDTO?.orderAmount.toFixed(2).toLocaleString()}
+        </Descriptions.Item>
         <Descriptions.Item label='平台收益'>
           {demandDetail?.serviceOrderFormDetailsDTO?.orderEarnings.toFixed(2).toLocaleString()}
         </Descriptions.Item>
@@ -293,9 +300,10 @@ const DemandOrderDetail = () => {
         </Descriptions.Item>
       </Descriptions>
       {/*订单结算*/}
-      {demandDetail?.serviceOrderFormDetailsDTO?.orderStatus === '400' && (
-        <OrderSettleView detail={demandDetail} />
-      )}
+      {demandDetail &&
+        Number(demandDetail?.serviceOrderFormDetailsDTO?.orderStatus || 0) >= 400 && (
+          <OrderSettleView detail={demandDetail} onRefresh={() => handleRefresh()} />
+        )}
       <Descriptions
         title='订单争议处理记录'
         style={{ marginTop: '10px' }}