From c7ba489752ce928942eb0ed7fc6624e6dedd8722 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Fri, 3 Nov 2023 09:30:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E4=BB=B7=E6=A0=BC=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AF=E7=94=A8=E7=B1=BB=E5=9E=8B=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/base-data/jia-ge-dan.js               | 9 +++++++++
 .../wwwroot/models/base-data/xiao-shou.js                | 8 ++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js
index eb9118f2..68bd158b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/jia-ge-dan.js
@@ -1,3 +1,4 @@
+import { codeType } from "../_options.js";
 const schema = {
   title: "备件价格单",
   type: "object",
@@ -38,6 +39,7 @@ const schema = {
       type: "boolean",
       title: "是否已停用",
     },
+    codeType
   },
 };
 
@@ -108,6 +110,13 @@ export default function (service) {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "codeType",
+                action: "equal",
+                value: null,
+                readOnly: true,
+              },
             ],
           },
           skipCount: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
index b4c8cbb8..3a5d862d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/xiao-shou.js
@@ -106,15 +106,15 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "codeType",
-                action: "equal",
+                column: "contractNo",
+                action: "like",
                 value: null,
                 readOnly: true,
               },
               {
                 logic: "and",
-                column: "contractNo",
-                action: "like",
+                column: "codeType",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },