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

@@ -95,7 +95,14 @@ export default function (businessType, type) {
   }
   if (businessType !== "JisBBAC") {
     delete schema.properties["site"];
-
+  }
+  else
+  {
+    if(service === "bbac_can_sa_service")
+    {
+      delete schema.properties["site"];
+    }
+    
   }
   const queryUrl = `settleaccount/${service}/detail-query`;
   const addUrl = `settleaccount/${service}/generate-settlement-order`;
@@ -209,6 +216,7 @@ export default function (businessType, type) {
   }
   else
   {
+    
 
     const querySchema = {
       title: "通用代码",
@@ -291,16 +299,23 @@ export default function (businessType, type) {
       },
     };
 
-       
+
-  
+    if(service === "bbac_can_sa_service")
-    
+    {
-    querySchema.properties.filters.default.push({
+      
-      logic: "and",
+    }
-      column: "site",
+    else
-      action: "equal",      
+    {
-      value: schema.properties.site.default,
+      querySchema.properties.filters.default.push({
-      readOnly: true,
+        logic: "and",
-    });
+        column: "site",
+        action: "equal",      
+        value: schema.properties.site.default,
+        readOnly: true,
+      });
+
+    }
+
 
     return {    
       query: {