From 94ae6d02904e1f59188d1a0392e9d31b23f0ee78 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 20 Mar 2024 09:52:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?jisbbac=E4=B8=8D=E5=8F=AF=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E7=82=B9=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/settle/detail.js               | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
index 5ab133b6..183fb1ec 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
@@ -28,11 +28,7 @@ export default function (businessType, type) {
       partCode: {
         title: "厂内零件号",
         type: "string",
-      },
-      materialDesc: {
-        title: "零件描述",
-        type: "decimal",
-      },
+      },      
       pn: {
         title: "标识号",
         type: "string",
@@ -99,7 +95,7 @@ export default function (businessType, type) {
     delete schema.properties["isMaidan"];
     delete schema.properties["contractDocID"];
   }
-  if (businessType !== "JisHBPO") {
+  if (businessType !== "JisBBAC") {
     delete schema.properties["site"];
   }
   const queryUrl = `settleaccount/${service}/detail-query`;
@@ -158,6 +154,13 @@ export default function (businessType, type) {
                 clearable: true,
                 title: "下线结束",
               },
+              {
+                logic: "and",
+                action: "like",
+                column: "site",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 action: "like",

From 689506761df01c82f1e0c34f51fde114c4d2b4e9 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 20 Mar 2024 10:14:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
index 183fb1ec..e8dc3d02 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/settle/detail.js
@@ -97,6 +97,7 @@ export default function (businessType, type) {
   }
   if (businessType !== "JisBBAC") {
     delete schema.properties["site"];
+    
   }
   const queryUrl = `settleaccount/${service}/detail-query`;
   const addUrl = `settleaccount/${service}/generate-settlement-order`;