From 51ae23d2a4679d7bfd2fc6d46d6a3e748ed623af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?=
 <12930972+jiang-xuzhi@user.noreply.gitee.com>
Date: Thu, 20 Jul 2023 15:03:05 +0800
Subject: [PATCH] update

---
 .../wwwroot/api/site.js                       |  1 +
 .../wwwroot/components/list/index.js          | 44 +++++++++----------
 .../contrast/bbac_sa_detail_jobservice.js     | 22 +++++++---
 .../wwwroot/router/business.js                | 39 ++++++++++------
 4 files changed, 64 insertions(+), 42 deletions(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js
index 3543762a..21c2cac5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/api/site.js
@@ -91,6 +91,7 @@ async function getLocalizationAsync() {
         remove: "移除",
         restore: "还原",
         delete: "删除",
+        compare: "对比",
         authenticate: "验证",
         loginModel: "登录",
         login: "登录",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
index 0ca4da42..28e6fb4d 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js
@@ -226,7 +226,7 @@ export default {
                 style="height:100%;"
               />
             </template>
-            <template v-else-if="editFormMode==='export'">
+            <template v-else-if="editFormMode==='compare'">
               <el-form :model="exportModel" style="height:100%;">
                 <el-form-item label="选择期间" label-width="100px">
                   <el-select v-model="exportModel.version">
@@ -235,14 +235,14 @@ export default {
                 </el-form-item>
                 <template v-if="isNotJit">
                   <el-form-item label="发运日期" label-width="100px">
-                    <el-date-picker v-model="exportModel.date1" value-format="YYYY-MM-DD" />
+                    <el-date-picker v-model="exportModel.seStartDateTime" value-format="YYYY-MM-DD" />
                     <span style="margin:0 .5em;">-</span>
-                    <el-date-picker v-model="exportModel.date2" value-format="YYYY-MM-DD" />
+                    <el-date-picker v-model="exportModel.seEndDateTime" value-format="YYYY-MM-DD" />
                   </el-form-item>
                   <el-form-item label="下线日期" label-width="100px">
-                    <el-date-picker v-model="exportModel.date3" value-format="YYYY-MM-DD" />
+                    <el-date-picker v-model="exportModel.downLineStartDateTime" value-format="YYYY-MM-DD" />
                     <span style="margin:0 .5em;">-</span>
-                    <el-date-picker v-model="exportModel.date4" value-format="YYYY-MM-DD" />
+                    <el-date-picker v-model="exportModel.downLineEndDateTime" value-format="YYYY-MM-DD" />
                   </el-form-item>
                 </template>
                 <el-form-item label="通用码" label-width="100px">
@@ -410,10 +410,10 @@ export default {
     const editFormModel = ref(null);
     const defaultExportModel = {
       version: "",
-      date1: "",
-      date2: "",
-      date3: "",
-      date4: "",
+      seStartDateTime: "",
+      seEndDateTime: "",
+      downLineStartDateTime: "",
+      downLineEndDateTime: "",
       ln: "",
       pn: "",
       enumBusinessType: route.meta.enumBusinessType,
@@ -581,17 +581,17 @@ export default {
           if (!response.errors) {
             window.open(getUrl(`settleaccount/getblobfile/download/${response.data}`));
           }
-        } else if (item.meta.isTop) {
-          exportModel.value = defaultExportModel;
-          versions.value = (
-            await request("settleaccount/centralized-control/get-all", null, { method: "POST" })
-          ).data.items.map((o) => ({
-            value: o.version,
-            label: o.version,
-          }));
-          editFormTitle.value = `${t(item.path)}${config.query.schema.title}`;
-          dialogVisible.value = true;
         }
+      } else if (item.path === "compare") {
+        exportModel.value = defaultExportModel;
+        versions.value = (
+          await request("settleaccount/centralized-control/get-all", null, { method: "POST" })
+        ).data.items.map((o) => ({
+          value: o.version,
+          label: o.version,
+        }));
+        editFormTitle.value = `${t(item.path)}${config.query.schema.title}`;
+        dialogVisible.value = true;
       } else if (item.path === "import") {
         //import
         try {
@@ -654,7 +654,7 @@ export default {
       } else if (editFormMode.value === "details") {
         dialogVisible.value = false;
         editFormMode.value = null;
-      } else if (editFormMode.value === "export") {
+      } else if (editFormMode.value === "compare") {
         // const postData = JSON.parse(JSON.stringify(queryModel.value));
         // postData.filters = filterList.value.filter((o) => o.property && o.value);
         // delete postData.query["items"];
@@ -662,8 +662,8 @@ export default {
         // const url = `${baseUrl}/${editFormMode.value}?${qs.stringify(exportModel)}`;
         // const response = await post(url, postData);
         // download(response);
-        const url = config.edit.exportUrl;
-        await request(url, exportModel.value, { method: config.edit.exportMethod });
+        const url = config.edit.compareUrl;
+        await request(url, exportModel.value, { method: config.edit.compareMethod });
         dialogVisible.value = false;
       } else if (editFormMode.value === "import") {
         editFormloading.value = true;
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js
index b8c925af..07c45b44 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/contrast/bbac_sa_detail_jobservice.js
@@ -1,3 +1,5 @@
+import version from "../../../models/version.js";
+
 const schema = {
   title: "期间设置",
   type: "object",
@@ -75,6 +77,12 @@ export default function () {
         title: "期间设置",
         type: "object",
         properties: {
+          type: version,
+          name: {
+            type: "string",
+            default: null,
+            hidden: true,
+          },
           filters: {
             type: "array",
             hidden: true,
@@ -96,13 +104,13 @@ export default function () {
               },
             },
             default: [
-              {
-                logic: "and",
-                column: "year",
-                action: "like",
-                value: null,
-                readOnly: true,
-              },
+              // {
+              //   logic: "and",
+              //   column: "year",
+              //   action: "like",
+              //   value: null,
+              //   readOnly: true,
+              // },
             ],
           },
           skipCount: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index 4c745ac8..8283ae50 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -183,6 +183,7 @@ export default [
               type: "page",
               title: "EDI与发运数据对比",
               icon: "file",
+              enumBusinessType: "BBAC",
             },
             children: [
               {
@@ -195,7 +196,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -228,6 +229,7 @@ export default [
               type: "page",
               title: "EDI、发运与结算比对",
               icon: "file",
+              enumBusinessType: "BBAC",
             },
             children: [
               {
@@ -240,7 +242,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -273,6 +275,7 @@ export default [
               type: "page",
               title: "发运与结算数据二次比对",
               icon: "file",
+              enumBusinessType: "BBAC",
             },
             children: [
               {
@@ -285,7 +288,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -318,6 +321,7 @@ export default [
               type: "page",
               title: "买单件发运与结算数据三次比对",
               icon: "file",
+              enumBusinessType: "BBAC",
             },
             children: [
               {
@@ -330,7 +334,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -749,6 +753,7 @@ export default [
               type: "page",
               title: "EDI与发运数据对比",
               icon: "file",
+              enumBusinessType: "HBPO",
             },
             children: [
               {
@@ -761,7 +766,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -794,6 +799,7 @@ export default [
               type: "page",
               title: "EDI、发运与结算比对",
               icon: "file",
+              enumBusinessType: "HBPO",
             },
             children: [
               {
@@ -806,7 +812,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -839,6 +845,7 @@ export default [
               type: "page",
               title: "发运与结算数据二次比对",
               icon: "file",
+              enumBusinessType: "HBPO",
             },
             children: [
               {
@@ -851,7 +858,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1242,6 +1249,7 @@ export default [
               type: "page",
               title: "发运与结算比对",
               icon: "file",
+              enumBusinessType: "ZhiGongJian",
             },
             children: [
               {
@@ -1254,7 +1262,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1287,6 +1295,7 @@ export default [
               type: "page",
               title: "发运与结算二次比对",
               icon: "file",
+              enumBusinessType: "ZhiGongJian",
             },
             children: [
               {
@@ -1299,7 +1308,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1670,6 +1679,7 @@ export default [
               type: "page",
               title: "发运与结算比对",
               icon: "file",
+              enumBusinessType: "BeiJian",
             },
             children: [
               {
@@ -1682,7 +1692,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -1715,6 +1725,7 @@ export default [
               type: "page",
               title: "发运与结算二次比对",
               icon: "file",
+              enumBusinessType: "BeiJian",
             },
             children: [
               {
@@ -1727,7 +1738,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -2098,6 +2109,7 @@ export default [
               type: "page",
               title: "发运与结算比对",
               icon: "file",
+              enumBusinessType: "YingDuJian",
             },
             children: [
               {
@@ -2110,7 +2122,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",
@@ -2143,6 +2155,7 @@ export default [
               type: "page",
               title: "发运与结算二次比对",
               icon: "file",
+              enumBusinessType: "YingDuJian",
             },
             children: [
               {
@@ -2155,7 +2168,7 @@ export default [
                 },
               },
               {
-                path: "export",
+                path: "compare",
                 meta: {
                   type: "button",
                   title: "生成对比",