feat: update

zhongnanhuang
1 parent 87d1f9e9
Showing 3 changed files with 31 additions and 20 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/index.tsx
src/pages/ResearchGroup/index.tsx
@@ -553,6 +553,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           getDefaultString(option.detail),
       );
       form.setFieldValue('customerNameString', option.realName);
+
+      loadAccountOptions(option.phone);
     }
  
     //erp收货地址：需要与客户联系人中的地址一样：姓名，手机号，地址
@@ -978,7 +980,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               }
  
               let title = '';
-              let spanText = '';
               let realName = item.realName;
               let phone = item.phone;
               let province = item.province;
@@ -988,31 +989,41 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
               let institution = item.institution;
               let institutionContactName = item.institutionContactName;
  
-              title =
-                getDefaultString(realName) +
-                '|' +
-                getDefaultString(phone) +
-                '|' +
-                getDefaultString(institution) +
-                '|' +
-                getDefaultString(institutionContactName) +
-                '|' +
+              let address =
                 getDefaultString(province) +
                 getDefaultString(city) +
                 getDefaultString(district) +
                 getDefaultString(detail);
  
-              spanText =
+              title =
                 getDefaultString(realName) +
                 '|' +
                 getDefaultString(phone) +
                 '|' +
                 getDefaultString(institution) +
                 '|' +
-                getDefaultString(institutionContactName);
+                getDefaultString(institutionContactName) +
+                '|' +
+                address;
+
               return (
-                <div title={title}>
-                  <span style={{ color: '#333333' }}>{spanText}</span>
+                <div title={title} className="whitespace-normal">
+                  <span style={{ color: '#333333' }}>
+                    {getDefaultString(realName)}
+                  </span>
+                  |
+                  <span className="text-sky-600">
+                    {getDefaultString(phone)}
+                  </span>
+                  |
+                  <span style={{ color: '#333333' }}>
+                    {getDefaultString(institution)}
+                  </span>
+                  |
+                  <span style={{ color: '#333333' }}>
+                    {getDefaultString(institutionContactName)}
+                  </span>
+                  |<span className="text-orange-400">{address}</span>
                 </div>
               );
             },
@@ -1925,7 +1925,7 @@ const OrderPage = () =&gt; {
  
         <Flex title={optRecord.notes}>
           <div
-            className="overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer"
+            className="max-w-[1100px] overflow-hidden whitespace-normal overflow-ellipsis hover:cursor-pointer"
             onClick={() => {
               copyToClipboard(optRecord.notes);
               message.info('备注复制成功：' + optRecord.notes);
@@ -3858,11 +3858,11 @@ const OrderPage = () =&gt; {
         label: '导出已选中订单',
         key: '1',
         onClick: async () => {
-          if (selectedMainOrderKeys.length === 0) {
+          if (mainOrderSelectedMap.size === 0) {
             message.error('请选择订单');
             return;
           }
-          let body = { flag: 30, id: selectedMainOrderKeys };
+          let body = { flag: 30, id: Array.from(mainOrderSelectedMap.keys()) };
           exportLoading();
           orderExport('/api/service/order/export', body, exportLoadingDestory);
         },
@@ -83,8 +83,7 @@ const PrepaidPage = () =&gt; {
     if (!value) {
       return <span></span>;
     }
-
-    return value.map((item: any) => {
+    let tags = value.map((item: any) => {
       let memberName = item.memberName;
       let memberPhone = item.memberPhone;
       return (
@@ -98,6 +97,7 @@ const PrepaidPage = () =&gt; {
         </Tag>
       );
     });
+    return <div className="whitespace-normal">{tags}</div>;
   };
  
   /**
@@ -128,7 +128,7 @@ const PrepaidPage = () =&gt; {
     }
  
     return (
-      <div>
+      <div className="whitespace-normal">
         {value.map((item: any) => {
           let accountPhone = item.accountPhone;
           let accountName = item.accountName;