Merge branch 'feature-PrivatePocket' into 'dev'

feat: 新增隐私钱包消费记录 See merge request !37

Merge branch 'feature-PrivatePocket' into 'dev'
feat: 新增隐私钱包消费记录 See merge request !37
boyang
2 parents 6329b78d 58558396
Showing 3 changed files with 36 additions and 13 deletions
.umirc.ts
src/pages/Prepaid/PrivatePocket/index.tsx
src/pages/Prepaid/components/RechargePrepaymentModal.tsx
@@ -130,7 +130,7 @@ export default defineConfig({
       ],
     },
     {
-      name: '预存管理',
+      name: '账户管理',
       path: '/prepaid',
       icon: 'AccountBookOutlined',
       access: 'canReadAdminAndFinanceAndSales',
@@ -9,6 +9,7 @@ import { formatDateTime } from &#39;@/utils&#39;;
 import { ActionType, ProTable } from '@ant-design/pro-components';
 import { Button, message } from 'antd';
 import { useRef, useState } from 'react';
+import BalanceChangeRecordsModal from '../components/BalanceChangeRecordsModal';
 import AddPrivatePocketModal from './components/AddPrivatePocketModal';
 import { PRIVATE_POCKET_COLUMNS } from './constant';
 import './index.less';
@@ -16,6 +17,11 @@ import &#39;./index.less&#39;;
 const PrivatePocketPage = () => {
   const actionRef = useRef<ActionType>();
   const [addModalVisible, setAddModalVisible] = useState<boolean>(false);
+  const [currentOptRecord, setCurrentOptRecord] = useState(null);
+  const [
+    balanceChangeRecordsModalVisible,
+    setBalanceChangeRecordsModalVisible,
+  ] = useState<boolean>(false);
   const reloadTable = () => {
     actionRef.current?.reload();
@@ -60,6 +66,20 @@ const PrivatePocketPage = () =&gt; {
         let btns = [];
         btns.push(
+          <Button
+            className="p-0"
+            key="view"
+            type="link"
+            onClick={() => {
+              setCurrentOptRecord(record);
+              setBalanceChangeRecordsModalVisible(true);
+            }}
+          >
+            消费记录
+          </Button>,
+        );
+
+        btns.push(
           <ButtonConfirm
             key="delete"
             className="p-0"
@@ -148,6 +168,17 @@ const PrivatePocketPage = () =&gt; {
           }}
         />
       )}
+
+      {balanceChangeRecordsModalVisible && (
+        <BalanceChangeRecordsModal
+          setVisible={setBalanceChangeRecordsModalVisible}
+          userInfoObj={currentOptRecord}
+          onClose={() => {
+            setBalanceChangeRecordsModalVisible(false);
+            reloadTable();
+          }}
+        />
+      )}
     </div>
   );
 };
@@ -33,7 +33,6 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
     rechargeType: string; // 充值类型
   }>();
   const [salesCodeOptions, setSalesCodeOptions] = useState([]);
-  const [setRechargeType] = useState<string>('normal'); // 默认普通充值
   const [isCreate, setIsCreate] = useState(true);
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [previewOpen, setPreviewOpen] = useState(false);
@@ -245,8 +244,8 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           },
         }}
         onFinish={async (values) => {
-          // 隐私钱包充值不需要凭证
-          if (values.rechargeType !== 'privatePocket' && fileList.length <= 0) {
+          // 所有充值类型都需要凭证
+          if (fileList.length <= 0) {
             message.error('凭证不能为空');
             return;
           }
@@ -282,10 +281,7 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
             }
           }
           // 所有充值类型都传递rechargeType参数
-          // 如果是隐私钱包充值且不需要凭证，直接创建空凭证数组
-          if (values.rechargeType === 'privatePocket' && fileList.length <= 0) {
-            values.proofImages = [];
-          }
+          // 所有充值类型都需要凭证
           // 普通充值流程
           let res = await postServiceOrderFileProcess({
             data: formData,
@@ -439,11 +435,7 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
             normal: '普通充值',
             privatePocket: '隐私钱包充值',
           }}
-          fieldProps={{
-            onChange: (value) => {
-              setRechargeType(value);
-            },
-          }}
+          // No special handling needed for different recharge types now
           rules={[{ required: true, message: '请选择充值类型' }]}
         />
         <ProFormDigit