fix 下拉列表筛选不生效问题和去除无用字段

2026-05-13 01:46:01 +08:00 · 2025-11-16 22:44:29 +08:00
parent 8b8c9953bc
commit d89b9160a8
16 changed files with 27 additions and 42 deletions
--- a/src/hooks/bootx/useFormEdit.ts
+++ b/src/hooks/bootx/useFormEdit.ts
@@ -76,7 +76,10 @@ export default function () {
   * 搜索，供select下拉框组件进行筛选时使用(:filter-option="search")
   */
  function search(input: string, option) {
-    return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    return (
+      option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+      option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    )
  }

  /**
--- a/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue
+++ b/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue
@@ -56,7 +56,7 @@
              </a-form-item>
            </a-col>
            <a-col :span="12">
-              <a-form-item label="默认服务商" tooltip="注册代理商时，默认的服务商">
+              <a-form-item label="默认服务商" tooltip="注册商户时，默认的服务商">
                <a-select
                  style="width: 100%"
                  v-model:value="form.defaultIsvNo"
--- a/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue
+++ b/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue
@@ -17,21 +17,6 @@
                </a-input-group>
              </a-form-item>
            </a-col>
-            <a-col :span="12">
-              <a-form-item label="代理商端网址">
-                <a-input-group compact>
-                  <a-input
-                    :disabled="!edit"
-                    style="width: calc(100% - 60px)"
-                    v-model:value="form.agentWebUrl"
-                    placeholder="请输入代理商端网址"
-                  />
-                  <a-button type="primary" :disabled="!edit" @click="checkAgentUrl">检查</a-button>
-                </a-input-group>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="[128, 24]">
            <a-col :span="12">
              <a-form-item label="运营端网址">
                <a-input-group compact>
@@ -60,8 +45,6 @@
                </a-input-group>
              </a-form-item>
            </a-col>
-          </a-row>
-          <a-row :gutter="[128, 24]">
            <a-col :span="12">
              <a-form-item label="网关H5端地址">
                <a-input-group compact>
@@ -141,13 +124,6 @@
    checkUrl(`${removeTrailingSlash(form.value.mchWebUrl)}/server/echo`, '商户端地址')
  }

-  /**
-   * 检查代理端地址
-   */
-  function checkAgentUrl() {
-    checkUrl(`${removeTrailingSlash(form.value.agentWebUrl)}/server/echo`, '代理端地址')
-  }
-
  /**
   * 检查运营端网址地址
   */
--- a/src/views/daxpay/admin/dashboard/components/GrowCard.vue
+++ b/src/views/daxpay/admin/dashboard/components/GrowCard.vue
@@ -134,24 +134,11 @@
                </div>
              </div>
              <div class="bus_item">
-                <div class="title">代理商</div>
-                <div class="number">
-                  <CountTo :startVal="0" :endVal="mchData.normalAppCount || 0" />
-                </div>
-              </div>
-              <div class="bus_item">
-                <div class="title">商户应用</div>
+                <div class="title">应用</div>
                <div class="number">
                  <CountTo :startVal="0" :endVal="mchData.partnerCount || 0" />
                </div>
              </div>
-
-              <div class="bus_item">
-                <div class="title">*</div>
-                <div class="number">
-                  <CountTo :startVal="0" :endVal="mchData.partnerAppCount || 0" />
-                </div>
-              </div>
            </div>
          </div>
        </div>
--- a/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
@@ -23,6 +23,7 @@
        </a-form-item>
        <a-form-item label="所属商户" v-if="addable" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            :disabled="!addable"
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -14,7 +14,8 @@
      <a-form-item label="商户" name="mchNo">
        <a-select
          style="width: 320px"
-          :filter-option="search"
+          show-search
+            :filter-option="search"
          :options="merchantList"
          v-model:value="form.mchNo"
          placeholder="请选择商户"
@@ -23,7 +24,8 @@
      </a-form-item>
      <a-form-item label="商户应用" name="appId" v-show="form.mchNo">
        <a-select
-          :filter-option="search"
+          show-search
+            :filter-option="search"
          :options="mchAppList"
          v-model:value="form.appId"
          placeholder="请选择商户应用"
--- a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
@@ -12,6 +12,7 @@
      >
        <a-form-item label="商户号" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -21,6 +22,7 @@
        </a-form-item>
        <a-form-item label="应用号" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -20,6 +20,7 @@
        </a-form-item>
        <a-form-item label="商户号" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -29,6 +30,7 @@
        </a-form-item>
        <a-form-item label="应用号" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
@@ -20,6 +20,7 @@
        </a-form-item>
        <a-form-item label="商户号" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -29,6 +30,7 @@
        </a-form-item>
        <a-form-item label="应用号" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
@@ -20,6 +20,7 @@
        </a-form-item>
        <a-form-item label="商户号" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -29,6 +30,7 @@
        </a-form-item>
        <a-form-item label="应用号" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/device/qrcode/BindAppModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindAppModel.vue
@@ -20,6 +20,7 @@
      >
        <a-form-item label="应用" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/device/qrcode/BindBlankModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindBlankModel.vue
@@ -23,6 +23,7 @@
        </a-form-item>
        <a-form-item label="商户应用" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
@@ -20,6 +20,7 @@
      >
        <a-form-item label="商户" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -29,6 +30,7 @@
        </a-form-item>
        <a-form-item label="应用" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/device/terminal/BindAppModel.vue
+++ b/src/views/daxpay/common/device/terminal/BindAppModel.vue
@@ -20,6 +20,7 @@
      >
        <a-form-item label="应用" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
+++ b/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
@@ -20,6 +20,7 @@
      >
        <a-form-item label="商户" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"
@@ -29,6 +30,7 @@
        </a-form-item>
        <a-form-item label="应用" name="appId">
          <a-select
+            show-search
            :filter-option="search"
            :options="mchAppOptions"
            v-model:value="form.appId"
--- a/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
+++ b/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
@@ -23,6 +23,7 @@
        </a-form-item>
        <a-form-item label="商户" name="mchNo">
          <a-select
+            show-search
            :filter-option="search"
            v-model:value="form.mchNo"
            placeholder="请选择商户"