fix: 修改客户管理工单bug

boyang
1 parent 5c49c238
Showing 6 changed files with 22 additions and 51 deletions
.umirc.ts
src/pages/Client/Client/Components/ClientInformationModal.tsx
src/pages/Client/Client/Components/ClientModal.tsx
src/pages/Client/FollowRecord/Components/ClientModal.tsx
src/pages/Client/FollowRecord/index.tsx
src/pages/Order/OrderList/OrderList.tsx
@@ -147,7 +147,7 @@ export default defineConfig({
       routes: [
         {
           name: '客户列表',
-          path: 'clint',
+          path: 'client',
           component: './Client/Client',
         },
         {
@@ -32,24 +32,16 @@ export default ({ data, type, reloadTable }) =&gt; {
   >();
   const fileList: any = [];
   const onfinish = async (values) => {
-    console.log(values, '5656values');
-
     let list = values.ticketsList;
-    console.log(list, '5656list');
-    list = list.map((item, index) => {
+    list = list.map((item) => {
+      let itemAnnexUrl = null;
       // 尝试从 item.filePaths 中获取 annexUrl
-      const itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
-
-      // 如果 itemAnnexUrl 为 null，则使用 data.ticketsList 对应的 annexUrl
-      if (
-        itemAnnexUrl === null &&
-        data.ticketsList[index]?.annexUrl &&
-        index < data.ticketsList.length
-      ) {
-        item.annexUrl = data.ticketsList[index].annexUrl; // 确保对比中的 annesUrl 也是 null
+      if (item?.filePaths) {
+        itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
       } else {
-        item.annexUrl = itemAnnexUrl; // 否则，使用从 item.filePaths 中获取的值
+        itemAnnexUrl = null;
       }
+      item.annexUrl = itemAnnexUrl;
       return item;
     });
  
@@ -188,17 +180,6 @@ export default ({ data, type, reloadTable }) =&gt; {
               groupFilter: 'all',
             },
           });
-          // const namesArray = res.data.data.map((item) => item.name);
-          // const formattedObject = res.data.data.reduce((acc, name) => {
-          //   acc[name] = name; // 将名称作为键和值
-          //   return acc;
-          // }, {});
-          // console.log(namesArray, '5656namesArray');
-          // const formattedObject = res.data.data.reduce((acc, item) => {
-          //   acc[item.name] = item.name; // 使用 name 作为键，id 作为值
-          //   return acc;
-          // }, {});
-          // return enumToSelect(formattedObject);
           const options = res.data.data.reduce((acc, item) => {
             acc.push({ label: item.name, value: item.id }); // 使用 name 作为 label，id 作为 value
             return acc;
@@ -33,20 +33,16 @@ export default ({ data, type, reloadTable }) =&gt; {
   const fileList: any = [];
   const onfinish = async (values) => {
     let list = values.list;
-    list = list.map((item, index) => {
-      // 尝试从 item.filePaths 中获取 annexUrl
-      const itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
  
-      // 如果 itemAnnexUrl 为 null，则使用 data.ticketsList 对应的 annexUrl
-      if (
-        itemAnnexUrl === null &&
-        data.ticketsList[index]?.annexUrl &&
-        index < data.ticketsList.length
-      ) {
-        item.annexUrl = data.ticketsList[index].annexUrl; // 确保对比中的 annesUrl 也是 null
+    list = list.map((item) => {
+      let itemAnnexUrl = null;
+      // 尝试从 item.filePaths 中获取 annexUrl
+      if (item?.filePaths) {
+        itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
       } else {
-        item.annexUrl = itemAnnexUrl; // 否则，使用从 item.filePaths 中获取的值
+        itemAnnexUrl = null;
       }
+      item.annexUrl = itemAnnexUrl;
       return item;
     });
     values.list = list;
@@ -34,20 +34,15 @@ export default ({ data, type, reloadTable }) =&gt; {
   const fileList: any = [];
   const onfinish = async (values) => {
     let list = values.ticketsList;
-    list = list.map((item, index) => {
+    list = list.map((item) => {
+      let itemAnnexUrl = null;
       // 尝试从 item.filePaths 中获取 annexUrl
-      const itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
-
-      // 如果 itemAnnexUrl 为 null，则使用 data.ticketsList 对应的 annexUrl
-      if (
-        itemAnnexUrl === null &&
-        data.ticketsList[index]?.annexUrl &&
-        index < data.ticketsList.length
-      ) {
-        item.annexUrl = data.ticketsList[index].annexUrl; // 确保对比中的 annesUrl 也是 null
+      if (item?.filePaths) {
+        itemAnnexUrl = item?.filePaths?.[0]?.response?.data?.[0] || null;
       } else {
-        item.annexUrl = itemAnnexUrl; // 否则，使用从 item.filePaths 中获取的值
+        itemAnnexUrl = null;
       }
+      item.annexUrl = itemAnnexUrl;
       return item;
     });
     values.list = list;
@@ -23,7 +23,6 @@ export default () =&gt; {
  
     // 更新 refreshKey，强制刷新 CommunicationHistoryModal
     setRefreshKey((prevKey) => prevKey + 1);
-    console.log('5656refresh');
   };
   //biaoji
   const columns = [
@@ -247,7 +246,6 @@ export default () =&gt; {
             data={record}
             // reloadTable={() => {
             //   actionRef.current.reload();
-            //   console.log('5656flush');
             // }}
             reloadTable={reload}
           />,
@@ -215,7 +215,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
   const roles = userInfo?.roles;
-  const [setNewParams] = useState<any>();
+  const [newParams, setNewParams] = useState<any>();
   const canMergeInvoicing = useMemo(() => {
     if (subOrderSelectedMap.size === 0) {
       return false;
@@ -4587,6 +4587,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
   useEffect(() => {
     if (paramsNew) {
       setNewParams(paramsNew);
+      console.log(newParams);
     }
     refreshTable();
   }, [paramsNew]);