Merge remote-tracking branch 'origin/master'

曾国涛
2 parents 934f99f7 80928860
Showing 6 changed files with 170 additions and 22 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
@@ -648,11 +648,15 @@ export default ({
         ) : (
           <div>请特别注意订单总金额与订单金额。</div>
         )}
-        <ProFormTextArea
-          width="lg"
-          name="name"
-          placeholder="若驳回，请填写驳回理由"
-        />
+        {!checkType(CHECK_TYPE.CONFIRM_DELIVER) ? (
+          <ProFormTextArea
+            width="lg"
+            name="name"
+            placeholder="若驳回，请填写驳回理由"
+          />
+        ) : (
+          <></>
+        )}
         {checkType(CHECK_TYPE.FINALCIAL) ? (
           <>
             <div className="pb-4 text-xs decoration-gray-50">
@@ -991,6 +991,9 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           debounceTime={1000}
           request={async (value, {}) => {
             const keywords = value.keyWords;
+            if (keywords === '') {
+              return [];
+            }
             const res = await postCanrdApiUserAddressList({
               data: { keywords: keywords },
             });
@@ -1078,18 +1081,18 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             label="支付总额（￥）"
             rules={[
               { required: true, message: '支付总额必填' },
-              {
-                validator: (_, value) => {
-                  if (value <= 0) {
-                    return Promise.reject(
-                      new Error(
-                        '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
-                      ),
-                    );
-                  }
-                  return Promise.resolve();
-                },
-              },
+              // {
+              //   validator: (_, value) => {
+              //     if (value <= 0) {
+              //       return Promise.reject(
+              //         new Error(
+              //           '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
+              //         ),
+              //       );
+              //     }
+              //     return Promise.resolve();
+              //   },
+              // },
             ]}
             tooltip="点击计算，合计所有子订单金额"
             fieldProps={{
@@ -1516,8 +1519,20 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     label="商品数量"
                     fieldProps={{
                       onChange: (value) => {
-                        listMeta.record.quantity = value;
-                        computeSubOrderPayment(listMeta);
+                        // 确保变更后的值为整数
+                        const intValue = parseInt(value, 10);
+                        if (!isNaN(intValue)) {
+                          listMeta.record.quantity = intValue;
+                          computeSubOrderPayment(listMeta);
+                        }
+                      },
+                      parser: (value) => {
+                        // 将输入的值转换为整数，如果不是合法数字则返回空字符串触发校验错误
+                        return value ? parseInt(value, 10) : '';
+                      },
+                      formatter: (value) => {
+                        // 在显示时始终将其格式化为不带小数部分的整数字符串
+                        return value ? value.toString() : '';
                       },
                     }}
                     placeholder="请输入商品数量"
@@ -28,6 +28,7 @@ export const PAYMENT_METHOD_OPTIONS = {
   CASH_ON_DELIVERY: '货到付款',
   HIRE_PURCHASE: '分期付款',
   PAYMENT_RECEIPT: '已回款',
+  PREPAID_NO_NEED_SEND: '预存款无需发货',
 };
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
@@ -170,6 +171,7 @@ export const PAYMENT_RECEIPTS_STATUS_OPTIONS = {
 export const ORDER_STATUS_OPTIONS = {
   WAIT_CONFIRM_DELIVER_AFTER_INVOICE: '待开票后确认发货',
+  SALES_CONFIRM: '销售待确认',
   UNAUDITED: '未审核',
   LEADER_PROCESS: '领导待审核',
   MODIFY_APPLY_WAIT_FOR_AUDIT: '修改待审核',
@@ -271,6 +273,7 @@ export const TAGS_COLOR = new Map&lt;string, string&gt;([
   ['AUDIT_PASS', 'success'],
   ['AUDIT_NOTPASS', 'error'],
   ['WAIT_CONFIRM_DELIVER_AFTER_INVOICE', 'processing'],
+  ['SALES_CONFIRM', 'warning'],
 ]);
 export const SALES_CODE_OPTIONS = [
   { label: 'D-Linda', value: 'D-Linda' },
@@ -398,6 +401,7 @@ export const HISTORY_OPT_TYPE = new Map&lt;string, string&gt;([
   ['applyModify', '申请修改订单信息'],
   ['OUTSIDE_SYSTEM_PUSH', '外部系统推送了本订单'],
   ['cancelSendOrder', '取消发货'],
+  ['salesConfirm', '商城订单销售确认'],
 ]);
 export const MAIN_ORDER_COLUMNS = [
@@ -13,6 +13,7 @@ import {
   postServiceOrderProvideProcurementRoles,
   postServiceOrderQueryServiceOrder,
   postServiceOrderSaleCancelInvoicing,
+  postServiceOrderSalesConfirm,
 } from '@/services';
 import { orderExport } from '@/services/order';
 import {
@@ -767,7 +768,7 @@ const OrderPage = () =&gt; {
                 key={index}
                 onConfirm={() => {
                   window.open(
-                    '/previewApi/onlinePreview?url=' +
+                    '/onlinePreview?url=' +
                       encodeURIComponent(Base64.encode(item.url)),
                   );
                 }}
@@ -1230,6 +1231,25 @@ const OrderPage = () =&gt; {
             </div>
           </Flex>
           <Flex className="w-[18%]" wrap="wrap" gap="small">
+            {optRecord.subPath?.includes('salesConfirm') && (
+              <ButtonConfirm
+                className="p-0"
+                title="是否确认此商城订单信息无误？确认无误之后订单将进入审核流程。"
+                text="订单确认"
+                onConfirm={async () => {
+                  let res = await postServiceOrderSalesConfirm({
+                    data: {
+                      subOrderIds: [optRecord.id],
+                    },
+                  });
+
+                  if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                    message.success(res.message);
+                    refreshTable();
+                  }
+                }}
+              />
+            )}
             {optRecord.subPath?.includes('uploadPaymentReceiptBill') ? (
               <Button
                 className="p-0"
@@ -2507,6 +2527,37 @@ const OrderPage = () =&gt; {
             <Flex justify="flex-end">
               <Space.Compact direction="vertical" align="end">
                 <Space wrap>
+                  {record.mainPath?.includes('salesConfirm') && (
+                    <ButtonConfirm
+                      className="p-0"
+                      title="是否确认此商城订单信息无误？确认无误之后订单将进入审核流程。"
+                      text="订单确认"
+                      onConfirm={async () => {
+                        let subIds = subOrderSelectedMap
+                          .get(record.id)
+                          ?.map((item) => {
+                            return item.id;
+                          });
+                        if (subIds === null || subIds === undefined) {
+                          subIds = record.subOrderInformationLists.map(
+                            (item) => {
+                              return item.id;
+                            },
+                          );
+                        }
+                        let res = await postServiceOrderSalesConfirm({
+                          data: {
+                            subOrderIds: subIds,
+                          },
+                        });
+
+                        if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                          message.success(res.message);
+                          refreshTable();
+                        }
+                      }}
+                    />
+                  )}
                   {record.mainPath?.includes('uploadPaymentReceiptBill') ? (
                     <Button
                       className="p-0"
@@ -3613,6 +3664,7 @@ const OrderPage = () =&gt; {
         'subNotes',
         'orderStatus',
         'createTime',
+        'modifiedAuditStatus',
       ];
       if (isSupplier() && !canSearchIndex.includes(item.dataIndex)) {
         item.search = false;
@@ -1549,13 +1549,13 @@ export interface QueryBankStatementDto {
    *   collection_date
    * @format date
    */
-  collectionDateBegin?: string;
+  collectionDatetimeBegin?: string;
   /**
    * @description
    *   collection_date
    * @format date
    */
-  collectionDateEnd?: string;
+  collectionDatetimeEnd?: string;
   /** @format int32 */
   current?: number;
   /** @format int64 */
@@ -1844,6 +1844,8 @@ export interface UpdatePwdVO {
 export interface UserAddressListRequest {
   keywords?: string;
+  /** @format int32 */
+  limit?: number;
 }
 export interface UserCenterInfoRequest {
@@ -12189,6 +12189,77 @@ export const postServiceOrderSaleCancelInvoicing = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderSalesConfirm */
+export interface PostServiceOrderSalesConfirmOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderSalesConfirm */
+export interface PostServiceOrderSalesConfirmResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderSalesConfirmResponseSuccess =
+  PostServiceOrderSalesConfirmResponse[200];
+/**
+ * @description
+ *   销售订单确认
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderSalesConfirm = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/salesConfirm';
+  function request(
+    option: PostServiceOrderSalesConfirmOption,
+  ): Promise<PostServiceOrderSalesConfirmResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderSalesConfirmResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderSendProduct */
 export interface PostServiceOrderSendProductOption {
   /**