From 370448593a3dd91b5925734c071b66ceecf46573 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Fri, 25 Aug 2023 10:03:43 +0800
Subject: [PATCH] up

---
 .../wwwroot/components/form/form-input.js                 | 4 ++--
 .../wwwroot/models/settle/commerce.js                     | 1 +
 .../SettleAccount.HttpApi.Host/wwwroot/router/business.js | 8 ++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
index a3d0a522..cb0aec0e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
@@ -26,8 +26,8 @@ export default {
       </template>
       <template v-else-if="getInput(schema)==='tabs'">
         <el-tabs type="card" v-model="model[prop]" style="height:32px;margin:0;" class="form">
-          <el-tab-pane key="all" label="全部" :value="null" />
-          <el-tab-pane v-for="item in options" :key="item.key" :label="item.label" :name="item.value" />
+          <el-tab-pane label="全部" key="all" :name="" />
+          <el-tab-pane v-for="item in options" :label="item.label" :name="item.value" />
         </el-tabs>
       </template>
       <template v-else-if="getInput(schema)==='month'||getInput(schema)==='datetime'||getInput(schema)==='datetimerange'">
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
index a04cf64a..1391248b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/commerce.js
@@ -85,6 +85,7 @@ export default function (businessType, type) {
       url: queryUrl,
       method: queryMethod,
       hasFilter: true,
+      autoSubmit: true,
       schema: {
         title: "商务审批",
         type: "object",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index eb518a93..a883710f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -363,7 +363,7 @@ export default [
           createButton(
             "import",
             "title=导入开票文件&isTop=true",
-            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 3) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
           ),
           createButton(
             "approval",
@@ -377,7 +377,11 @@ export default [
             "title=退回&isTop=true",
             (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
           ),
-          createButton("sync", "title=同步到QAD&isTop=true"),
+          createButton(
+            "sync",
+            "title=同步到QAD&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 4) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
         ],
       },
     ],