fix: 修复了客户公司table首次编辑不更新问题，新增公司名称；注释全局无用打印，优化资源

张
1 parent 13928607
Showing 16 changed files with 49 additions and 31 deletions
src/components/FieldUpload/src/FieldUpload.vue
src/components/Table/src/hooks/useDataSource.ts
src/utils/http/axios/Axios.ts
src/views/dashboard/analysis/components/GrowCard.vue
src/views/dashboard/analysis/components/VisitAnalysis.vue
src/views/demo/form/index.vue
src/views/project/config/CreateModal.vue
src/views/project/config/TablePanel.vue
src/views/project/config/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerData/HistoryDetail.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/HistoryDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/HistoryDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/HistoryDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/index.vue
src/views/project/order/HistoryDetail.vue
src/views/project/order/TrackHistory.vue
@@ -44,7 +44,7 @@
     reader.readAsDataURL(img);
   }
   const handleData = (data) => {
-    console.log('%c [ data ]-32', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+    // console.log('%c [ data ]-32', 'font-size:13px; background:pink; color:#bf2c9f;', data);
     return { name: data.name };
   };
@@ -307,7 +307,6 @@ export function useDataSource(
       const isArrayResult = Array.isArray(res);
       let resultItems: Recordable[] = isArrayResult ? res : get(res, listField);
-      console.log('%c [ res ]-311', 'font-size:13px; background:pink; color:#bf2c9f;', res);
       const resultTotal: number = isArrayResult ? res.length : get(res, totalField);
       // 假如数据变少，导致总页数变少并小于当前选中页码，通过getPaginationRef获取到的页码是不正确的，需获取正确的页码再次执行
@@ -253,7 +253,7 @@ export class VAxios {
           resolve(res as unknown as Promise<T>);
         })
         .catch((e: Error | AxiosError) => {
-          console.log('%c [ e ]-257', 'font-size:13px; background:pink; color:#bf2c9f;', e);
+          // console.log('%c [ e ]-257', 'font-size:13px; background:pink; color:#bf2c9f;', e);
           if (requestCatchHook && isFunction(requestCatchHook)) {
             reject(requestCatchHook(e, opt));
             return;
@@ -63,8 +63,8 @@
   watch(
     [dateTime, period],
     async ([newDateTime, newPeriod], [oldBusinessPersonIn, oldCustomerCodeIn]) => {
-      console.log('businessPersonIn changed from', oldBusinessPersonIn, 'to', newDateTime);
-      console.log('customerCodeIn changed from', oldCustomerCodeIn, 'to', newPeriod);
+      // console.log('businessPersonIn changed from', oldBusinessPersonIn, 'to', newDateTime);
+      // console.log('customerCodeIn changed from', oldCustomerCodeIn, 'to', newPeriod);
       // 在这里添加你希望在这两个值改变时执行的逻辑
       data1.value = await getApiData({
@@ -138,8 +138,8 @@
   watch(
     [businessPersonIn, customerCodeIn],
     async ([newDateTime, newPeriod], [oldBusinessPersonIn, oldCustomerCodeIn]) => {
-      console.log('businessPersonIn changed from', oldBusinessPersonIn, 'to', newDateTime);
-      console.log('customerCodeIn changed from', oldCustomerCodeIn, 'to', newPeriod);
+      // console.log('businessPersonIn changed from', oldBusinessPersonIn, 'to', newDateTime);
+      // console.log('customerCodeIn changed from', oldCustomerCodeIn, 'to', newPeriod);
       // 在这里添加你希望在这两个值改变时执行的逻辑
       const customerCodeParams = newPeriod
@@ -330,7 +330,6 @@
       // 遍历 res，提取 date 和 totalPrice
       for (const item of res) {
-        console.log(item, 'Processing item');
         x.push(item.date); // 提取日期
         y.push(item.totalPrice); // 提取总价
       }
@@ -503,7 +503,6 @@
         valueField: 'id',
         isBtn: true,
         onChange: (e, v) => {
-          console.log('ApiRadioGroup====>:', e, v);
         },
       },
       colProps: {
@@ -108,6 +108,15 @@
               span: 24,
             },
           },
+          {
+            field: 'relationName',
+            component: 'Input',
+            label: '客户名称',
+            rules: [{ required: true }],
+            colProps: {
+              span: 24,
+            },
+          },
         ],
         showActionButtonGroup: false,
         actionColOptions: {
@@ -152,7 +161,7 @@
                 : props.column === 10
                 ? 'companyConfiguration'
                 : 'produHodTime',
-            relationName: '包装费用',
+            relationName: values.relationName,
             relationValue: values.relationValue,
           };
           await addConfig(params);
@@ -53,6 +53,7 @@
   import ProduCostEdit from './ProduCostEdit.vue';
   import CostCreate from './costCreate.vue';
   import ProduCostCreate from './ProduCostCreate.vue';
+  import { nextTick } from 'vue';
   const props = defineProps({
     searchInfo: {
@@ -68,9 +69,9 @@
   const [registerProduEdit, { openDrawer: openDrawerProduEdit }] = useDrawer();
   const [registerProduCostCreate, { openModal: openProduCreateModal }] = useModal();
-  const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload, getDataSource, setTableData }] = useTable({
     api: getList,
-    searchInfo: { ...props.searchInfo, pageSize: 1000 },
+    searchInfo: { ...props.searchInfo, pageSize: 1000, _t: Date.now() },
     pagination: false,
     columns: COLUMNS[props.column!],
     rowKey: 'id',
@@ -148,13 +149,24 @@
   }
   async function handleSave(record) {
-    if (props.column === 3) {
-      await saveConfig({ id: record.id, settingValue: record.settingValue });
-    } else {
-      await saveConfig({ id: record.id, relationValue: record.relationValue });
+    try {
+      if (props.column === 3) {
+        await saveConfig({ id: record.id, settingValue: record.settingValue });
+      } else {
+        await saveConfig({ id: record.id, relationValue: record.relationValue, relationName: record.relationName });
+      }
+      handleCancel(record);
+      
+      // 强制刷新数据，解决首次编辑不更新的问题
+      const currentData = getDataSource();
+      setTableData([]);
+      await nextTick();
+      setTableData(currentData);
+      await nextTick();
+      reload();
+    } catch (error) {
+      console.error('保存失败:', error);
     }
-    handleCancel(record);
-    reload();
   }
   function handleCostEdit(record: any) {
     openDrawerEdit(true, {
@@ -173,6 +173,13 @@ export const COLUMNS = {
       width: 150,
     },
     {
+      title: '客户名称',
+      dataIndex: 'relationName',
+      width: 150,
+      editComponent: 'Input',
+      editRow: true,
+    },
+    {
       title: '公司名称',
       dataIndex: 'relationValue',
       width: 150,
@@ -132,7 +132,7 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
-        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
@@ -132,7 +132,7 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
-        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
@@ -132,7 +132,7 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
-        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
@@ -132,7 +132,7 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
-        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
           const res = await getProjectOptLog({ 
             projectNoPrefix: data, 
@@ -99,14 +99,11 @@
       },
     },
     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) {
@@ -117,19 +114,15 @@
             ...searchInfo,
             projectNo: projectNoArray
           };
-          console.log('强制使用表单中的项目号:', projectNoArray);
         } else {
           // 如果表单中没有项目号，清空查询条件
           searchInfo = {
             ...searchInfo,
             projectNo: []
           };
-          console.log('清空项目号查询条件');
         }
       }
-      console.log('处理后的 searchInfo:', searchInfo);
-      console.log('=== handleSearchInfoFn 结束 ===');
       return searchInfo;
     },
@@ -132,7 +132,7 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
-        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+        // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
           const res = await getOrderOptLog({ orderId: data, page: page, pageSize: 20 });
           list1.value = res.records;
@@ -60,7 +60,7 @@
   }
   const getOrderOptLogFunc = async (data, page) => {
-    console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
+    // console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
     const res = await trackHistory({ orderId: data, page: page, pageSize: 20 });
     list1.value = res;
     for (const item of list1.value) {