fix: 修复利润分析表下载bug,优化搜索全选效果，修正搜索复选bug

张
1 parent c0409581
Showing 7 changed files with 303 additions and 89 deletions
src/views/project/config/index.vue
src/views/project/finance/financeList/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/index.vue
@@ -18,19 +18,19 @@
         <Tabs.TabPane key="4" tab="邮件发送配置" v-if="role !== ROLE.FINANCE"
           ><EmailPanel
         /></Tabs.TabPane>
-        <Tabs.TabPane key="5" tab="最后汇款日期">
+        <Tabs.TabPane key="5" tab="最后汇款日期" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'orderHodTime' }" :column="5" />
         </Tabs.TabPane>
-        <Tabs.TabPane key="6" tab="提成成本配置">
+        <Tabs.TabPane key="6" tab="提成成本配置" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'costSettingItem', relationName: currentYear }" :column="6" />
         </Tabs.TabPane>
         <Tabs.TabPane key="7" tab="销售额配置" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'salesAmount' }" :column="7" />
         </Tabs.TabPane>
-        <Tabs.TabPane key="8" tab="生产科应付日期">
+        <Tabs.TabPane key="8" tab="生产科应付日期" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'produHodTime' }" :column="8" />
         </Tabs.TabPane>
-        <Tabs.TabPane key="9" tab="生产科固定成本">
+        <Tabs.TabPane key="9" tab="生产科固定成本" v-if="role !== ROLE.FINANCE">
           <TablePanel :searchInfo="{ relationCode: 'ProduceSettingItem', relationName: currentYear }" :column="9" />
         </Tabs.TabPane>
         <Tabs.TabPane key="10" tab="客户公司" v-if="role !== ROLE.FINANCE">
@@ -25,7 +25,7 @@
           <a-button
             type="primary"
             danger
-            v-if="role == ROLE.ADMIN || role == ROLE.FINANCE"
+            v-if="role == ROLE.ADMIN"
             :style="{ borderRadius: '5px 5px 5px 5px' }"
           >
             设置为已完成
 <template>
   <div>
-    <BasicTable @register="registerTable" :bordered="true">
+    <BasicTable @register="registerTable" :bordered="true" @field-value-change="handleFieldValueChange">
       <template #headerTop>
         <a-alert type="info" show-icon>
           <template #message>
@@ -116,11 +116,47 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm, setProps }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, getDataSource, setSelectedRowKeys, setProps, getForm }] = useTable({
+    title: '',
     api: getInnerProfit,
     bordered: true,
     columns: COLUMNS,
     rowKey: 'orderId',
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      resetFunc: async () => {
+        localStorage.removeItem('isAllSelected');
+      },
+    },
+    // 处理查询参数，确保项目号数组正确传递
+    handleSearchInfoFn: (searchInfo) => {
+      // 获取表单实例
+      const formInstance = getForm();
+      if (formInstance) {
+        const formValues = formInstance.getFieldsValue();
+        
+        // 强制覆盖searchInfo，确保使用表单中的值
+        if (formValues.projectNo && formValues.projectNo.length > 0) {
+          // 确保传递的是数组而不是Proxy对象，并去重
+          const projectNoArray = [...new Set(formValues.projectNo)];
+          // 强制覆盖，不使用原始值
+          searchInfo = {
+            ...searchInfo,
+            projectNo: projectNoArray
+          };
+        } else {
+          // 如果表单中没有项目号，清空查询条件
+          searchInfo = {
+            ...searchInfo,
+            projectNo: []
+          };
+        }
+      }
+      
+      return searchInfo;
+    },
     customRow: () => {
       return {
         onClick: (e) => {
@@ -138,11 +174,6 @@
       onSelectAll: onSelectAll,
       checkStrictly: true,
     },
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -516,17 +547,9 @@
       return;
     }
-    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
     try {
-      // 提示用户查询成功
-      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
-      
-      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
-      setProps({
-        searchInfo: {
-          projectNo: allProjectNos
-        }
-      });
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
       // 获取表单实例并设置表单值，将项目号填入搜索框
       const formInstance = getForm();
@@ -536,13 +559,36 @@
         });
       }
-      // 重新加载表格数据，回到第一页
+      // 将allProjectNoOptions更新为已勾选的项目号数组，这样用户取消勾选时数组会同步更新
+      allProjectNoOptions.value = allProjectNos.map(projectNo => ({
+        label: projectNo,
+        value: projectNo
+      }));
+      
+      // 标记为全选状态
+      localStorage.setItem('isAllSelected', 'true');
+    } catch (error) {
+      console.error('全选失败:', error);
+      createMessage.error('全选失败，请检查网络连接！');
+    }
+  }
+
+  // 监听表单字段变化
+  function handleFieldValueChange(field: string, value: any) {
+    // 如果是项目号字段变化且处于全选状态，同步更新查询条件
+    if (field === 'projectNo' && localStorage.getItem('isAllSelected') === 'true') {
+      // 确保value是数组格式，并去重
+      const projectNoArray = Array.isArray(value) ? [...new Set(value)] : [];
+      
+      // 强制重新加载表格，使用新的查询条件
       reload({
-        page: 1
+        searchInfo: {
+          projectNo: projectNoArray
+        }
       });
-    } catch (error) {
-      console.error('查询失败:', error);
-      createMessage.error('查询失败，请检查网络连接！');
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
     }
   }
 </script>
 <template>
   <div>
-    <BasicTable @register="registerTable" :bordered="true">
+    <BasicTable @register="registerTable" :bordered="true" @field-value-change="handleFieldValueChange">
       <template #headerTop>
         <a-alert type="info" show-icon>
           <template #message>
@@ -115,11 +115,47 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, setProps, getForm }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, getDataSource, setSelectedRowKeys, setProps, getForm }] = useTable({
+    title: '',
     api: getInnerProduceProfit,
     bordered: true,
     columns: COLUMNS,
     clickToRowSelect: false,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      resetFunc: async () => {
+        localStorage.removeItem('isAllSelected');
+      },
+    },
+    // 处理查询参数，确保项目号数组正确传递
+    handleSearchInfoFn: (searchInfo) => {
+      // 获取表单实例
+      const formInstance = getForm();
+      if (formInstance) {
+        const formValues = formInstance.getFieldsValue();
+        
+        // 强制覆盖searchInfo，确保使用表单中的值
+        if (formValues.projectNo && formValues.projectNo.length > 0) {
+          // 确保传递的是数组而不是Proxy对象，并去重
+          const projectNoArray = [...new Set(formValues.projectNo)];
+          // 强制覆盖，不使用原始值
+          searchInfo = {
+            ...searchInfo,
+            projectNo: projectNoArray
+          };
+        } else {
+          // 如果表单中没有项目号，清空查询条件
+          searchInfo = {
+            ...searchInfo,
+            projectNo: []
+          };
+        }
+      }
+      
+      return searchInfo;
+    },
     rowKey: (record) => record.projectNoPrefix || record.id || record.serialNumber,
     rowSelection: {
       type: 'checkbox',
@@ -127,11 +163,6 @@
       onSelect: onSelect,
       onSelectAll: onSelectAll,
     },
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -439,17 +470,9 @@
       return;
     }
-    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
     try {
-      // 提示用户查询成功
-      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
-      
-      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
-      setProps({
-        searchInfo: {
-          projectNo: allProjectNos
-        }
-      });
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
       // 获取表单实例并设置表单值，将项目号填入搜索框
       const formInstance = getForm();
@@ -459,13 +482,36 @@
         });
       }
-      // 重新加载表格数据，回到第一页
+      // 将allProjectNoOptions更新为已勾选的项目号数组，这样用户取消勾选时数组会同步更新
+      allProjectNoOptions.value = allProjectNos.map(projectNo => ({
+        label: projectNo,
+        value: projectNo
+      }));
+      
+      // 标记为全选状态
+      localStorage.setItem('isAllSelected', 'true');
+    } catch (error) {
+      console.error('全选失败:', error);
+      createMessage.error('全选失败，请检查网络连接！');
+    }
+  }
+
+  // 监听表单字段变化
+  function handleFieldValueChange(field: string, value: any) {
+    // 如果是项目号字段变化且处于全选状态，同步更新查询条件
+    if (field === 'projectNo' && localStorage.getItem('isAllSelected') === 'true') {
+      // 确保value是数组格式，并去重
+      const projectNoArray = Array.isArray(value) ? [...new Set(value)] : [];
+      
+      // 强制重新加载表格，使用新的查询条件
       reload({
-        page: 1
+        searchInfo: {
+          projectNo: projectNoArray
+        }
       });
-    } catch (error) {
-      console.error('查询失败:', error);
-      createMessage.error('查询失败，请检查网络连接！');
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
     }
   }
 </script>
 <template>
   <div>
-    <BasicTable @register="registerTable" :bordered="true">
+    <BasicTable @register="registerTable" :bordered="true" @field-value-change="handleFieldValueChange">
       <template #headerTop>
         <a-alert type="info" show-icon>
           <template #message>
@@ -120,16 +120,48 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm, setProps }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, getDataSource, setSelectedRowKeys, setProps, getForm }] = useTable({
+    title: '',
     api: getPackageProfit,
     bordered: true,
     columns: COLUMNS,
-    rowKey: (record) => record.orderId,
+    clickToRowSelect: false,
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
+      resetFunc: async () => {
+        localStorage.removeItem('isAllSelected');
+      },
+    },
+    // 处理查询参数，确保项目号数组正确传递
+    handleSearchInfoFn: (searchInfo) => {
+      // 获取表单实例
+      const formInstance = getForm();
+      if (formInstance) {
+        const formValues = formInstance.getFieldsValue();
+        
+        // 强制覆盖searchInfo，确保使用表单中的值
+        if (formValues.projectNo && formValues.projectNo.length > 0) {
+          // 确保传递的是数组而不是Proxy对象，并去重
+          const projectNoArray = [...new Set(formValues.projectNo)];
+          // 强制覆盖，不使用原始值
+          searchInfo = {
+            ...searchInfo,
+            projectNo: projectNoArray
+          };
+        } else {
+          // 如果表单中没有项目号，清空查询条件
+          searchInfo = {
+            ...searchInfo,
+            projectNo: []
+          };
+        }
+      }
+      
+      return searchInfo;
     },
+    rowKey: (record) => record.orderId,
     // Add custom row props to prevent selection when clicking rows
     customRow: () => {
       return {
@@ -510,17 +542,9 @@
       return;
     }
-    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
     try {
-      // 提示用户查询成功
-      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
-      
-      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
-      setProps({
-        searchInfo: {
-          projectNo: allProjectNos
-        }
-      });
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
       // 获取表单实例并设置表单值，将项目号填入搜索框
       const formInstance = getForm();
@@ -530,13 +554,36 @@
         });
       }
-      // 重新加载表格数据，回到第一页
+      // 将allProjectNoOptions更新为已勾选的项目号数组，这样用户取消勾选时数组会同步更新
+      allProjectNoOptions.value = allProjectNos.map(projectNo => ({
+        label: projectNo,
+        value: projectNo
+      }));
+      
+      // 标记为全选状态
+      localStorage.setItem('isAllSelected', 'true');
+    } catch (error) {
+      console.error('全选失败:', error);
+      createMessage.error('全选失败，请检查网络连接！');
+    }
+  }
+
+  // 监听表单字段变化
+  function handleFieldValueChange(field: string, value: any) {
+    // 如果是项目号字段变化且处于全选状态，同步更新查询条件
+    if (field === 'projectNo' && localStorage.getItem('isAllSelected') === 'true') {
+      // 确保value是数组格式，并去重
+      const projectNoArray = Array.isArray(value) ? [...new Set(value)] : [];
+      
+      // 强制重新加载表格，使用新的查询条件
       reload({
-        page: 1
+        searchInfo: {
+          projectNo: projectNoArray
+        }
       });
-    } catch (error) {
-      console.error('查询失败:', error);
-      createMessage.error('查询失败，请检查网络连接！');
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
     }
   }
 </script>
@@ -60,7 +60,13 @@ export const searchFormSchema = [
       onSearch: async (value) => {
         const result = await queryNoOptions('projectNo', value);
         projectNoOptions.value = result;
-        allProjectNoOptions.value = result;
+        allProjectNoOptions.value = projectNoOptions.value;
+      },
+      onChange: (value) => {
+        // 当项目号选择变化时，更新查询条件
+        if (localStorage.getItem('isAllSelected') === 'true') {
+
+        }
       },
     },
   },
@@ -322,11 +328,13 @@ export const COLUMNS = [
         axios
           .post(
             '/basic-api/project/businessProfit/export',
-            {},  // 请求体为空
             {
-              params: {
-                projectNoPrefix: column.record.projectNoPrefix,  // 将参数放到查询字符串中
-              },
+              ProjectNo:column.record.detailProjectNo
+            },  // 请求体为空
+            {
+              // params: {
+              //   projectNoPrefix: column.record.projectNoPrefix,  // 将参数放到查询字符串中
+              // },
               headers: {
                 Authorization: `${token}`,  // 去掉引号
               },
 <template>
   <div>
-    <BasicTable @register="registerTable" :bordered="true">
+    <BasicTable @register="registerTable" :bordered="true" @field-value-change="handleFieldValueChange">
       <template #headerTop>
         <a-alert type="info" show-icon>
           <template #message>
@@ -89,6 +89,49 @@
       labelWidth: 120,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
+      resetFunc: async () => {
+        localStorage.removeItem('isAllSelected');
+        setProps({
+          searchInfo: {
+            projectNo: []
+          }
+        });
+      },
+    },
+    handleSearchInfoFn: (searchInfo) => {
+      console.log('=== handleSearchInfoFn 开始 ===');
+      console.log('原始 searchInfo:', searchInfo);
+      
+      // 获取表单实例
+      const formInstance = getForm();
+      if (formInstance) {
+        const formValues = formInstance.getFieldsValue();
+        console.log('表单值:', formValues);
+        
+        // 强制覆盖searchInfo，确保使用表单中的值
+        if (formValues.projectNo && formValues.projectNo.length > 0) {
+          // 确保传递的是数组而不是Proxy对象，并去重
+          const projectNoArray = [...new Set(formValues.projectNo)];
+          // 强制覆盖，不使用原始值
+          searchInfo = {
+            ...searchInfo,
+            projectNo: projectNoArray
+          };
+          console.log('强制使用表单中的项目号:', projectNoArray);
+        } else {
+          // 如果表单中没有项目号，清空查询条件
+          searchInfo = {
+            ...searchInfo,
+            projectNo: []
+          };
+          console.log('清空项目号查询条件');
+        }
+      }
+      
+      console.log('处理后的 searchInfo:', searchInfo);
+      console.log('=== handleSearchInfoFn 结束 ===');
+      
+      return searchInfo;
     },
     rowKey: (record) => record.detailProjectNo || record.id || record.serialNumber,
     rowSelection: {
@@ -168,6 +211,34 @@
     await orderStore.getDict();
   });
+  // 监听表单字段变化
+  function handleFieldValueChange(field: string, value: any) {
+    // 如果是项目号字段变化且处于全选状态，同步更新查询条件
+    if (field === 'projectNo' && localStorage.getItem('isAllSelected') === 'true') {
+      console.log('=== handleFieldValueChange 开始 ===');
+      console.log('field:', field);
+      console.log('value:', value);
+      
+      // 确保value是数组格式，并去重
+      const projectNoArray = Array.isArray(value) ? [...new Set(value)] : [];
+      
+      console.log('处理后的项目号数组:', projectNoArray);
+      
+      // 强制重新加载表格，使用新的查询条件
+      reload({
+        searchInfo: {
+          projectNo: projectNoArray
+        }
+      });
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
+      
+      console.log('更新后的查询条件:', projectNoArray);
+      console.log('=== handleFieldValueChange 结束 ===');
+    }
+  }
+
   function handleFinanceEdit(record) {
     openFinanceEdit(true, {
       data: record,
@@ -407,17 +478,9 @@
       return;
     }
-    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
     try {
-      // 提示用户查询成功
-      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
-      
-      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
-      setProps({
-        searchInfo: {
-          projectNo: allProjectNos
-        }
-      });
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
       // 获取表单实例并设置表单值，将项目号填入搜索框
       const formInstance = getForm();
@@ -427,13 +490,17 @@
         });
       }
-      // 重新加载表格数据，回到第一页
-      reload({
-        page: 1
-      });
+      // 将allProjectNoOptions更新为已勾选的项目号数组，这样用户取消勾选时数组会同步更新
+      allProjectNoOptions.value = allProjectNos.map(projectNo => ({
+        label: projectNo,
+        value: projectNo
+      }));
+      
+      // 标记为全选状态
+      localStorage.setItem('isAllSelected', 'true');
     } catch (error) {
-      console.error('查询失败:', error);
-      createMessage.error('查询失败，请检查网络连接！');
+      console.error('全选失败:', error);
+      createMessage.error('全选失败，请检查网络连接！');
     }
   }
 </script>