Merge branch 'zwl-develop' into 'develop'

Zwl develop See merge request !7

Merge branch 'zwl-develop' into 'develop'
Zwl develop See merge request !7
张
2 parents 4d1d2e7c 13928607
Showing 11 changed files with 558 additions and 60 deletions
src/views/project/config/index.vue
src/views/project/finance/financeList/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/FinanceEdit.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' }"
           >
             设置为已完成
@@ -9,6 +9,8 @@ import { useOrderInfo } from &#39;/@/hooks/component/order&#39;;
 const innerNoOptions = ref([]);
 const projectNoOptions = ref([]);
+const allProjectNoOptions = ref([]);
+export { allProjectNoOptions };
 const orderStore = useOrderStoreWithOut();
 const {
   customerCode,
@@ -38,11 +40,10 @@ export const searchFormSchema = [
       showSearch: true,
       mode: 'multiple',
       onSearch: async (value: any) => {
-        projectNoOptions.value = await queryNoOptions('projectNo', value);
+        const result = await queryNoOptions('projectNo', value);
+        projectNoOptions.value = result;
+        allProjectNoOptions.value = result;
       },
-      // onSearch: async (value: any) => {
-      //   projectNoOptions.value = await queryNoOptions('projectNo', value);
-      // },
     },
   },
   {
 <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>
@@ -46,6 +46,11 @@
           :style="{ borderRadius: '5px 5px 5px 5px' }"
           >导出</a-button
         >
+        <a-button
+          type="primary"
+          @click="handleAllProjectNoQuery"
+          style="margin-left: 8px;position: fixed;right: 29%;top: 107.5px;"
+        >全选</a-button>
       </template>
     </BasicTable>
     <!-- <BasicModal
@@ -68,7 +73,7 @@
 <script setup lang="ts">
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getInnerProfit, setInnerStatus } from '@/api/project/invoice';
-  import { searchFormSchema, COLUMNS } from './data';
+  import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { onMounted, ref, computed } from 'vue';
@@ -111,11 +116,47 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm }] = 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) => {
@@ -133,11 +174,6 @@
       onSelectAll: onSelectAll,
       checkStrictly: true,
     },
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -485,5 +521,75 @@
     }
     setSelectedRowKeys(checkedKeys.value as any);
   }
+
+  function handleAllProjectNoQuery() {
+    // 检查是否有项目号选项
+    if (!allProjectNoOptions.value || allProjectNoOptions.value.length === 0) {
+      createMessage.warn('没有可查询的项目号！');
+      return;
+    }
+    
+    // 获取所有项目号的value值
+    const allProjectNos = allProjectNoOptions.value.map(item => {
+      // 处理不同的数据结构
+      if (typeof item === 'string') {
+        return item;
+      } else if (item && typeof item === 'object' && 'value' in item) {
+        return item.value;
+      } else if (item && typeof item === 'object' && 'label' in item) {
+        return item.label;
+      }
+      return item;
+    }).filter(Boolean); // 过滤掉空值
+    
+    if (allProjectNos.length === 0) {
+      createMessage.warn('没有有效的项目号！');
+      return;
+    }
+    
+    try {
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 将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({
+        searchInfo: {
+          projectNo: projectNoArray
+        }
+      });
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
+    }
+  }
 </script>
 <style></style>
@@ -27,6 +27,8 @@ const userStore = useUserStoreWithOut();
 // ];
 const innerNoOptions = ref([]);
 const projectNoOptions = ref([]);
+const allProjectNoOptions = ref([]);
+export { allProjectNoOptions };
 const orderStore = useOrderStoreWithOut();
 const {
   customerCode,
@@ -56,11 +58,10 @@ export const searchFormSchema = [
       showSearch: true,
       mode: 'multiple',
       onSearch: async (value: any) => {
-        projectNoOptions.value = await queryNoOptions('projectNo', value);
+        const result = await queryNoOptions('projectNo', value);
+        projectNoOptions.value = result;
+        allProjectNoOptions.value = result;
       },
-      // onSearch: async (value: any) => {
-      //   projectNoOptions.value = await queryNoOptions('projectNo', value);
-      // },
     },
   },
   {
 <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>
@@ -49,6 +49,11 @@
           :style="{ borderRadius: '5px 5px 5px 5px' }"
           >导出</a-button
         >
+        <a-button
+          type="primary"
+          @click="handleAllProjectNoQuery"
+          style="margin-left: 8px;position: fixed;right: 29%;top: 107.5px;"
+        >全选</a-button>
       </template>
     </BasicTable>
     <!-- <BasicModal
@@ -71,7 +76,7 @@
 <script setup lang="ts">
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getInnerProduceProfit, setInnerProfitSetStatus } from '@/api/project/invoice';
-  import { searchFormSchema, COLUMNS } from './data';
+  import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { onMounted, ref, computed } from 'vue';
@@ -110,11 +115,47 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys }] = 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',
@@ -122,11 +163,6 @@
       onSelect: onSelect,
       onSelectAll: onSelectAll,
     },
-    formConfig: {
-      labelWidth: 120,
-      schemas: searchFormSchema,
-      autoSubmitOnEnter: true,
-    },
     useSearchForm: true,
     showTableSetting: true,
     showIndexColumn: false,
@@ -408,5 +444,75 @@
     handleClearChoose();
     reload();
   }
+
+  function handleAllProjectNoQuery() {
+    // 检查是否有项目号选项
+    if (!allProjectNoOptions.value || allProjectNoOptions.value.length === 0) {
+      createMessage.warn('没有可查询的项目号！');
+      return;
+    }
+    
+    // 获取所有项目号的value值
+    const allProjectNos = allProjectNoOptions.value.map(item => {
+      // 处理不同的数据结构
+      if (typeof item === 'string') {
+        return item;
+      } else if (item && typeof item === 'object' && 'value' in item) {
+        return item.value;
+      } else if (item && typeof item === 'object' && 'label' in item) {
+        return item.label;
+      }
+      return item;
+    }).filter(Boolean); // 过滤掉空值
+    
+    if (allProjectNos.length === 0) {
+      createMessage.warn('没有有效的项目号！');
+      return;
+    }
+    
+    try {
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 将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({
+        searchInfo: {
+          projectNo: projectNoArray
+        }
+      });
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
+    }
+  }
 </script>
 <style></style>
@@ -9,6 +9,8 @@ import { useOrderInfo } from &#39;/@/hooks/component/order&#39;;
 const innerNoOptions = ref([]);
 const projectNoOptions = ref([]);
+const allProjectNoOptions = ref([]);
+export { allProjectNoOptions };
 const orderStore = useOrderStoreWithOut();
 const {
   customerCode,
@@ -38,11 +40,10 @@ export const searchFormSchema = [
       showSearch: true,
       mode: 'multiple',
       onSearch: async (value: any) => {
-        projectNoOptions.value = await queryNoOptions('projectNo', value);
+        const result = await queryNoOptions('projectNo', value);
+        projectNoOptions.value = result;
+        allProjectNoOptions.value = result;
       },
-      // onSearch: async (value: any) => {
-      //   projectNoOptions.value = await queryNoOptions('projectNo', value);
-      // },
     },
   },
   {
 <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>
@@ -49,6 +49,11 @@
           :style="{ borderRadius: '5px 5px 5px 5px' }"
           >导出</a-button
         >
+        <a-button
+          type="primary"
+          @click="handleAllProjectNoQuery"
+          style="margin-left: 8px;position: fixed;right: 29%;top: 107.5px;"
+        >全选</a-button>
       </template>
     </BasicTable>
     <!-- <BasicModal
@@ -71,7 +76,7 @@
 <script setup lang="ts">
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getPackageProfit, setPackStatus } from '@/api/project/invoice';
-  import { searchFormSchema, COLUMNS } from './data';
+  import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { onMounted, ref, computed } from 'vue';
@@ -115,16 +120,48 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm }] = 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 {
@@ -479,5 +516,75 @@
     }
     setSelectedRowKeys(checkedKeys.value as any);
   }
+
+  function handleAllProjectNoQuery() {
+    // 检查是否有项目号选项
+    if (!allProjectNoOptions.value || allProjectNoOptions.value.length === 0) {
+      createMessage.warn('没有可查询的项目号！');
+      return;
+    }
+    
+    // 获取所有项目号的value值
+    const allProjectNos = allProjectNoOptions.value.map(item => {
+      // 处理不同的数据结构
+      if (typeof item === 'string') {
+        return item;
+      } else if (item && typeof item === 'object' && 'value' in item) {
+        return item.value;
+      } else if (item && typeof item === 'object' && 'label' in item) {
+        return item.label;
+      }
+      return item;
+    }).filter(Boolean); // 过滤掉空值
+    
+    if (allProjectNos.length === 0) {
+      createMessage.warn('没有有效的项目号！');
+      return;
+    }
+    
+    try {
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 将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({
+        searchInfo: {
+          projectNo: projectNoArray
+        }
+      });
+      
+      // 同时更新detailProjectNoKeys数组
+      detailProjectNoKeys.value = projectNoArray;
+    }
+  }
 </script>
 <style></style>
@@ -25,10 +25,24 @@
       />
       <div style="margin: 16px 0"></div>
       <div style="font-size: 15px">项目开始时间</div>
-      <a-date-picker v-model:value="input3" :disabled="status3 === 'LOCKED'" auto-size />
+      <a-date-picker 
+        v-model:value="input3" 
+        :disabled="status3 === 'LOCKED'" 
+        auto-size 
+        placeholder="请选择项目开始时间"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+      />
       <div style="margin: 16px 0"></div>
       <div style="font-size: 15px">项目结束时间</div>
-      <a-date-picker v-model:value="input4" :disabled="status4 === 'LOCKED'" auto-size />
+      <a-date-picker 
+        v-model:value="input4" 
+        :disabled="status4 === 'LOCKED'" 
+        auto-size 
+        placeholder="请选择项目结束时间"
+        format="YYYY-MM-DD"
+        value-format="YYYY-MM-DD"
+      />
       <div style="margin: 16px 0"></div>
       <div style="font-size: 15px">西班牙已发提成￥</div>
       <a-input
@@ -59,11 +73,14 @@
   import { defineComponent, ref, computed, unref, toRaw, reactive } from 'vue';
   import { getServiceEdit } from '@/api/project/invoice';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { useUserStoreWithOut } from '/@/store/modules/user';
   import { ROLE } from './type.d';
   import type { Dayjs } from 'dayjs';
   import dayjs from 'dayjs';
   const emit = defineEmits(['success']);
+  const userStore = useUserStoreWithOut();
+  const user = userStore.getUserInfo;
   const role = computed(() => {
     return user?.roleSmallVO?.code;
   });
@@ -141,8 +158,8 @@
   const input1 = ref();
   const input2 = ref();
-  const input3 = ref();
-  const input4 = ref();
+  const input3 = ref<Dayjs | null>(null);
+  const input4 = ref<Dayjs | null>(null);
   const input5 = ref();
   const id = ref();
@@ -177,11 +194,23 @@
       status5.value = data?.data?.lockFields?.paidRmbCommission;
     }
     id.value = data?.data?.projectNoPrefix;
-    input1.value = data?.data?.developmentCopyRmbTotalPrice.toFixed(2);
-    input2.value = data?.data?.spainPaidRmbCommission.toFixed(2);
-    input3.value = dayjs(formatDateToDateOnly(data?.data?.projectStartTime));
-    input4.value = dayjs(formatDateToDateOnly(data?.data?.projectEndTime));
-    input5.value = data?.data?.paidRmbCommission.toFixed(2);
+    input1.value = data?.data?.developmentCopyRmbTotalPrice?.toFixed(2) || '';
+    input2.value = data?.data?.spainPaidRmbCommission?.toFixed(2) || '';
+    
+    // 确保日期值正确设置
+    if (data?.data?.projectStartTime) {
+      input3.value = dayjs(formatDateToDateOnly(data.data.projectStartTime));
+    } else {
+      input3.value = null;
+    }
+    
+    if (data?.data?.projectEndTime) {
+      input4.value = dayjs(formatDateToDateOnly(data.data.projectEndTime));
+    } else {
+      input4.value = null;
+    }
+    
+    input5.value = data?.data?.paidRmbCommission?.toFixed(2) || '';
     resetFields();
     setDrawerProps({ confirmLoading: false });
@@ -217,8 +246,8 @@
     if (!visible) {
       input1.value = '';
       input2.value = '';
-      input3.value = '';
-      input4.value = '';
+      input3.value = null;
+      input4.value = null;
       input5.value = '';
     }
   }
@@ -27,6 +27,8 @@ const userStore = useUserStoreWithOut();
 // ];
 const innerNoOptions = ref([]);
 const projectNoOptions = ref([]);
+const allProjectNoOptions = ref([]);
+export { allProjectNoOptions };
 const orderStore = useOrderStoreWithOut();
 const {
   customerCode,
@@ -55,12 +57,17 @@ export const searchFormSchema = [
       options: projectNoOptions,
       showSearch: true,
       mode: 'multiple',
-      onSearch: async (value: any) => {
-        projectNoOptions.value = await queryNoOptions('projectNo', value);
+      onSearch: async (value) => {
+        const result = await queryNoOptions('projectNo', value);
+        projectNoOptions.value = result;
+        allProjectNoOptions.value = projectNoOptions.value;
+      },
+      onChange: (value) => {
+        // 当项目号选择变化时，更新查询条件
+        if (localStorage.getItem('isAllSelected') === 'true') {
+
+        }
       },
-      // onSearch: async (value: any) => {
-      //   projectNoOptions.value = await queryNoOptions('projectNo', value);
-      // },
     },
   },
   // {
@@ -321,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>
@@ -36,6 +36,11 @@
           :style="{ borderRadius: '5px 5px 5px 5px' }"
           >导出</a-button
         >
+        <a-button
+          type="primary"
+          @click="handleAllProjectNoQuery"
+          style="margin-left: 8px;position: fixed;right: 29%;top: 107.5px;"
+        >全选</a-button>
       </template>
     </BasicTable>
     <CheckDetail @register="checkModalRegister" :onGoFormDetail="handleGoFormDetail" />
@@ -46,7 +51,8 @@
 <script setup lang="ts">
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { getServiceProfit, setBusinessProfitSetStatus } from '@/api/project/invoice';
-  import { searchFormSchema, COLUMNS } from './data';
+  import { saveConfig } from '@/api/sys/config';
+  import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import axios from 'axios';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { onMounted, ref, computed, unref } from 'vue';
@@ -73,7 +79,7 @@
   const role = computed(() => {
     return user?.roleSmallVO?.code;
   });
-  const [registerTable, { reload, getSelectRowKeys, getDataSource, setSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRowKeys, getDataSource, setSelectedRowKeys, setProps, getForm }] = useTable({
     title: '',
     api: getServiceProfit,
     bordered: true,
@@ -83,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: {
@@ -162,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,
@@ -192,13 +269,23 @@
   async function handleStatus(record, status) {
     try {
+      // 检查必要参数是否存在
+      if (!record.customerCode || !record.projectNoPrefix) {
+        createMessage.error('缺少必要的参数：客户编码或项目号');
+        return;
+      }
+      
       await setBusinessProfitSetStatus({ 
         customerCode: record.customerCode,
         projectNo: record.projectNoPrefix,
+        status: status // 添加状态参数
       });
+      
+      createMessage.success('状态更新成功！');
       reload();
     } catch (error) {
       console.error('Error updating status:', error);
+      createMessage.error('状态更新失败：' + (error.message || '未知错误'));
     }
   }
@@ -365,5 +452,56 @@
     }
     setSelectedRowKeys(checkedKeys.value as any);
   }
+  // 6/25未完成工作：全选查询
+  function handleAllProjectNoQuery() {
+    // 检查是否有项目号选项
+    if (!allProjectNoOptions.value || allProjectNoOptions.value.length === 0) {
+      createMessage.warn('没有可查询的项目号！');
+      return;
+    }
+    
+    // 获取所有项目号的value值
+    const allProjectNos = allProjectNoOptions.value.map(item => {
+      // 处理不同的数据结构
+      if (typeof item === 'string') {
+        return item;
+      } else if (item && typeof item === 'object' && 'value' in item) {
+        return item.value;
+      } else if (item && typeof item === 'object' && 'label' in item) {
+        return item.label;
+      }
+      return item;
+    }).filter(Boolean); // 过滤掉空值
+    
+    if (allProjectNos.length === 0) {
+      createMessage.warn('没有有效的项目号！');
+      return;
+    }
+    
+    try {
+      // 提示用户全选成功
+      createMessage.success(`已全选 ${allProjectNos.length} 个项目号`);
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 将allProjectNoOptions更新为已勾选的项目号数组，这样用户取消勾选时数组会同步更新
+      allProjectNoOptions.value = allProjectNos.map(projectNo => ({
+        label: projectNo,
+        value: projectNo
+      }));
+      
+      // 标记为全选状态
+      localStorage.setItem('isAllSelected', 'true');
+    } catch (error) {
+      console.error('全选失败:', error);
+      createMessage.error('全选失败，请检查网络连接！');
+    }
+  }
 </script>
 <style></style>