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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/table/index.js

@@ -18,7 +18,7 @@ export default {
           </template>
         </template>
         <div class="cell el-table__cell" :class="key" v-else-if="!item.hidden">
-          <div class="cell">{{item.title}} <template v-if="data.length&&item.reduce">:{{data.map(o=>o[key]).reduce(item.reduce)}}</template></div>
+          <div class="cell">{{item.title}} <template v-if="data.length&&item.reduce">:{{Math.round(100*data.map(o=>o[key]).reduce(item.reduce))/100}}</template></div>
         </div>
       </template>
     </div>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/jie-suan.js

@@ -1,70 +1,5 @@
 import businessType, { version, state } from "../_options.js";
 
-const schema = {
-  title: "结算数据",
-  type: "object",
-  properties: {
-    version,
-    //state,
-    billNum: {
-      title: "结算单号",
-      type: "string",
-      oneToMany: "/input/jie-suan/detail",
-      config: "/models/input/jie-suan-detail.js",
-    },
-    businessType,
-  },
-};
-
-const querySchema = {
-  title: "结算数据",
-  type: "object",
-  properties: {
-    filters: {
-      title: "项目",
-      type: "array",
-      hidden: true,
-      items: {
-        type: "object",
-        properties: {
-          logic: {
-            type: "int",
-          },
-          column: {
-            type: "string",
-          },
-          action: {
-            type: "int",
-          },
-          value: {
-            type: "string",
-          },
-        },
-      },
-      default: [
-        {
-          logic: "and",
-          column: "version",
-          action: "equal",
-          value: null,
-          readOnly: true,
-        },
-      ],
-    },
-    skipCount: {
-      hidden: true,
-      default: 0,
-    },
-    maxResultCount: {
-      hidden: true,
-      default: 10,
-    },
-    sorting: {
-      hidden: true,
-    },
-  },
-};
-
 export default function (businessType, meta) {
   let service = null;
   let detailService = null;
@@ -87,17 +22,86 @@ export default function (businessType, meta) {
   const importMethod = "POST";
   const exportMethod = "POST";
 
+  const schema = {
+    title: "结算数据",
+    type: "object",
+    properties: {
+      version,
+      //state,
+      billNum: {
+        title: "结算单号",
+        type: "string",
+        oneToMany: "/input/jie-suan/detail",
+        config: "/models/input/jie-suan-detail.js",
+      },
+      businessType,
+    },
+  };
+
+  const querySchema = {
+    title: "结算数据",
+    type: "object",
+    properties: {
+      filters: {
+        title: "项目",
+        type: "array",
+        hidden: true,
+        items: {
+          type: "object",
+          properties: {
+            logic: {
+              type: "int",
+            },
+            column: {
+              type: "string",
+            },
+            action: {
+              type: "int",
+            },
+            value: {
+              type: "string",
+            },
+          },
+        },
+        default: [
+          {
+            logic: "and",
+            column: "version",
+            action: "equal",
+            value: null,
+            readOnly: true,
+          },
+        ],
+      },
+      skipCount: {
+        hidden: true,
+        default: 0,
+      },
+      maxResultCount: {
+        hidden: true,
+        default: 10,
+      },
+      sorting: {
+        hidden: true,
+      },
+    },
+  };
+
   const importSchema = {
     properties: {
       version: Object.assign(version, { rules: [{ required: true }] }),
     },
   };
-  if (meta.client === "bbac-104" || meta.client === "bbac-1046") {
+  if (meta.client === "bbac-1040" || meta.client === "bbac-1046") {
     schema.properties.site = importSchema.properties.site = {
       type: "number",
-      options: [],
+      options: [
+        { label: 1040, value: 1040 },
+        { label: 1046, value: 1046 },
+      ],
+      input: "select",
       hidden: true,
-      default: meta.client === "bbac-104" ? 104 : 1046,
+      default: meta.client === "bbac-1040" ? 1040 : 1046,
     };
     querySchema.properties.filters.default.push({
       logic: "and",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js

@@ -148,7 +148,7 @@ export default [
       {
         ...createRoute("input", "title=数据输入"),
         children: [
-          createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac-104", "JIS-BBAC 结算数据"),
+          createInputJieSuanShuju("bbac_sa_service", "JisBBAC", "bbac-1040", "JIS-BBAC 结算数据"),
           createInputJieSuanShuju("bbac_sa_service2", "JisBBAC", "bbac-1046", "JIS-BBAC顺义 结算数据"),
           createInputFaYunShuJu("bbac_se_detail_service", "JisBBAC", "bbac", "JIS-BBAC 发运数据"),
           createInputEdiShuJu("bbac_se_edi_service", "JisBBAC", "bbac", "JIS-BBAC EDI数据"),
@@ -210,7 +210,7 @@ export default [
           {
             ...createRoute("input", "title=数据输入"),
             children: [
-              createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-104", "直供件-BBAC 结算数据"),
+              createInputJieSuanShuju("bbac_jit_pub_sa_service", "ZhiGongJianBBAC", "bbac-1040", "直供件-BBAC 结算数据"),
               createInputJieSuanShuju("bbac_jit_pub_sa_service2", "ZhiGongJianBBAC", "bbac-1046", "直供件-BBAC顺义 结算数据"),
               createInputFaYunShuJu("bbac_jit_pub_se_detail_service", "ZhiGongJianBBAC", "bbac", "直供件-BBAC 发运数据"),
             ],