From 8042b3c5a9d5f20ea55f6eeb6674b8d30aad1586 Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Tue, 17 Dec 2024 11:14:40 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=87=AA=E5=8A=A8=E5=88=86=E8=B4=A6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/config/AllocationConfig.api.ts |  2 +-
 .../allocation/config/AllocationConfig.vue    | 58 ++++++++++++++++---
 .../daxpay/common/merchant/app/MchAppList.vue |  6 +-
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
index 0fce5f7b5..72b685fce 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.api.ts
@@ -37,5 +37,5 @@ export interface AllocConfig extends MchEntity {
   /** 大于多少开启分账 */
   minAmount?: number
   /** 分账延迟时长(分钟) */
-  DelayTime?: number
+  delayTime?: number
 }
diff --git a/src/views/daxpay/common/allocation/config/AllocationConfig.vue b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
index baddb0e6e..0679b1baa 100644
--- a/src/views/daxpay/common/allocation/config/AllocationConfig.vue
+++ b/src/views/daxpay/common/allocation/config/AllocationConfig.vue
@@ -12,12 +12,12 @@
       <a-form-item label="主键" name="id" :hidden="true">
         <a-input v-model:value="form.id" :disabled="showable" />
       </a-form-item>
-      <a-form-item label="自动分账" name="autoAlloc">
+      <a-form-item name="autoAlloc">
         <template #label>
           <basic-title
             helpMessage="开启自动分账后，如果创建订单时设置为了自动分账，将会对订单自动分账"
           >
-            开启自动分账
+            自动分账
           </basic-title>
         </template>
         <a-radio-group v-model:value="form.autoAlloc" :disabled="!edit" button-style="solid">
@@ -25,7 +25,21 @@
           <a-radio-button :value="true">开启</a-radio-button>
         </a-radio-group>
       </a-form-item>
-      <a-form-item name="minAmount">
+      <a-form-item name="autoFinish" v-if="form.autoAlloc">
+        <template #label>
+          <basic-title
+            helpMessage="开启自动完结后，分账完成后，会自动对分账单进行完结，解冻剩余的资金"
+          >
+            自动完结
+          </basic-title>
+        </template>
+        <a-radio-group v-model:value="form.autoFinish" :disabled="!edit" button-style="solid">
+          <a-radio-button :value="false">关闭</a-radio-button>
+          <a-radio-button :value="true">开启</a-radio-button>
+        </a-radio-group>
+      </a-form-item>
+
+      <a-form-item name="minAmount" v-if="form.autoAlloc">
         <template #label>
           <basic-title helpMessage="只有大于或等于其实金额的订单才会进行分账">
             自动分账起始金额(元)
@@ -35,11 +49,28 @@
           v-model:value="form.minAmount"
           class="w-300px"
           :min="0.1"
+          :precision="1"
           :max="9999999"
           :disabled="!edit"
           placeholder="请输自动分账起始金额(元)"
         />
       </a-form-item>
+      <a-form-item name="delayTime" v-if="form.autoAlloc">
+        <template #label>
+          <basic-title helpMessage="支付订单完成后多久进行分账操作">
+            分账延迟时间(分钟)
+          </basic-title>
+        </template>
+        <a-input-number
+          v-model:value="form.delayTime"
+          class="w-300px"
+          :min="0"
+          :precision="0"
+          :max="99999"
+          :disabled="!edit"
+          placeholder="请输自动分账延迟时间(分钟)"
+        />
+      </a-form-item>
     </a-form>
     <a-space :size="55" class="flex justify-center">
       <a-button v-if="edit" @click="initData">取消</a-button>
@@ -53,7 +84,7 @@
 
 <script setup lang="ts">
   import useFormEdit from '@/hooks/bootx/useFormEdit'
-  import { onMounted, ref } from 'vue'
+  import { computed, onMounted, ref } from 'vue'
   import { FormInstance, Rule } from 'ant-design-vue/lib/form'
   import { saveConfig, getConfig, updateConfig, AllocConfig } from './AllocationConfig.api'
   import { useMessage } from '@/hooks/web/useMessage'
@@ -76,12 +107,23 @@
   const form = ref<AllocConfig>({
     autoAlloc: false,
     minAmount: 1.0,
+    autoFinish: false,
+    delayTime: 1440,
   })
 
-  const rules = {
-    autoAlloc: [{ required: true, message: '' }],
-    minAmount: [{ required: true, message: '请输自动分账起始金额(元)' }],
-  } as Record<string, Rule[]>
+  const rules = computed(() => {
+    return {
+      autoAlloc: [{ required: true, message: '' }],
+      minAmount: [{ required: form.value.autoAlloc, message: '请输自动分账起始金额(元)' }],
+      autoFinish: [{ required: form.value.autoAlloc, message: '' }],
+      delayTime: [
+        {
+          required: form.value.autoAlloc,
+          message: '请输订单完成后多久进行自动分账(分钟)',
+        },
+      ],
+    } as Record<string, Rule[]>
+  })
 
   /**
    * 重置信息
diff --git a/src/views/daxpay/common/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
index f40be7a76..522fda92c 100644
--- a/src/views/daxpay/common/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -61,15 +61,15 @@
                     <a-menu-item>
                       <a-link @click="showNotifyConfig(row)">订阅配置</a-link>
                     </a-menu-item>
+                    <a-menu-item>
+                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
+                    </a-menu-item>
                     <a-menu-item>
                       <a-link @click="showCheckoutConfig(row)">收银台配置</a-link>
                     </a-menu-item>
                     <a-menu-item>
                       <a-link @click="showCashierCode(row)">码牌配置</a-link>
                     </a-menu-item>
-                    <a-menu-item>
-                      <a-link @click="showAllocConfig(row)">分账配置</a-link>
-                    </a-menu-item>
                     <a-menu-item>
                       <a-link danger @click="remove(row)">删除应用</a-link>
                     </a-menu-item>