Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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,8 +95,9 @@ 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`;
   const addUrl = `settleaccount/${service}/generate-settlement-order`;
@@ -158,6 +155,13 @@ export default function (businessType, type) {
                 clearable: true,
                 title: "下线结束",
               },
+              {
+                logic: "and",
+                action: "like",
+                column: "site",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 action: "like",