feat: 预警页面销售代表选择器

boyang
1 parent c35d1eb5
Showing 2 changed files with 137 additions and 86 deletions
.umirc.ts
src/pages/Order/OrderWarning/index.tsx
@@ -14,9 +14,9 @@ export default defineConfig({
   },
   proxy: {
     '/api/': {
-      target: 'http://localhost:8085/',
+      // target: 'http://localhost:8085/',
       // target: 'http://192.168.1.6:8085/',
-      // target: 'http://39.108.227.113:8085/',
+      target: 'http://39.108.227.113:8085/',
       changeOrigin: true,
       pathRewrite: { '^/api': '' },
     },
@@ -32,6 +32,7 @@ import {
 } from '@/utils';
 import {
   getReceivingCompanyOptions,
+  getSalesCodeOptions,
   isAdmin,
   isExaminer,
   isFinance,
@@ -53,6 +54,7 @@ import {
   ActionType,
   ProColumns,
   ProFormInstance,
+  ProFormSelect,
   ProTable,
 } from '@ant-design/pro-components';
 import {
@@ -120,12 +122,15 @@ import ShippingWarehouseChangeModal from &#39;./components/ShippingWarehouseChangeMo
 import UploadPayBillModal from './components/UploadPayBillModal';
 import './index.less';
 import { OrderListItemType, OrderType } from './type.d';
+// import { useParams } from '@umijs/max';
 const OrderPage = () => {
   const [orderDrawerVisible, setOrderDrawerVisible] = useState<boolean>(false);
   const [checkVisible, setCheckVisible] = useState<boolean>(false);
   const [orderPrintVisible, setOrderPrintVisible] = useState<boolean>(false);
+  const [salesCodeOptions, setSalesCodeOptions] = useState([]);
   const [allMainChecked, setAllMainChecked] = useState(false);
+  const [salesCodeSelect, setSalesCodeSelect] = useState();
   const [imagesViewerModalVisible, setImagesViewerModalVisible] =
     useState<boolean>(false);
   const [data, setData] = useState([]); //列表数据
@@ -789,7 +794,7 @@ const OrderPage = () =&gt; {
                 onConfirm={() => {
                   window.open(
                     '/previewApi/onlinePreview?url=' +
-                    encodeURIComponent(Base64.encode(item.url)),
+                      encodeURIComponent(Base64.encode(item.url)),
                   );
                 }}
                 onCancel={() => {
@@ -861,7 +866,7 @@ const OrderPage = () =&gt; {
                 </span>
                 {(roleCode === 'salesRepresentative' ||
                   roleCode === 'salesManager') &&
-                  !optRecord.isCurrentUserOrder ? (
+                !optRecord.isCurrentUserOrder ? (
                   <span className="text-[#f44e4e]">(非本账号订单)</span>
                 ) : (
                   ''
@@ -1045,13 +1050,13 @@ const OrderPage = () =&gt; {
                     <Tooltip
                       title={
                         optRecord.invoicingUrgentCause !== null &&
-                          optRecord.afterInvoicingStatus ===
+                        optRecord.afterInvoicingStatus ===
                           'URGENT_INVOICE_AUDITING'
                           ? optRecord.invoicingUrgentCause
                           : enumValueToLabel(
-                            optRecord.afterInvoicingStatus,
-                            AFTER_INVOICING_STATUS,
-                          )
+                              optRecord.afterInvoicingStatus,
+                              AFTER_INVOICING_STATUS,
+                            )
                       }
                     >
                       <Tag
@@ -1082,7 +1087,7 @@ const OrderPage = () =&gt; {
                 )}
                 {(roleCode === 'warehouseKeeper' || roleCode === 'admin') &&
-                  optRecord.shippingWarehouse !== null ? (
+                optRecord.shippingWarehouse !== null ? (
                   <div
                     className="overflow-hidden whitespace-no-wrap overflow-ellipsis"
                     title={enumValueToLabel(
@@ -1104,7 +1109,7 @@ const OrderPage = () =&gt; {
                 {/* 生产时间 */}
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   {optRecord.productionStartTime !== null ||
-                    optRecord.productionEndTime !== null ? (
+                  optRecord.productionEndTime !== null ? (
                     <MyToolTip
                       title={
                         formatdate(optRecord.productionStartTime) +
@@ -1134,7 +1139,7 @@ const OrderPage = () =&gt; {
                 <Tag
                   color={
                     optRecord.invoicingTime === null ||
-                      optRecord.invoicingTime === undefined
+                    optRecord.invoicingTime === undefined
                       ? TAGS_COLOR.get(optRecord.invoicingStatus)
                       : 'success'
                   }
@@ -1162,7 +1167,7 @@ const OrderPage = () =&gt; {
             {/**采购是否已下单状态 */}
             {optRecord.procureOrderStatus !== null &&
-              optRecord.procureOrderStatus !== undefined ? (
+            optRecord.procureOrderStatus !== undefined ? (
               <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                 <Tag color="success">
                   {enumValueToLabel(
@@ -1178,21 +1183,21 @@ const OrderPage = () =&gt; {
             {/* 物流信息 */}
             <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
               {optRecord.orderStatus === 'CONFIRM_RECEIPT' ||
-                optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
-                optRecord.orderStatus === 'IN_AFTER_SALES' ||
-                optRecord.orderStatus === 'SHIPPED' ? (
+              optRecord.orderStatus === 'AFTER_SALES_COMPLETION' ||
+              optRecord.orderStatus === 'IN_AFTER_SALES' ||
+              optRecord.orderStatus === 'SHIPPED' ? (
                 <MyToolTip
                   title={
                     optRecord.serialNumber === undefined
                       ? '暂无物流信息'
                       : enumValueToLabel(
-                        optRecord.logisticsMethod,
-                        LOGISTICS_STATUS_OPTIONS,
-                      ) +
-                      '  ' +
-                      optRecord.serialNumber +
-                      '  ' +
-                      optRecord.logisticsNotes
+                          optRecord.logisticsMethod,
+                          LOGISTICS_STATUS_OPTIONS,
+                        ) +
+                        '  ' +
+                        optRecord.serialNumber +
+                        '  ' +
+                        optRecord.logisticsNotes
                   }
                   content={
                     <Button type="link" size="small" style={{ padding: 0 }}>
@@ -1206,7 +1211,7 @@ const OrderPage = () =&gt; {
               {/* 修改审核状态 */}
               {optRecord.modifiedAuditStatus !== null &&
-                optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
+              optRecord.modifiedAuditStatus !== 'AUDIT_FAILURE' ? (
                 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                   <Tooltip
                     title={recordOptNode ? recordOptNode : <Spin />}
@@ -1646,7 +1651,7 @@ const OrderPage = () =&gt; {
             )}
             {optRecord.paths?.includes('queryAnnex') &&
-              optRecord.listAnnex?.length > 0 ? (
+            optRecord.listAnnex?.length > 0 ? (
               <Button
                 className="p-0"
                 type="link"
@@ -2113,7 +2118,7 @@ const OrderPage = () =&gt; {
         </Flex>
         {(isProcure() || isWarehousekeeper() || isSales() || isAdmin()) &&
-          !isSupplier() ? (
+        !isSupplier() ? (
           <div className="pt-2">
             <Flex title={optRecord.supplierName}>
               <div>
@@ -2188,7 +2193,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">
                       申请开票备注：
                       {optRecord.applyInvoicingNotes === undefined ||
-                        optRecord.applyInvoicingNotes === null
+                      optRecord.applyInvoicingNotes === null
                         ? '暂无备注'
                         : optRecord.applyInvoicingNotes}
                     </span>
@@ -2216,7 +2221,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C] mr-3">
                       财务审核备注：
                       {optRecord.checkNotes === undefined ||
-                        optRecord.checkNotes === null
+                      optRecord.checkNotes === null
                         ? '暂无备注'
                         : optRecord.checkNotes}
                     </span>
@@ -2240,7 +2245,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C]">
                       重新开票备注：
                       {optRecord.reissueNotes === undefined ||
-                        optRecord.reissueNotes === null
+                      optRecord.reissueNotes === null
                         ? '暂无备注'
                         : optRecord.reissueNotes}
                     </span>
@@ -2277,7 +2282,7 @@ const OrderPage = () =&gt; {
                     <span className="text-[#8C8C8C] mr-3">
                       产品回访登记：
                       {optRecord.feedbackRegistrationContent === undefined ||
-                        optRecord.feedbackRegistrationContent === null
+                      optRecord.feedbackRegistrationContent === null
                         ? '暂无'
                         : optRecord.feedbackRegistrationContent}
                     </span>
@@ -2568,9 +2573,9 @@ const OrderPage = () =&gt; {
                   <span className="text-slate-700">
                     {record.receivingCompany !== null
                       ? enumValueToLabel(
-                        record.receivingCompany,
-                        getReceivingCompanyOptions(PAYEE_OPTIONS),
-                      )
+                          record.receivingCompany,
+                          getReceivingCompanyOptions(PAYEE_OPTIONS),
+                        )
                       : '暂无'}
                   </span>
                 </div>
@@ -3362,9 +3367,9 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].invoicingStatus ===
-                            'UN_INVOICE' ||
+                              'UN_INVOICE' ||
                             selectedSubOrders[i].afterInvoicingStatus ===
-                            'APPLY_FOR_INVOICING'
+                              'APPLY_FOR_INVOICING'
                           ) {
                             message.error(
                               '请选择需要开票且未申请开票的子订单进行申请',
@@ -3399,9 +3404,9 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].invoicingStatus ===
-                            'UN_INVOICE' ||
+                              'UN_INVOICE' ||
                             selectedSubOrders[i].afterInvoicingStatus ===
-                            'APPLY_FOR_INVOICING'
+                              'APPLY_FOR_INVOICING'
                           ) {
                             message.error(
                               '请选择需要开票且未申请开票的子订单进行申请',
@@ -3615,13 +3620,13 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'AUDITED' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_PROCESS' &&
+                              'PROCURE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_PROCESS_FOR_MINE' &&
+                              'PROCURE_PROCESS_FOR_MINE' &&
                             selectedSubOrders[i].orderStatus !==
-                            'PROCURE_WAIT_SHIP' &&
+                              'PROCURE_WAIT_SHIP' &&
                             selectedSubOrders[i].orderStatus !==
-                            'SUPPLIER_WAIT_SHIP' &&
+                              'SUPPLIER_WAIT_SHIP' &&
                             selectedSubOrders[i].orderStatus !== 'WAIT_SHIP'
                           ) {
                             message.error(
@@ -3707,9 +3712,9 @@ const OrderPage = () =&gt; {
                           if (
                             selectedSubOrders[i].orderStatus !== 'UNAUDITED' &&
                             selectedSubOrders[i].orderStatus !==
-                            'FINANCE_PROCESS' &&
+                              'FINANCE_PROCESS' &&
                             selectedSubOrders[i].orderStatus !==
-                            'LEADER_AUDITED'
+                              'LEADER_AUDITED'
                           ) {
                             message.error(
                               '请选择[未审核]、[财务待审核]、[领导已审核]的子订单进行审核',
@@ -3777,9 +3782,9 @@ const OrderPage = () =&gt; {
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].orderStatus !==
-                            'CONFIRM_RECEIPT' &&
+                              'CONFIRM_RECEIPT' &&
                             selectedSubOrders[i].orderStatus !==
-                            'AFTER_SALES_FAILURE'
+                              'AFTER_SALES_FAILURE'
                           ) {
                             message.error('请选择确认收货状态的子订单进行售后');
                             return;
@@ -4201,10 +4206,6 @@ const OrderPage = () =&gt; {
     ) {
       setValue1(0); // 清空 value1
     }
-    // const currentDate = new Date();
-    // const newDate = new Date(currentDate);
-    // newDate.setDate(currentDate.getDate() - 0);
-    // console.log(value1, '5656value1');
     mainTableRef.current?.reload(); // **修改位置：在选择第二个标签时请求request2**
   }, [activeTabKey]);
   // 修改位置：监听 value1 的变化
@@ -4214,12 +4215,14 @@ const OrderPage = () =&gt; {
       mainTableRef.current?.reload(); // 重新请求数据
     }
   }, [value1]); // 添加了 value1 作为依赖
-
   //biaojidown2
   //取消单选，将时间设为null
   const handleSetNull = () => {
     setCalDate(null); // 这应该会触发 useEffect
   };
+  const selectSalesCode = (value) => {
+    setSalesCodeSelect(value); // 这应该会触发 useEffect
+  };
   const warningOptions = [
     {
       value: 1,
@@ -4274,35 +4277,73 @@ const OrderPage = () =&gt; {
         />
       </div>
       <div style={{ height: '25px' }}></div>
-      {/* <Tabs defaultActiveKey="1" items={tabsItems} onChange={() => { }} /> */}
-      <Radio.Group
-        value={value1}
-        onChange={radioOnChange1}
-      // 通过 onClick 处理单独 Radio 的点击事件
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'space-between',
+          alignItems: 'center',
+          width: '100%',
+        }}
       >
-        {(activeTabKey === 1
-          ? options1
-          : activeTabKey === 2
-            ? options2
-            : activeTabKey === 3
-              ? options3
-              : options4
-        ).map((option) => (
-          <Radio
-            key={option.value}
-            value={option.value}
-            onClick={(e) => {
-              radioOnChange1(
-                e as unknown as React.ChangeEvent<HTMLInputElement>,
-              );
-              handleSetNull();
+        {/* 左边的 Radio.Group */}
+        <span style={{ flex: '1' }}>
+          {' '}
+          {/* 修改：设置 flex 属性 */}
+          <Radio.Group value={value1} onChange={radioOnChange1}>
+            {(activeTabKey === 1
+              ? options1
+              : activeTabKey === 2
+                ? options2
+                : activeTabKey === 3
+                  ? options3
+                  : options4
+            ).map((option) => (
+              <Radio
+                key={option.value}
+                value={option.value}
+                onClick={(e) => {
+                  radioOnChange1(
+                    e as unknown as React.ChangeEvent<HTMLInputElement>,
+                  );
+                  handleSetNull();
+                }}
+              >
+                {option.label}
+              </Radio>
+            ))}
+          </Radio.Group>
+        </span>
+
+        {/* 右边的 ProFormSelect */}
+        <span style={{ width: '300px', marginLeft: 'auto', marginTop: '30px' }}>
+          {' '}
+          {/* 修改：设置 width 和 marginLeft */}
+          <ProFormSelect
+            name="salesCode"
+            key="salesCode"
+            width="200px"
+            actionRef={mainTableRef}
+            formRef={mainTableFormRef}
+            initialValue={userInfo.nickName}
+            showSearch
+            label="销售代表"
+            placeholder="请输入销售代表"
+            options={salesCodeOptions}
+            onChange={(_, option) => {
+              console.log(option, '5656option');
+              selectSalesCode(option.value);
+              mainTableRef.current?.reload();
             }}
-          >
-            {option.label}
-          </Radio>
-        ))}
-      </Radio.Group>
-      <div style={{ height: '25px' }}></div>
+            request={async () => {
+              let options = await getSalesCodeOptions();
+              setSalesCodeOptions(options);
+              return options;
+            }}
+          />
+        </span>
+      </div>
+
+      <div style={{ height: '15px' }}></div>
       <ProTable
         id="main-table"
         // tableStyle={{backgroundColor:'red'}}
@@ -4373,9 +4414,8 @@ const OrderPage = () =&gt; {
               });
             }
           }
-
+          params.salesCode = userInfo.nickName;
           params.condition = filterCondifion;
-
           //排序
           params.sorted = sorted;
           //是否只查看已作废
@@ -4399,7 +4439,10 @@ const OrderPage = () =&gt; {
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
             params.orderStatus = 'SHIPPED'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
-            params.salesCode = userInfo.username;
+            params.salesCode = userInfo.nickName;
+            if (salesCodeSelect !== undefined) {
+              params.salesCode = salesCodeSelect;
+            }
             // params.paymentMethod = 'UNPAID';
             finalParams = {
               ...params,
@@ -4413,7 +4456,10 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.username;
+            params.salesCode = userInfo.nickName;
+            if (salesCodeSelect !== undefined) {
+              params.salesCode = salesCodeSelect;
+            }
             params.warningStatus = 'waitFeedbackWarning'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
             // params.paymentMethod = 'UNPAID';
@@ -4429,7 +4475,10 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.username;
+            params.salesCode = userInfo.nickName;
+            if (salesCodeSelect !== undefined) {
+              params.salesCode = salesCodeSelect;
+            }
             params.warningStatus = 'invoiceConfirmWarning'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
             // params.paymentMethod = 'UNPAID';
@@ -4444,14 +4493,16 @@ const OrderPage = () =&gt; {
             } else {
               params.applyTimeLe = calDate;
             }
-            params.salesCode = userInfo.username;
+            params.salesCode = userInfo.nickName;
+            if (salesCodeSelect !== undefined) {
+              params.salesCode = salesCodeSelect;
+            }
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
             params.paymentNotReceipt = true; // 在回款预警中标记未支付订单
             finalParams = {
               ...params,
             };
           }
-
           //保存这个搜索条件
           setSearchParam(params);
           const { data } = await postServiceOrderQueryServiceOrder({
@@ -4492,9 +4543,9 @@ const OrderPage = () =&gt; {
         toolbar={{
           multipleLine: true,
         }}
-      // toolBarRender={() => {
-      //   return toolBarRender();
-      // }}
+        // toolBarRender={() => {
+        //   return toolBarRender();
+        // }}
       />
       {orderDrawerVisible && (