Merge branch 'master' of http://39.108.227.113:8001/zhusen/canrd-erp-front

曾国涛
2 parents 19ca3d46 967ee14e
Showing 2 changed files with 146 additions and 13 deletions
dist.zip
src/pages/Order/OrderWarning/index.tsx
@@ -188,7 +188,9 @@ const OrderPage = () =&gt; {
   const [mainOrderSelectedMap] = useState(new Map()); //选中的主订单Map key：主订单id value：主订单数据
   const [subOrderSelectedMap, setSubOrderSelectedMap] = useState(new Map()); //选中的子订单Map key：主订单id value：选中的子订单数据集合
   const [currentOptMainId, setCurrentMainId] = useState<any>(undefined); //当前操作对象的主订单id
+  // const [currentOptMainId, setCurrentMainId] = useState<any>(undefined); //当前操作对象的主订单id
   const [curretnOptSubId, setCurretnOptSubId] = useState<any>(undefined); //当前操作对象的子订单id
+  // const [curretnOptSubId, setCurretnOptSubId] = useState<any>(undefined); //当前操作对象的子订单id
   const [subOrderCount, setSubOrderCount] = useState(0);
   const [sorted] = useState(false);
   const mainTableRef = useRef<ActionType>();
@@ -206,6 +208,7 @@ const OrderPage = () =&gt; {
   const [ids, setIds] = useState([]);
   const [recordOptNode, setRecordOptNode] = useState(null);
   const roleCode = userInfo?.roleSmallVO?.code;
+  const [activeTabKey, setActiveTabKey] = useState('1'); // **新增状态**
   const triggerRecordOptNode = async (id) => {
     const res = await postServiceOrderGetCurrentOptNode({
@@ -381,7 +384,7 @@ const OrderPage = () =&gt; {
    * 返回当前操作的主订单数据
    */
   function buildMainOrder() {
-    if (currentOptMainId === undefined || currentOptMainId === null) {
+    if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
     }
@@ -393,11 +396,9 @@ const OrderPage = () =&gt; {
     if (matchedData.length > 0) {
       mainOrderClone = cloneDeep(matchedData[0]);
     }
-
-    if (mainOrderClone === null) {
+    if (!mainOrderClone) {
       message.error('页面错误：当前操作的主订单数据不存在，请联系系统管理员');
     }
-
     return mainOrderClone;
   }
@@ -405,7 +406,7 @@ const OrderPage = () =&gt; {
    * 返回当前操作的子订单集合
    */
   function buildSubOrders() {
-    if (currentOptMainId === undefined || currentOptMainId === null) {
+    if (!currentOptMainId) {
       message.error('页面错误：当前操作的主订单id不存在，请联系系统管理员');
       return;
     }
@@ -414,8 +415,10 @@ const OrderPage = () =&gt; {
     //如果没有传当前操作的子订单id，说明是操作主订单
     if (curretnOptSubId === undefined || curretnOptSubId === null) {
+      // if (!curretnOptSubId) {
       //如果有选中子订单，那么取选中的子订单为操作对象，否则取当前主订单的全部子订单为操作对象
       let currentOptSubOrders = subOrderSelectedMap.get(currentOptMainId);
+
       if (
         currentOptSubOrders === null ||
         currentOptSubOrders === undefined ||
@@ -446,12 +449,10 @@ const OrderPage = () =&gt; {
         }
       }
     }
-
     if (cloneSubOrders.length === 0) {
       message.error('页面错误：当前操作的订单数据不存在，请联系系统管理员');
       return;
     }
-
     return cloneSubOrders;
   }
@@ -3995,6 +3996,58 @@ const OrderPage = () =&gt; {
     },
   );
+  // 主订单列表
+  const mainOrdersColumns2: ProColumns<OrderType>[] = MAIN_ORDER_COLUMNS.map(
+    (item) => {
+      //首能账号只能搜索订单编号
+      let canSearchIndex = [
+        'id',
+        'salesCode',
+        'subNotes',
+        'orderStatus',
+        'createTime',
+        'modifiedAuditStatus',
+      ];
+      if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) {
+        item.search = false;
+      }
+
+      canSearchIndex = [
+        'id',
+        'salesCode',
+        'customerName',
+        'institution',
+        'productName',
+        'orderStatus',
+        'createTime',
+      ];
+
+      if (isExaminer() && !canSearchIndex.includes(item.dataIndex)) {
+        item.search = false;
+      }
+
+      if (item.dataIndex === 'name') {
+        return {
+          ...item,
+          title: <OrderTableHeader />,
+          render: (text, record) => {
+            return <MainOrderColumnRender record={record} />;
+          },
+        };
+      }
+
+      /**
+       * 采购的订单状态筛选内容
+       */
+      if (roleCode === 'procure' && item.dataIndex === 'orderStatus') {
+        item.valueEnum = enumToProTableEnumValue(
+          PROCURE_PRIMARY_ORDER_STATUS_OPTIONS,
+        );
+      }
+      return item;
+    },
+  );
+
   /**
    * 采购可以筛选供应商备注
    */
@@ -4006,6 +4059,13 @@ const OrderPage = () =&gt; {
       valueType: 'text',
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '供应商备注',
+      width: 120,
+      dataIndex: 'supplierNotes',
+      valueType: 'text',
+      hideInTable: true,
+    });
   }
   /**
@@ -4026,6 +4086,20 @@ const OrderPage = () =&gt; {
       },
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '采购名称',
+      width: 120,
+      dataIndex: 'supplierName',
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
   }
   /**
@@ -4049,6 +4123,23 @@ const OrderPage = () =&gt; {
       },
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '采购排除',
+      width: 120,
+      dataIndex: 'excludeProcureNames',
+      fieldProps: {
+        mode: 'multiple',
+      },
+      valueType: 'select',
+      request: async () => {
+        const res = await postServiceOrderProvideProcurementRoles();
+        let options = res.data?.map((item) => {
+          return { label: item, value: item };
+        });
+        return options;
+      },
+      hideInTable: true,
+    });
   }
   /**
@@ -4063,6 +4154,14 @@ const OrderPage = () =&gt; {
       valueEnum: enumToProTableEnumValue(SHIPPING_WAREHOUSE_OPTIONS),
       hideInTable: true,
     });
+    mainOrdersColumns2.push({
+      title: '发货仓库',
+      width: 120,
+      dataIndex: 'shippingWarehouse',
+      valueType: 'select',
+      valueEnum: enumToProTableEnumValue(SHIPPING_WAREHOUSE_OPTIONS),
+      hideInTable: true,
+    });
   }
   //判断是否是采购，是的话新增一个筛选条件
@@ -4074,6 +4173,13 @@ const OrderPage = () =&gt; {
       hideInTable: true,
       valueEnum: enumToProTableEnumValue(PROCURE_ORDER_STATUS),
     });
+    mainOrdersColumns2.push({
+      title: isSupplier() ? '下单状态' : '采购下单状态',
+      dataIndex: 'procureOrderStatus',
+      valueType: 'select',
+      hideInTable: true,
+      valueEnum: enumToProTableEnumValue(PROCURE_ORDER_STATUS),
+    });
   }
   //选择天数1
@@ -4184,6 +4290,7 @@ const OrderPage = () =&gt; {
       filter,
       data: { ...params, statusDatetimeGe: calDate },
     });
+    console.log(res.data, '5656request');
     const data = res.data;
     setRolePath(data.specialPath);
@@ -4219,6 +4326,14 @@ const OrderPage = () =&gt; {
       mainTableSecondRef.current?.reload();
     }
   }, [calDate2]);
+  useEffect(() => {
+    if (activeTabKey === '1') {
+      mainTableRef.current?.reload(); // **修改位置：在选择第二个标签时请求request2**
+    }
+    if (activeTabKey === '2') {
+      mainTableSecondRef.current?.reload(); // **修改位置：在选择第二个标签时请求request2**
+    }
+  }, [activeTabKey]);
   const request2 = async (
     // 第一个参数 params 查询表单和 params 参数的结合
@@ -4274,6 +4389,7 @@ const OrderPage = () =&gt; {
       filter,
       data: { ...params },
     });
+    console.log(data, '5656request2');
     setRolePath(data.specialPath);
     setSubOrderCount(data.count);
@@ -4311,7 +4427,7 @@ const OrderPage = () =&gt; {
   };
   const tabsItems = [
     {
-      key: 1,
+      key: '1',
       label: (
         <span>
           发票确认预警
@@ -4398,7 +4514,8 @@ const OrderPage = () =&gt; {
             search={false}
             // labelWidth: 'auto',
             // onCollapse: resize,
-            request={request}
+            // request={request}
+            request={activeTabKey === '1' ? request : null} // **条件请求**
             toolbar={{
               multipleLine: true,
             }}
@@ -4891,7 +5008,7 @@ const OrderPage = () =&gt; {
       ),
     },
     {
-      key: 2,
+      key: '2',
       label: (
         <span>
           订单回款预警
@@ -4929,7 +5046,7 @@ const OrderPage = () =&gt; {
             actionRef={mainTableSecondRef}
             formRef={mainTableSecondFormRef}
             expandIconColumnIndex={-1}
-            columns={mainOrdersColumns}
+            columns={mainOrdersColumns2}
             rowKey="id"
             pagination={{
               showQuickJumper: true,
@@ -4939,6 +5056,7 @@ const OrderPage = () =&gt; {
               onChange: (page, size) => {
                 setPageSize(size);
                 setCurrentPage(page);
+                mainTableSecondRef.current?.reload();
               },
               showTotal: (total, range) => {
                 return (
@@ -4968,7 +5086,8 @@ const OrderPage = () =&gt; {
             search={false}
             // labelWidth: 'auto',
             // onCollapse: resize,
-            request={request2}
+            // request={request2}
+            request={activeTabKey === '2' ? request2 : null} // **条件请求**
             toolbar={{
               multipleLine: true,
             }}
@@ -5465,7 +5584,21 @@ const OrderPage = () =&gt; {
   return (
     <div className="order-page-container">
       <div id="resizeDiv"></div>
-      <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => {}} />
+      {/* <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => { }} /> */}
+      <Tabs
+        defaultActiveKey="1"
+        items={tabsItems}
+        onChange={(key) => {
+          setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+          if (key === '1') {
+            setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+            mainTableRef.current?.reload(); // **请求主订单的 request**
+          } else if (key === '2') {
+            setActiveTabKey(key); // **修改位置：更新 activeTabKey**
+            mainTableSecondRef.current?.reload(); // **请求订单回款的 request2**
+          }
+        }}
+      />
     </div>
   );
 };