feat: 售后

PurelzMgnead
1 parent 4681a0ab
Showing 5 changed files with 124 additions and 6 deletions
.umirc.ts
src/pages/Order/FeedBack/OrderList.tsx
src/pages/Order/FeedBack/constant.ts
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/constant.ts
@@ -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': '' },
     },
@@ -51,7 +51,6 @@ export default defineConfig({
         {
           name: '订单预警',
           path: 'OrderWarning',
-          access: 'canReadAdminAndSales',
           component: './Order/OrderWarning',
         },
         {
@@ -149,7 +148,7 @@ export default defineConfig({
       name: '客户管理',
       path: '/Client',
       icon: 'BookOutlined',
-      access: 'canReadAdminAndSalesAndWarehouseKeeper',
+      access: 'canReadAdminAndSales',
       routes: [
         {
           name: '客户列表',
@@ -8,6 +8,7 @@ import {
   postKingdeeRepSalOrderSave,
   postServiceConstCanApplyAfterInvoicingStatus,
   postServiceInvoiceCancelApply,
+  postServiceOrderAfterSalesCheck,
   postServiceOrderCancelSend,
   postServiceOrderConfirmInvoice,
   postServiceOrderGetCurrentOptNode,
@@ -412,6 +413,16 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     return null;
   }
+  async function doAfterSalesCheck(body: object) {
+    const data = await postServiceOrderAfterSalesCheck({
+      data: body,
+    });
+    console.log(data);
+    if (data.data) {
+      refreshTable();
+    }
+  }
+
   /**
    * 返回当前操作的主订单数据
    */
@@ -728,7 +739,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
       if (
         orderStatus === 'AFTER_SALES_COMPLETION' ||
-        orderStatus === 'IN_AFTER_SALES'
+        orderStatus === 'IN_AFTER_SALES' ||
+        orderStatus === 'AFTER_SALES_CHECK'
       ) {
         return (
           <Tag
@@ -1894,6 +1906,29 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ''
             )}
+            {optRecord.paths?.includes('afterSalesConfirm') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="确认通过？"
+                text="售后已审核待确认"
+                onConfirm={() => {
+                  setIsMainOrder(false);
+                  doAfterSalesCheck({
+                    applyType: 'after-sales',
+                    isAfterSalesSuccess: true,
+                    subOrderIds: isMainOrder
+                      ? [...record.subOrderInformationLists]
+                          .flat()
+                          ?.map((subOrder) => subOrder.id)
+                      : [optRecord.id],
+                    mainId: record.id,
+                  });
+                }}
+              />
+            ) : (
+              ''
+            )}
+
             {optRecord.paths?.includes('financeCheckOrder') ? (
               <Button
                 className="p-0"
@@ -3626,6 +3661,27 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                     ''
                   )}
+                  {record.paths?.includes('afterSalesConfirm') ? (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="确认通过？"
+                      text="售后已审核待确认"
+                      onConfirm={() => {
+                        setIsMainOrder(true);
+                        doAfterSalesCheck({
+                          applyType: 'after-sales',
+                          isAfterSalesSuccess: true,
+                          subOrderIds: [...record.subOrderInformationLists]
+                            .flat()
+                            ?.map((subOrder) => subOrder.id),
+                          mainId: record.id,
+                        });
+                      }}
+                    />
+                  ) : (
+                    ''
+                  )}
+
                   {record.paths?.includes('noNeedSend') ? (
                     <ButtonConfirm
                       className="p-0"
@@ -4230,6 +4286,9 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     afterSalesRadios.push(<Radio value={0}>全部</Radio>);
     afterSalesRadios.push(<Radio value={'IN_AFTER_SALES'}>售后中</Radio>);
     afterSalesRadios.push(
+      <Radio value={'AFTER_SALES_CHECK'}>售后已审核</Radio>,
+    );
+    afterSalesRadios.push(
       <Radio value={'AFTER_SALES_COMPLETION'}>售后完成</Radio>,
     );
     afterSalesRadios.push(
@@ -4703,7 +4762,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
             // @ts-ignore
             sorter,
             filter,
-            data: { ...params, ...paramsNew },
+            data: { ...params, ...paramsNew, currentPath: 'feedBack' },
           });
           setRolePath(data.specialPath);
@@ -196,6 +196,7 @@ export const ORDER_STATUS_OPTIONS = {
   CONFIRM_RECEIPT: '确认收货',
   AUDIT_FAILED: '审核失败',
   IN_AFTER_SALES: '售后中',
+  AFTER_SALES_CHECK: '售后已审核',
   AFTER_SALES_COMPLETION: '售后完成',
   AFTER_SALES_FAILURE: '售后失败',
   NO_NEED_SEND: '无需发货',
@@ -275,6 +276,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['SUPPLIER_WAIT_SHIP', 'processing'],
   ['SUPPLIER_SHIPPED', 'processing'],
   ['IN_AFTER_SALES', 'red'],
+  ['AFTER_SALES_CHECK', 'red'],
   ['AFTER_SALES_COMPLETION', 'red'],
   ['PROCURE_PROCESS_FOR_MINE', 'processing'],
   ['PROCURE_WAIT_SHIP', 'processing'],
@@ -584,6 +586,7 @@ export const MAIN_ORDER_COLUMNS = [
         ([key]) =>
           [
             'IN_AFTER_SALES',
+            'AFTER_SALES_CHECK',
             'AFTER_SALES_COMPLETION',
             'AFTER_SALES_FAILURE',
           ].includes(key),
@@ -9,6 +9,7 @@ import {
   postKingdeeRepSalOrderSave,
   postServiceConstCanApplyAfterInvoicingStatus,
   postServiceInvoiceCancelApply,
+  postServiceOrderAfterSalesCheck,
   postServiceOrderCancelSend,
   postServiceOrderConfirmInvoice,
   postServiceOrderGetCurrentOptNode,
@@ -562,6 +563,16 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
     }
   };
+  async function doAfterSalesCheck(body: object) {
+    const data = await postServiceOrderAfterSalesCheck({
+      data: body,
+    });
+    console.log(data);
+    if (data.data) {
+      refreshTable();
+    }
+  }
+
   const onCheckboxChange = (record: never) => {
     let newSelectedMainOrderKeys = [];
     if (selectedMainOrderKeys.includes(record.id)) {
@@ -1908,6 +1919,29 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               ''
             )}
+            {optRecord.paths?.includes('afterSalesConfirm') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="确认通过？"
+                text="售后已审核待确认"
+                onConfirm={() => {
+                  setIsMainOrder(false);
+                  doAfterSalesCheck({
+                    applyType: 'after-sales',
+                    isAfterSalesSuccess: true,
+                    subOrderIds: isMainOrder
+                      ? [...record.subOrderInformationLists]
+                          .flat()
+                          ?.map((subOrder) => subOrder.id)
+                      : [optRecord.id],
+                    mainId: record.id,
+                  });
+                }}
+              />
+            ) : (
+              ''
+            )}
+
             {optRecord.paths?.includes('financeCheckOrder') ? (
               <Button
                 className="p-0"
@@ -3640,6 +3674,27 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
                     ''
                   )}
+                  {record.paths?.includes('afterSalesConfirm') ? (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="确认通过？"
+                      text="售后已审核待确认"
+                      onConfirm={() => {
+                        setIsMainOrder(true);
+                        doAfterSalesCheck({
+                          applyType: 'after-sales',
+                          isAfterSalesSuccess: true,
+                          subOrderIds: [...record.subOrderInformationLists]
+                            .flat()
+                            ?.map((subOrder) => subOrder.id),
+                          mainId: record.id,
+                        });
+                      }}
+                    />
+                  ) : (
+                    ''
+                  )}
+
                   {record.paths?.includes('noNeedSend') ? (
                     <ButtonConfirm
                       className="p-0"
@@ -197,6 +197,7 @@ export const ORDER_STATUS_OPTIONS = {
   CONFIRM_RECEIPT: '确认收货',
   AUDIT_FAILED: '审核失败',
   IN_AFTER_SALES: '售后中',
+  AFTER_SALES_CHECK: '售后已审核',
   AFTER_SALES_COMPLETION: '售后完成',
   AFTER_SALES_FAILURE: '售后失败',
   NO_NEED_SEND: '无需发货',
@@ -270,6 +271,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['SUPPLIER_WAIT_SHIP', 'processing'],
   ['SUPPLIER_SHIPPED', 'processing'],
   ['IN_AFTER_SALES', 'red'],
+  ['AFTER_SALES_CHECK', 'red'],
   ['AFTER_SALES_COMPLETION', 'red'],
   ['PROCURE_PROCESS_FOR_MINE', 'processing'],
   ['PROCURE_WAIT_SHIP', 'processing'],