feat: update取消申请开票、仓库编辑

zhongnanhuang
1 parent cc919860
Showing 6 changed files with 282 additions and 71 deletions
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -4,7 +4,6 @@ import {
   postServiceOrderCheckOrder,
   postServiceOrderFileProcess,
   postServiceOrderFinanceCheckOrder,
-  postServiceOrderQueryAfterSalesInfoSnapshot,
 } from '@/services';
 import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
 import { Button, Col, Form, Modal, Row, UploadFile, message } from 'antd';
@@ -62,21 +61,22 @@ export default ({
   }
   const getOrderAfterSalesInfo = async () => {
-    let res = await postServiceOrderQueryAfterSalesInfoSnapshot({
-      data: { subOrderIds: subOrderIds },
-    });
+    // let res = await postServiceOrderQueryAfterSalesInfoSnapshot({
+    //   data: { subOrderIds: subOrderIds },
+    // });
     //附件
-    let annex = res?.data[0]?.afterSalesAnnexList;
-
+    let annex = subOrders[0].afterAnnexList;
     let annexLinks = annex?.map((f) => {
       return (
-        <Button type="link" key="key" href={f}>
+        <Button className="p-0 pr-1" type="link" key="key" href={f}>
           {getAliYunOSSFileNameFromUrl(f)}
         </Button>
       );
     });
+    console.log(annexLinks);
+
     setAfterSalesInfo(
       <div className="my-5">
         <Row gutter={[16, 24]}>
@@ -85,14 +85,14 @@ export default ({
           </Col>
           <Col span={18}>
             {enumValueToLabel(
-              res?.data[0]?.afterSalesPlan,
+              subOrders[0]?.afterSalesPlan,
               AFTE_SALES_PLAN_OPTIONS,
             )}
           </Col>
           <Col span={6}>
             <span className="className='text-[#333333]'">售后原因</span>
           </Col>
-          <Col span={18}>{res?.data[0]?.afterSalesNotes}</Col>
+          <Col span={18}>{subOrders[0]?.afterSalesNotes}</Col>
           <Col span={6}>
             <span className="className='text-[#333333]'">附件</span>
           </Col>
@@ -204,14 +204,15 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * 回显金蝶信息
    */
   async function showKindeeInfo() {
+    console.log(copyData);
     //客户信息
-    if (data.customerId) {
+    if (copyData.customerId) {
       //客户回显
-      autoFillCustomerContactSelectOptions(data.customerId);
+      autoFillCustomerContactSelectOptions(copyData.customerId);
     }
     //商品单位回显
-    let list = data?.subOrderInformationLists;
+    let list = copyData?.subOrderInformationLists;
     if (list) {
       let newProductUnitOptionsList = [...productUnitOptionsList];
       for (let i = 0; i < list.length; i++) {
@@ -276,9 +277,15 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     }
     getSalesCodeOptions();
-    showKindeeInfo();
+    if (!optType('after-sales-check')) {
+      showKindeeInfo();
+    }
   }
+  /**
+   * 获取旧订单信息
+   * @param id
+   */
   async function getOldOrderData(id: any) {
     let res = await postServiceOrderAfterSalesQuerySnapshotOrder({
       data: {
@@ -286,11 +293,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
       },
     });
-    console.log(res);
     copyData = res.data.mainOrder;
     copyData.subOrderInformationLists = res.data.subOrders;
     originSubOrders = res.data.subOrders;
+    //客户显示
+    form.setFieldValue('erpCustomerId', {
+      label: copyData.erpCustomerName,
+      value: copyData.customerId,
+    });
+
     buildOrderData();
   }
@@ -503,6 +515,23 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     form.setFieldValue('totalPayment', totalPayment);
   }
+  /**
+   * 检查客户是否可以编辑
+   * @returns
+   */
+  const customerEditable = () => {
+    let erpCustomerId = form.getFieldValue('erpCustomerId');
+    if (
+      optType('after-sales-check') ||
+      erpCustomerId === null ||
+      erpCustomerId === undefined
+    ) {
+      return false;
+    }
+
+    return true;
+  };
+
   useEffect(() => {
     if (optType('after-sales-check')) {
       getOldOrderData(data.id);
@@ -547,6 +576,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 onClick={() => {
                   setSubmitBtnLoading(true);
                   props.submit();
+                  setSubmitBtnLoading(false);
                 }}
               >
                 确定
@@ -705,12 +735,19 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           key="erpCustomerId"
           width="lg"
           showSearch
+          disabled={optType('after-sales-check')}
           label={
             <>
               <span>客户</span>
               <span
-                className="pl-2 text-xs text-[#1677ff] cursor-pointer"
+                className={
+                  'pl-2 text-xs cursor-pointer ' +
+                  (customerEditable() ? 'text-[#1677ff]' : 'text-gray-400')
+                }
                 onClick={() => {
+                  if (!customerEditable()) {
+                    return;
+                  }
                   let customerId = form.getFieldValue('erpCustomerId');
                   if (typeof customerId === 'string') {
                     setCustomer({ ...customer, id: customerId });
@@ -728,17 +765,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           rules={[{ required: true, message: '客户必填' }]}
           onChange={(_, option) => {
             //新增客户
-            if (option.type === 'add') {
-              setCustomer({ name: option.name });
+            if (option?.type === 'add') {
+              setCustomer({ name: option?.name });
               setKingdeeCstomerModalVisible(true);
               return;
             }
-            autoFillCustomerContactSelectOptions(option.id);
+            autoFillCustomerContactSelectOptions(option?.id);
           }}
           initialValue={{
-            label: data?.erpCustomerName,
-            value: data?.customerId,
-            id: data?.customerId,
+            label: copyData?.erpCustomerName,
+            value: copyData?.customerId,
+            id: copyData?.customerId,
           }}
           fieldProps={{
             optionItemRender(item) {
@@ -813,6 +850,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           }}
           initialValue={data.contactAddress}
           options={productCustomerContactOptions}
+          disabled={optType('after-sales-check')}
         />
         <ProFormText
@@ -864,13 +902,14 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                 <Button
                   className="rounded-l-none"
                   type="primary"
+                  disabled={optType('after-sales-check')}
                   onClick={computeTotalPayment}
                 >
                   计算
                 </Button>
               ),
             }}
-            // disabled={mainInfoDisbled}
+            disabled={optType('after-sales-check')}
           />
         </div>
@@ -882,7 +921,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           label="支付渠道"
           options={enumToSelect(PAYMENT_CHANNEL_OPTIONS)}
           rules={[{ required: true, message: '支付渠道必填' }]}
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
         />
         <ProFormSelect
           placeholder="请输入支付方式"
@@ -892,7 +931,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           label="支付方式"
           options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
           rules={[{ required: true, message: '支付方式必填' }]}
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
         />
         <ProFormSelect
           placeholder="选择是否需要开票"
@@ -901,7 +940,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           key="invoicingStatus"
           label="是否需要开票"
           options={getInvoicingSelect()}
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
           onChange={(_, option) => {
             setInvoicingStatus(option.value);
             if (option.value === 'UN_INVOICE') {
@@ -917,7 +956,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           name="invoiceIdentificationNumber"
           label="开票信息"
           key="invoiceIdentificationNumber"
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
           hidden={invoicingStatus === 'UN_INVOICE'}
           placeholder="请输入开票信息"
           rules={[
@@ -933,7 +972,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             width="lg"
             key="invoicingTime"
             name="invoicingTime"
-            // disabled={mainInfoDisbled}
+            disabled={optType('after-sales-check')}
             hidden={invoicingStatus === 'UN_INVOICE'}
             label="开票时间"
             placeholder="请输入开票时间"
@@ -946,7 +985,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           name="bank"
           key="bank"
           label="开户银行"
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
           hidden={invoicingStatus === 'UN_INVOICE'}
           placeholder="请输入开户银行"
         />
@@ -956,7 +995,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           name="bankAccountNumber"
           hidden={invoicingStatus === 'UN_INVOICE'}
           label="银行账号"
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
           placeholder="请输入银行账号"
         />
         <ProFormTextArea
@@ -964,7 +1003,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           name="notes"
           label="备注"
           key="notes"
-          // disabled={mainInfoDisbled}
+          disabled={optType('after-sales-check')}
           placeholder="请输入备注"
           rules={[
             {
@@ -976,7 +1015,8 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
         <h2>商品信息</h2>
         <ProFormList
-          creatorButtonProps={{ disabled: false }}
+          creatorButtonProps={{ disabled: optType('after-sales-check') }}
+          deleteIconProps={!optType('after-sales-check')}
           name="list"
           label=""
           copyIconProps={false} //复制按钮不显示
@@ -991,10 +1031,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             },
           ]}
           actionGuard={{
-            beforeRemoveRow: async (index) => {
+            beforeRemoveRow: async () => {
               return new Promise((resolve) => {
-                if (index === 0) {
-                  message.error('第一行数据不能删除');
+                let list = form.getFieldValue('list');
+                if (list && list.length === 1) {
+                  message.error('至少需要保留一个商品');
                   resolve(false);
                   return;
                 }
@@ -1038,7 +1079,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     width="lg"
                     showSearch
                     name="productName"
-                    // options={options}
+                    disabled={optType('after-sales-check')}
                     placeholder="请搜索商品"
                     rules={[{ required: true, message: '商品名称必填' }]}
                     onChange={(_, option) => {
@@ -1119,6 +1160,15 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     }}
                   />,
                   <ProFormText
+                    key="orderStatus"
+                    name="orderStatus"
+                    width="lg"
+                    disabled
+                    label="orderStatus"
+                    placeholder="orderStatus"
+                    hidden
+                  />,
+                  <ProFormText
                     key={'productCode' + listMeta.index}
                     width="lg"
                     name="productCode"
@@ -1150,7 +1200,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     rules={[{ required: true, message: '商品参数必填' }]}
                     disabled={
                       productParametersDisabledFlagList[listMeta.index] !==
-                      false
+                        false || optType('after-sales-check')
                     }
                   />,
                   <ProFormDigit
@@ -1165,6 +1215,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       },
                     }}
                     placeholder="请输入商品数量"
+                    disabled={optType('after-sales-check')}
                     rules={[{ required: true, message: '商品数量必填' }]}
                   />,
                   <ProFormDigit
@@ -1179,6 +1230,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                       },
                     }}
                     placeholder="请输入商品单价"
+                    disabled={optType('after-sales-check')}
                     rules={[{ required: true, message: '商品单价必填' }]}
                   />,
                   <ProFormText
@@ -19,6 +19,7 @@ export const RECEIPTS_RECORD_TYPES = {
 export const PAYMENT_METHOD_OPTIONS = {
   UNPAID: '未付款',
   TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
+  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
   PAYMENT_IN_ADVANCE: '预付款',
   WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
   PLATFORM_SETTLEMENT: '平台结算',
@@ -8,6 +8,7 @@ import {
   postServiceOrderProcureOrder,
   postServiceOrderProcurePrint,
   postServiceOrderQueryServiceOrder,
+  postServiceOrderSaleCancelInvoicing,
 } from '@/services';
 import { orderExport } from '@/services/order';
 import {
@@ -717,6 +718,27 @@ const OrderPage = () =&gt; {
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
+            {optRecord.subPath?.includes('saleCancelInvoicing') ? (
+              <ButtonConfirm
+                className="p-0"
+                title="确认取消申请开票？"
+                text="取消申请"
+                onConfirm={async () => {
+                  let res = await postServiceOrderSaleCancelInvoicing({
+                    data: {
+                      subOrderIds: [optRecord.id],
+                    },
+                  });
+
+                  if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    refreshTable();
+                  }
+                }}
+              />
+            ) : (
+              ''
+            )}
             {optRecord.subPath?.includes('noNeedInvoicingEdit') ? (
               <Button
                 className="p-0"
@@ -1662,6 +1684,7 @@ const OrderPage = () =&gt; {
                       type="link"
                       onClick={() => {
                         //勾选的子订单：如果有勾选，后面只校验有勾选的
+
                         let selectedSubOrders = selectedRowObj[record.id];
                         if (
                           selectedSubOrders === undefined ||
@@ -1676,15 +1699,31 @@ const OrderPage = () =&gt; {
                         ) {
                           let orderStatus =
                             selectedSubOrders[index].orderStatus;
-                          //是审核通过及之后的订单
+                          //仓库管理员在审核之后的任何时候都可以编辑
                           if (
-                            orderStatus !== 'UNAUDITED' &&
-                            orderStatus !== 'AUDIT_FAILED'
+                            userInfo.roleSmallVO.code !== 'warehouseKeeper' &&
+                            userInfo.roleSmallVO.code !== 'admin'
                           ) {
-                            message.error(
-                              '请选择未审核或者审核失败的订单进行编辑',
-                            );
-                            return;
+                            //是审核通过及之后的订单
+                            if (
+                              orderStatus !== 'UNAUDITED' &&
+                              orderStatus !== 'AUDIT_FAILED'
+                            ) {
+                              message.error(
+                                '请选择未审核或者审核失败的订单进行编辑',
+                              );
+                              return;
+                            }
+                          } else {
+                            //仓库管理员只能编辑是还未审核的订单
+                            if (
+                              userInfo.roleSmallVO.code !== 'admin' &&
+                              (orderStatus === 'UNAUDITED' ||
+                                orderStatus === 'AUDIT_FAILED')
+                            ) {
+                              message.error('请选择已审核的订单进行编辑');
+                              return;
+                            }
                           }
                         }
                         setOrderDrawerVisible(true);
@@ -1830,6 +1869,46 @@ const OrderPage = () =&gt; {
                     ''
                   )}
+                  {record.mainPath?.includes('saleCancelInvoicing') ? (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="确认取消申请开票？"
+                      text="取消申请"
+                      onConfirm={async () => {
+                        let selectedSubOrders = selectedRowObj[record.id];
+                        if (selectedSubOrders === undefined) {
+                          selectedSubOrders = record.subOrderInformationLists;
+                        }
+                        setSelectedRows(selectedSubOrders);
+                        for (let i = 0; i < selectedSubOrders.length; i++) {
+                          if (
+                            selectedSubOrders[i].afterInvoicingStatus !==
+                            'APPLY_FOR_INVOICING'
+                          ) {
+                            message.error(
+                              '请选择已[申请开票]的子订单进行取消申请',
+                            );
+                            return;
+                          }
+                        }
+                        let res = await postServiceOrderSaleCancelInvoicing({
+                          data: {
+                            subOrderIds: selectedSubOrders.map((item) => {
+                              return item.id;
+                            }),
+                          },
+                        });
+
+                        if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(res.message);
+                          refreshTable();
+                        }
+                      }}
+                    />
+                  ) : (
+                    ''
+                  )}
+
                   {/* 财务审核：主订单暂无 */}
                   {record.mainPath?.includes('financeCheckOrder') ? (
                     <Button
@@ -1600,12 +1600,7 @@ export interface View {
 export interface Dto {
   /**
    * @description
-   *   审核备注
-   */
-  checkNotes?: string;
-  /**
-   * @description
    *   子订单id集合
    */
-  subIds?: Array<number>;
+  subOrderIds?: Array<number>;
 }
@@ -39,7 +39,6 @@ import type {
   MaterialStockRes,
   MaterialUnitListRes,
   MeasureUnitListRes,
-  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -248,7 +247,9 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Unauthorized
@@ -269,9 +270,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -295,7 +296,9 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -321,9 +324,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -348,7 +351,9 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   Created
@@ -374,9 +379,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -401,7 +406,9 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -422,9 +429,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -448,7 +455,9 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -469,9 +478,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -496,7 +505,9 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -517,9 +528,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -544,7 +555,9 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: ModelAndView;
+  200: {
+    [propertyName: string]: any;
+  };
   /**
    * @description
    *   No Content
@@ -565,9 +578,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   errorHtml
+ *   error
  * @tags basic-error-controller
- * @produces text/html
+ * @produces *
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -9294,6 +9307,77 @@ export const postServiceOrderQuerySupplier = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderSaleCancelInvoicing */
+export interface PostServiceOrderSaleCancelInvoicingOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderSaleCancelInvoicing */
+export interface PostServiceOrderSaleCancelInvoicingResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderSaleCancelInvoicingResponseSuccess =
+  PostServiceOrderSaleCancelInvoicingResponse[200];
+/**
+ * @description
+ *   销售取消申请开票
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderSaleCancelInvoicing = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/saleCancelInvoicing';
+  function request(
+    option: PostServiceOrderSaleCancelInvoicingOption,
+  ): Promise<PostServiceOrderSaleCancelInvoicingResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderSaleCancelInvoicingResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderSendProduct */
 export interface PostServiceOrderSendProductOption {
   /**