Merge branch 'bugfix-250603' into 'dev'

Bugfix 250603 See merge request !47

Merge branch 'bugfix-250603' into 'dev'
Bugfix 250603 See merge request !47
boyang
2 parents 2ec279c1 0f2095b0
Showing 1 changed file with 42 additions and 16 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
@@ -250,6 +250,30 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     console.log(newAccountOptions);
     setAccountOptions(newAccountOptions);
+
+    // 如果privatePocket为true且有隐私钱包选项，自动选择隐私钱包
+    if (copyData.privatePocket === true || copyData.privatePocket === 'true') {
+      console.log('检测到privatePocket为true，尝试自动选择隐私钱包');
+
+      // 查找隐私钱包选项
+      const privacyWalletOption = newAccountOptions.find(
+        (option) => option.institution === '隐私钱包',
+      );
+
+      if (privacyWalletOption) {
+        // 找到了隐私钱包选项，获取其索引
+        const index = newAccountOptions.indexOf(privacyWalletOption);
+        // 构造包含索引的value值 (与ProFormSelect的options映射保持一致)
+        const valueWithIndex = `${privacyWalletOption.value}_${index}`;
+
+        // 设置表单字段值
+        form.setFieldValue('prepaidUid', valueWithIndex);
+        form.setFieldValue('realPrepaidUid', privacyWalletOption.uid);
+        form.setFieldValue('privatePocket', 'true');
+      } else {
+        console.log('未找到可用的隐私钱包选项');
+      }
+    }
   }
   /**
@@ -938,19 +962,26 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             values.paymentMethod === 'WITHHOLDING_ADVANCE_DEPOSIT' &&
             values.prepaidUid
           ) {
-            console.log('5656原始表单数据:', {
-              prepaidUid: values.prepaidUid,
-              realPrepaidUid: values.realPrepaidUid,
-              privatePocket: values.privatePocket,
-            });
-
             // 从选项值中提取原始UID (不包含索引后缀)
-            const prepaidUidParts = values.prepaidUid.split('_');
-            if (prepaidUidParts.length > 0) {
-              // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
-              values.prepaidUid = parseInt(prepaidUidParts[0], 10);
-              console.log('5656使用原始UID进行API提交:', values.prepaidUid);
+            // 检查prepaidUid是否为字符串类型并包含下划线
+            if (
+              values.prepaidUid &&
+              typeof values.prepaidUid === 'string' &&
+              values.prepaidUid.includes('_')
+            ) {
+              const prepaidUidParts = values.prepaidUid.split('_');
+              if (prepaidUidParts.length > 0) {
+                // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
+                values.prepaidUid = parseInt(prepaidUidParts[0], 10);
+              }
+            } else if (
+              values.prepaidUid &&
+              typeof values.prepaidUid === 'string'
+            ) {
+              // 处理纯字符串情况 (没有索引后缀)
+              values.prepaidUid = parseInt(values.prepaidUid, 10);
             }
+            // 如果是数字类型，则无需处理
             // 确保privatePocket字段被正确设置
             // 表单中存储的是字符串'true'或'false'，需要转换成布尔值
@@ -968,8 +999,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             });
           }
-          console.log(values, '5656values');
-
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
@@ -1865,9 +1894,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           showSearch
           label="预存账号"
           onChange={async (value: any, option: any) => {
-            console.log(value, '5656value');
-            console.log(option, '5656option');
-
             if (!option) {
               form.setFieldValue('prepaidUid', undefined);
               form.setFieldValue('privatePocket', false);