fix: 净利润分析四个页面新增搜索时全选搜索结果功能,首次打开页面日期选择器失效bug修改

张
1 parent fe947a0f
Showing 9 changed files with 320 additions and 36 deletions
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
@@ -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);
-      // },
     },
   },
   {
@@ -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,7 +116,7 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm }] = useTable({
+  const [registerTable, { reload, setSelectedRowKeys, getForm, setProps }] = useTable({
     api: getInnerProfit,
     bordered: true,
     columns: COLUMNS,
@@ -485,5 +490,60 @@
     }
     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;
+    }
+    
+    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
+    try {
+      // 提示用户查询成功
+      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
+      
+      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
+      setProps({
+        searchInfo: {
+          projectNo: allProjectNos
+        }
+      });
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 重新加载表格数据，回到第一页
+      reload({
+        page: 1
+      });
+    } catch (error) {
+      console.error('查询失败:', error);
+      createMessage.error('查询失败，请检查网络连接！');
+    }
+  }
 </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);
-      // },
     },
   },
   {
@@ -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,7 +115,7 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, setSelectedRowKeys, setProps, getForm }] = useTable({
     api: getInnerProduceProfit,
     bordered: true,
     columns: COLUMNS,
@@ -408,5 +413,60 @@
     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;
+    }
+    
+    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
+    try {
+      // 提示用户查询成功
+      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
+      
+      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
+      setProps({
+        searchInfo: {
+          projectNo: allProjectNos
+        }
+      });
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 重新加载表格数据，回到第一页
+      reload({
+        page: 1
+      });
+    } catch (error) {
+      console.error('查询失败:', error);
+      createMessage.error('查询失败，请检查网络连接！');
+    }
+  }
 </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);
-      // },
     },
   },
   {
@@ -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,7 +120,7 @@
       message.value = '';
     }
   };
-  const [registerTable, { reload, setSelectedRowKeys, getForm }] = useTable({
+  const [registerTable, { reload, setSelectedRowKeys, getForm, setProps }] = useTable({
     api: getPackageProfit,
     bordered: true,
     columns: COLUMNS,
@@ -479,5 +484,60 @@
     }
     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;
+    }
+    
+    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
+    try {
+      // 提示用户查询成功
+      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
+      
+      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
+      setProps({
+        searchInfo: {
+          projectNo: allProjectNos
+        }
+      });
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 重新加载表格数据，回到第一页
+      reload({
+        page: 1
+      });
+    } catch (error) {
+      console.error('查询失败:', error);
+      createMessage.error('查询失败，请检查网络连接！');
+    }
+  }
 </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,11 @@ 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 = result;
       },
-      // onSearch: async (value: any) => {
-      //   projectNoOptions.value = await queryNoOptions('projectNo', value);
-      // },
     },
   },
   // {
@@ -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,
@@ -192,13 +198,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 +381,60 @@
     }
     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;
+    }
+    
+    // 使用setProps方法持久化设置searchInfo，这样分页时不会丢失查询条件
+    try {
+      // 提示用户查询成功
+      createMessage.success(`正在查询 ${allProjectNos.length} 个项目号的数据...`);
+      
+      // 使用setProps持久化设置searchInfo，这样分页时会保持查询条件
+      setProps({
+        searchInfo: {
+          projectNo: allProjectNos
+        }
+      });
+      
+      // 获取表单实例并设置表单值，将项目号填入搜索框
+      const formInstance = getForm();
+      if (formInstance && formInstance.setFieldsValue) {
+        formInstance.setFieldsValue({
+          projectNo: allProjectNos
+        });
+      }
+      
+      // 重新加载表格数据，回到第一页
+      reload({
+        page: 1
+      });
+    } catch (error) {
+      console.error('查询失败:', error);
+      createMessage.error('查询失败，请检查网络连接！');
+    }
+  }
 </script>
 <style></style>