From ba3e1602f0844401618411ccfde8b8652aa72fe6 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 22 Dec 2023 08:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/settle/commerce.js                  | 10 +---------
 .../wwwroot/router/business.js                         |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

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 f0bddfd1..2bf187ef 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
@@ -171,15 +171,7 @@ export default function (businessType, type) {
                 //default: dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss"),
                 clearable: false,
               },
-              {
-                logic: "and",
-                column: "fileName",
-                action: "equal",
-                value: null,
-                readOnly: true,
-                title: "备注",
-                clearable: false,
-              },
+
             ],
           },
           skipCount: {
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 1ddb06ff..87bc5ca4 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
@@ -402,7 +402,7 @@ 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("remark", "title=编辑&pattern=paged", (r, _) => r.invoiceState !== 2),
+          // createButton("remark", "title=编辑&pattern=paged", (r, _) => r.invoiceState !== 2),
           createButton("export-group", "title=导出发票分组&pattern=paged", (r, _) => r.invoiceState !== 2),
 
           //createButton("approval", "title=发票重开"),