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,6 +1,28 @@
 import businessType, { version, state } from "../_options.js";
 
-const schema = {
+export default function (businessType, meta) {
+  let service = null;
+  let detailService = null;
+  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
+    service = "bbac_sa_service";
+    detailService = "bbac_sa_detail_service";
+  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
+    service = "hbpo_sa_service";
+    detailService = "hbpo_sa_detail_service";
+  } else {
+    service = "pub_sa_service";
+    detailService = "pub_sa_detail_service";
+  }
+  const queryUrl = `settleaccount/${service}/get-list`;
+  const deleteUrl = `settleaccount/${service}/delete-list`;
+  const importUrl = `settleaccount/${service}/import`;
+  const exportUrl = `settleaccount/${detailService}/export`;
+  const queryMethod = "POST";
+  const deleteMethod = "POST";
+  const importMethod = "POST";
+  const exportMethod = "POST";
+
+  const schema = {
     title: "结算数据",
     type: "object",
     properties: {
@@ -14,9 +36,9 @@ const schema = {
       },
       businessType,
     },
-};
+  };
 
-const querySchema = {
+  const querySchema = {
     title: "结算数据",
     type: "object",
     properties: {
@@ -63,41 +85,23 @@ const querySchema = {
         hidden: true,
       },
     },
-};
-
-export default function (businessType, meta) {
-  let service = null;
-  let detailService = null;
-  if (businessType === "JisBBAC" || businessType === "MaiDanJianBBAC") {
-    service = "bbac_sa_service";
-    detailService = "bbac_sa_detail_service";
-  } else if (businessType === "JisHBPO" || businessType === "MaiDanJianHBPO") {
-    service = "hbpo_sa_service";
-    detailService = "hbpo_sa_detail_service";
-  } else {
-    service = "pub_sa_service";
-    detailService = "pub_sa_detail_service";
-  }
-  const queryUrl = `settleaccount/${service}/get-list`;
-  const deleteUrl = `settleaccount/${service}/delete-list`;
-  const importUrl = `settleaccount/${service}/import`;
-  const exportUrl = `settleaccount/${detailService}/export`;
-  const queryMethod = "POST";
-  const deleteMethod = "POST";
-  const importMethod = "POST";
-  const exportMethod = "POST";
+  };
 
   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 发运数据"),
             ],