From e0ffb91c1d9e9fb0479dc5c012e2480e7dcde67a Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Tue, 2 Jan 2024 13:59:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=A2=E5=86=B2=E8=83=BD=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8F=91=E7=A5=A8=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/router/business.js                  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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 a7b95091..c236a03f 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
@@ -397,6 +397,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(
+            "import",
+            "title=导入开票文件&isTop=true",
+            (_, q) => q.filters.some((o) => o.column === "state" && o.value === 9) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1)
+          ),
           createButton(
             "approval",
             "title=财务审核通过&isTop=true",
@@ -462,13 +467,13 @@ export default [
 
       //     ],
       // },
-      {
-        ...createRoute("contrast", "title=库存任务"),
-        children: [
-          createCompareVmi("bbac_sa_detail_jobservice", "Vmi", "bbac", "库存余额任务"),
+      // {
+      //   ...createRoute("contrast", "title=库存任务"),
+      //   children: [
+      //     createCompareVmi("bbac_sa_detail_jobservice", "Vmi", "bbac", "库存余额任务"),
 
-        ],
-      },
+      //   ],
+      // },
       {
         ...createPage("sum", "title=库存余额汇总"),
         children: [createButton("query", "title=查询&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")],

From 50a86c00601e6de0404ef7c0e3b922e07d6a231d Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 3 Jan 2024 13:34:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E4=B8=AD10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
index ea6c8c39..345a366f 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js
@@ -19,6 +19,7 @@ const stateOptions = [
   { value: 7, label: "撤销扣减进行中" },
   { value: 8, label: "已提交QAD" },
   { value: 9, label: "红冲" },
+  { value: 10, label: "开票中" },
 ];
 const state = { title: "状态", type: "number", input: "select", options: stateOptions };
 const state2 = Object.assign(Object.assign({}, state), {