Merge remote-tracking branch 'origin/master'

曾国涛
2 parents e2b1c6c9 c6137ba4
Showing 3 changed files with 23 additions and 5 deletions
src/pages/Order/components/OrderDrawer.tsx
src/pages/Order/constant.ts
src/services/definition.ts
@@ -498,13 +498,16 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
    * @param option 收货人信息
    */
   async function autoFillCustomerInfo(option: any) {
-    if (option.type === 'add') {
+    if (option === undefined || option === null || option.type === 'add') {
       form.setFieldValue('customerShippingAddress', undefined);
       form.setFieldValue('customerContactNumber', undefined);
       form.setFieldValue('institution', undefined);
       form.setFieldValue('institutionContactName', undefined);
       form.setFieldValue('customerShippingAddress', undefined);
-      form.setFieldValue('customerNameString', option.name);
+
+      if (option !== undefined && option !== null) {
+        form.setFieldValue('customerNameString', option.name);
+      }
     } else {
       form.setFieldValue('customerShippingAddress', option.fullAddress);
       form.setFieldValue('customerContactNumber', option.phone);
@@ -1073,7 +1076,21 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
             width="lg"
             key="totalPayment"
             label="支付总额（￥）"
-            rules={[{ required: true, message: '支付总额必填' }]}
+            rules={[
+              { required: true, message: '支付总额必填' },
+              {
+                validator: (_, value) => {
+                  if (value <= 0) {
+                    return Promise.reject(
+                      new Error(
+                        '支付总额必须大于0 （扣预存的订单现在也必须填写实际金额）',
+                      ),
+                    );
+                  }
+                  return Promise.resolve();
+                },
+              },
+            ]}
             tooltip="点击计算，合计所有子订单金额"
             fieldProps={{
               addonAfter: (
@@ -8,6 +8,7 @@ export const PAYMENT_CHANNEL_OPTIONS = {
   WECHAT: '微信',
   BANK_TRANSFER: '银行转账',
   BALANCE: '预存款',
+  OFFLINE: '线下付款',
 };
 export const RECEIPTS_RECORD_TYPES = {
@@ -1549,13 +1549,13 @@ export interface QueryBankStatementDto {
    *   collection_date
    * @format date
    */
-  collectionDatetimeBegin?: string;
+  collectionDateBegin?: string;
   /**
    * @description
    *   collection_date
    * @format date
    */
-  collectionDatetimeEnd?: string;
+  collectionDateEnd?: string;
   /** @format int32 */
   current?: number;
   /** @format int64 */