Merge branch 'master' into feature-installment2

# Conflicts: # src/pages/Order/OrderList/OrderDrawer.tsx

Merge branch 'master' into feature-installment2
# Conflicts: # src/pages/Order/OrderList/OrderDrawer.tsx
boyang
2 parents bb230f20 d90ecca7
Showing 5 changed files with 64 additions and 5 deletions
src/pages/Invoice/Invoice/index.tsx
src/pages/Invoice/constant.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/OrderReport/index.tsx
src/pages/ResearchGroup/ResearchGroup/constant.tsx
@@ -52,6 +52,11 @@ const InvoiceRecord = () =&gt; {
       let dataIndex = item.dataIndex;
       let dataType = item.valueType;
+      // 如果是mainOrderIds列并且已经有自己的render函数，不要覆盖
+      if (dataIndex === 'mainOrderIds' && item.render) {
+        return newItem;
+      }
+
       newItem.render = (text, record) => {
         let textValue = record[dataIndex];
@@ -108,16 +113,17 @@ const InvoiceRecord = () =&gt; {
         if (record.paths?.includes('edit')) {
           btns.push(
             <a
+              className="p-0"
               key="editable"
               onClick={() => {
                 action?.startEditable?.(record.id);
               }}
+              style={{ marginRight: 8, whiteSpace: 'nowrap' }}
             >
               编辑
             </a>,
           );
         }
-
         if (record.paths?.includes('writeOff') && !record.writeOffId) {
           btns.push(
             <InvoiceWriteOffModal
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
 import { enumToProTableEnumValue } from '@/utils';
 import { PAYEE_OPTIONS } from '../Order/constant';
@@ -45,6 +46,53 @@ export const INVOICE_COLUMNS = [
     width: 100,
   },
   {
+    dataIndex: 'mainOrderIds',
+    title: '主订单id',
+    valueType: 'text',
+    width: 160,
+    hideInTable: false,
+    hideInSearch: true,
+    readonly: true,
+    render: (text: any, record: any) => {
+      if (!record.mainOrderIds || record.mainOrderIds.length === 0) {
+        return '-';
+      }
+
+      let content = '';
+
+      // 直接从text参数中处理，可能是已处理过的数组
+      if (text && Array.isArray(text)) {
+        content = text.join(', ');
+      }
+      // 如果record.mainOrderIds是数组，直接join
+      else if (Array.isArray(record.mainOrderIds)) {
+        content = record.mainOrderIds.join(', ');
+      }
+      // 如果是字符串，检查是否为JSON格式的数组
+      else if (typeof record.mainOrderIds === 'string') {
+        try {
+          // 尝试解析JSON
+          const parsedData = JSON.parse(record.mainOrderIds);
+          if (Array.isArray(parsedData)) {
+            content = parsedData.join(', ');
+          } else {
+            content = record.mainOrderIds;
+          }
+        } catch (e) {
+          // 不是JSON格式，使用原始字符串
+          content = record.mainOrderIds;
+        }
+      }
+      // 其他情况直接返回原值
+      else {
+        content = String(record.mainOrderIds);
+      }
+
+      // 使用EllipsisDiv组件显示带省略号的内容
+      return <EllipsisDiv text={content} />;
+    },
+  },
+  {
     dataIndex: 'mainOrderId',
     title: '主订单id',
     valueType: 'text',
@@ -65,7 +113,7 @@ export const INVOICE_COLUMNS = [
     title: '状态',
     dataIndex: 'statusText',
     valueType: 'text',
-    width: 180,
+    width: 100,
     readonly: true,
     hideInSearch: true,
   },
@@ -73,7 +121,7 @@ export const INVOICE_COLUMNS = [
     title: '状态',
     dataIndex: 'writeOffIdIsNull',
     valueType: 'select',
-    width: 100,
+    width: 80,
     valueEnum: {
       true: {
         text: '未核销',
@@ -4379,6 +4379,13 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
           refreshTable();
         }}
         defaultValue={0}
+        style={{
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          gap: 8,
+          whiteSpace: 'nowrap',
+        }}
       >
         {radios}
       </Radio.Group>
@@ -181,7 +181,6 @@ const OrderReportPage = () =&gt; {
   }, [selectedMonth, selectedYear]);
   useEffect(() => {
-    loadData();
     getSalesCodeOptions();
   }, []);
@@ -20,7 +20,6 @@ export const RESEARCH_GROUP_COLUMNS = [
     key: 'id',
     valueType: 'index',
     hideInSearch: true,
-    hideInTable: true,
   },
   {
     title: '课题组名称',