加了对比页面，，和手动同步，增加jobitem

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

@@ -261,7 +261,6 @@ export default {
 
             <template v-else-if="editFormMode==='import'">
               <app-form
-                inline
                 mode="import"
                 label-position="left"
                 :schema="config.import?.schema"
@@ -612,18 +611,18 @@ export default {
           editFormTitle.value = `${t(item.path)}${config.query.schema.title}`;
           fileList.value = [];
           dialogVisible.value = true;
-          versions.value = (
+          // versions.value = (
-            await request("settleaccount/centralized-control/get-all", null, { method: "POST" })
+          //   await request("settleaccount/centralized-control/get-all", null, { method: "POST" })
-          ).data.items.map((o) => ({
+          // ).data.items.map((o) => ({
-            value: o.version,
+          //   value: o.version,
-            label: o.version,
+          //   label: o.version,
-          }));
+          // }));
-          factories.value = (
+          // factories.value = (
-            await request("settleaccount/code-setting/get-all", null, { method: "POST" })
+          //   await request("settleaccount/code-setting/get-all", null, { method: "POST" })
-          ).data.items.map((o) => ({
+          // ).data.items.map((o) => ({
-            value: o.project,
+          //   value: o.project,
-            label: o.project,
+          //   label: o.project,
-          }));
+          // }));
         } catch (e) {
           console.log(e);
         } finally {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js

@@ -1,5 +1,5 @@
 import version from "../version.js";
-import { state2, state3 } from "../state.js";
+import { state2 as state, state3 } from "../state.js";
 
 const schema = {
   title: "通用代码",
@@ -22,10 +22,10 @@ const schema = {
       title: "金额",
       type: "decimal",
     },
-    state2,
+    state ,
-    Extend1: {
+    taxAmt: {
-      title: "扩展字段1",
+      title: "税额",
-      type: "string",
+      type: "decimal",
     },
     Extend2: {
       title: "扩展字段2",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-item.js

@@ -0,0 +1,100 @@
+const schema = {
+  title: "定时任务",
+  type: "object",
+  properties: {
+    isDisabled: {
+      title: "是否禁用",
+      type: "boolean",
+    },
+    name: {
+      title: "名称",
+      type: "string",
+    },
+    cron: {
+      title: "表达式",
+      type: "string",
+    },
+    service: {
+      title: "服务",
+      type: "string",
+    },
+    isRunning: {
+      title: "运行中",
+      type: "boolean",
+    },
+    concurrencyStamp: {
+      title: "并发",
+      type: "boolean",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/job-item/get-list";
+const createUrl = "settleaccount/job-item/create";
+const updateUrl = "settleaccount/job-item/update/{id}";
+const deleteUrl = "settleaccount/job-item/delete-list";
+const queryMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      schema: {
+        title: "定时任务",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+
+    edit: {
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-log.js

@@ -0,0 +1,81 @@
+const schema = {
+  title: "定时任务",
+  type: "object",
+  properties: {
+    start: {
+      title: "开始",
+      type: "string",
+    },
+    end: {
+      title: "结束",
+      type: "string",
+    },
+
+    success: {
+      title: "成功",
+      type: "boolean",
+    },
+    exception: {
+      title: "异常",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/job-log/get-list";
+const queryMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      schema: {
+        title: "定时任务",
+        type: "object",
+        properties: {
+          filters: {
+            type: "array",
+            hidden: true,
+            items: {
+              type: "object",
+              properties: {
+                logic: {
+                  type: "int",
+                },
+                column: {
+                  type: "string",
+                },
+                action: {
+                  type: "int",
+                },
+                value: {
+                  type: "string",
+                },
+              },
+            },
+            default: [],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+
+    edit: {
+      schema: schema,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@@ -18,6 +18,18 @@ const schema = {
       title: "结算时间",
       type: "DateTime",
     },
+    clientCode: {
+      title: "客户编码",
+      type: "string",
+    },
+    date: {
+      title: "合同签订时间",
+      type: "DateTime",
+    },
+    contractNo: {
+      title: "合同号",
+      type: "string",
+    },
   },
 };
 

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js

@@ -86,6 +86,16 @@ export default [
               isTop: true,
             },
           },
+          {
+            path: "query",
+            meta: {
+              type: "button",
+              title: "查询",
+              icon: "file",
+
+              isTop: true,
+            },
+          },
           // {
           //   path: "update",
           //   meta: {
@@ -95,7 +105,6 @@ export default [
           //     htmlClass: "el-button--primary",
           //     permission: "AbpIdentity.Users.Update",
           //     disabled: `(o) => o.isStatic`,
-             
           //   },
           // },
           {
@@ -469,6 +478,71 @@ export default [
           ],
         },
       },
+      {
+        path: "job-item",
+        meta: {
+          type: "page",
+          title: "定时任务",
+          icon: "file",
+          children: [
+            {
+              path: "query",
+              meta: {
+                type: "button",
+                title: "查询",
+                icon: "file",
+                isTop: true,
+              },
+            },
+            {
+              path: "create",
+              meta: {
+                type: "button",
+                title: "新建",
+                icon: "file",
+                isTop: true,
+              },
+            },
+            {
+              path: "update",
+              meta: {
+                type: "button",
+                title: "修改",
+                icon: "file",
+              },
+            },
+            {
+              path: "delete",
+              meta: {
+                type: "button",
+                title: "删除",
+                icon: "file",
+                isTop: true,
+              },
+            },
+          ],
+        },
+      },
+      {
+        path: "job-log",
+        meta: {
+          type: "page",
+          title: "日志",
+          icon: "file",
+          isHidden: true,
+          children: [
+            {
+              path: "query",
+              meta: {
+                type: "button",
+                title: "查询",
+                icon: "file",
+                isTop: true,
+              },
+            },
+          ],
+        },
+      },
     ],
   },
 ];

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

@@ -118,10 +118,10 @@ export default [
               //   },
               // },
               {
-                path: "import",
+                path: "synchronous",
                 meta: {
                   type: "button",
-                  title: "导入",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -155,6 +155,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "synchronous",
+                meta: {
+                  type: "button",
+                  title: "手动同步",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -278,98 +287,6 @@ export default [
               },
             ],
           },
-          {
-            path: "second_bbac_sa_detail_jobservice",
-            meta: {
-              type: "page",
-              title: "发运与结算数据二次比对",
-              icon: "file",
-              enumBusinessType: "BBAC",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                },
-              },
-            ],
-          },
-          {
-            path: "third_bbac_sa_detail_jobservice",
-            meta: {
-              type: "page",
-              title: "买单件发运与结算数据三次比对",
-              icon: "file",
-              enumBusinessType: "BBAC",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                },
-              },
-            ],
-          },
         ],
       },
       {
@@ -737,10 +654,10 @@ export default [
               //   },
               // },
               {
-                path: "import",
+                path: "synchronous",
                 meta: {
                   type: "button",
-                  title: "导入",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -774,6 +691,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "synchronous",
+                meta: {
+                  type: "button",
+                  title: "手动同步",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -897,52 +823,6 @@ export default [
               },
             ],
           },
-          {
-            path: "second_hbpo_sa_detail_jobservice",
-            meta: {
-              type: "page",
-              title: "发运与结算数据二次比对",
-              icon: "file",
-              enumBusinessType: "HBPO",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                },
-              },
-            ],
-          },
         ],
       },
       {
@@ -1209,10 +1089,10 @@ export default [
         },
         children: [
           {
-            path: "jit_jit_pub_sa_service",
+            path: "bbac_jit_pub_sa_service",
             meta: {
               type: "page",
-              title: "结算数据",
+              title: "BBAC结算数据",
               icon: "file",
             },
             children: [
@@ -1225,6 +1105,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "import",
+                meta: {
+                  type: "button",
+                  title: "导入",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "delete",
                 meta: {
@@ -1237,10 +1126,10 @@ export default [
             ],
           },
           {
-            path: "jit_pub_sa_detail_service",
+            path: "bbac_jit_pub_sa_detail_service",
             meta: {
               type: "page",
-              title: "结算数据明细",
+              title: "BBAC结算数据明细",
               icon: "file",
               isHidden: true,
             },
@@ -1255,19 +1144,39 @@ export default [
                 },
               },
               {
-                path: "delete",
+                path: "export",
                 meta: {
                   type: "button",
-                  title: "删除",
+                  title: "导出",
                   icon: "file",
                   isTop: true,
+                  pattern: "paged",
                 },
               },
+            ],
+          },
+          {
+            path: "bbac_jit_pub_se_detail_service",
+            meta: {
+              type: "page",
+              title: "BBAC发运数据",
+              icon: "file",
+            },
+            children: [
               {
-                path: "import",
+                path: "query",
                 meta: {
                   type: "button",
-                  title: "导入",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "synchronous",
+                meta: {
+                  type: "button",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -1285,10 +1194,10 @@ export default [
             ],
           },
           {
-            path: "jit_pub_se_detail_service",
+            path: "hbpo_jit_pub_sa_service",
             meta: {
               type: "page",
-              title: "发运数据",
+              title: "HBPO结算数据",
               icon: "file",
             },
             children: [
@@ -1301,15 +1210,6 @@ export default [
                   isTop: true,
                 },
               },
-              // {
-              //   path: "delete",
-              //   meta: {
-              //     type: "button",
-              //     title: "删除",
-              //     icon: "file",
-              //     isTop: true,
-              //   },
-              // },
               {
                 path: "import",
                 meta: {
@@ -1319,6 +1219,73 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "delete",
+                meta: {
+                  type: "button",
+                  title: "删除",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+            ],
+          },
+          {
+            path: "hbpo_jit_pub_sa_detail_service",
+            meta: {
+              type: "page",
+              title: "HBPO结算数据明细",
+              icon: "file",
+              isHidden: true,
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "export",
+                meta: {
+                  type: "button",
+                  title: "导出",
+                  icon: "file",
+                  isTop: true,
+                  pattern: "paged",
+                },
+              },
+            ],
+          },
+          {
+            path: "hbpo_jit_pub_se_detail_service",
+            meta: {
+              type: "page",
+              title: "HBPO发运数据",
+              icon: "file",
+            },
+            children: [
+              {
+                path: "query",
+                meta: {
+                  type: "button",
+                  title: "查询",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
+              {
+                path: "synchronous",
+                meta: {
+                  type: "button",
+                  title: "手动同步",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -1342,10 +1309,10 @@ export default [
         },
         children: [
           {
-            path: "jit_pub_sa_detail_jobservice",
+            path: "bbac_jit_pub_sa_detail_jobservice",
             meta: {
               type: "page",
-              title: "发运与结算比对",
+              title: "BBAC发运与结算比对",
               icon: "file",
               enumBusinessType: "ZhiGongJian",
             },
@@ -1397,10 +1364,10 @@ export default [
             ],
           },
           {
-            path: "jit_second_pub_sa_detail_jobservice",
+            path: "hbpo_jit_pub_sa_detail_jobservice",
             meta: {
               type: "page",
-              title: "发运与结算二次比对",
+              title: "HBPO发运与结算比对",
               icon: "file",
               enumBusinessType: "ZhiGongJian",
             },
@@ -1432,6 +1399,15 @@ export default [
                   isTop: true,
                 },
               },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
               {
                 path: "export",
                 meta: {
@@ -1790,10 +1766,10 @@ export default [
               //   },
               // },
               {
-                path: "import",
+                path: "synchronous",
                 meta: {
                   type: "button",
-                  title: "导入",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -1875,52 +1851,6 @@ export default [
               },
             ],
           },
-          {
-            path: "bj_second_pub_sa_detail_jobservice",
-            meta: {
-              type: "page",
-              title: "发运与结算二次比对",
-              icon: "file",
-              enumBusinessType: "BeiJian",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                },
-              },
-            ],
-          },
         ],
       },
       {
@@ -2269,10 +2199,10 @@ export default [
               //   },
               // },
               {
-                path: "import",
+                path: "synchronous",
                 meta: {
                   type: "button",
-                  title: "导入",
+                  title: "手动同步",
                   icon: "file",
                   isTop: true,
                 },
@@ -2354,52 +2284,6 @@ export default [
               },
             ],
           },
-          {
-            path: "in_second_pub_sa_detail_jobservice",
-            meta: {
-              type: "page",
-              title: "发运与结算二次比对",
-              icon: "file",
-              enumBusinessType: "YingDuJian",
-            },
-            children: [
-              {
-                path: "query",
-                meta: {
-                  type: "button",
-                  title: "查询",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "compare",
-                meta: {
-                  type: "button",
-                  title: "生成对比",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "delete",
-                meta: {
-                  type: "button",
-                  title: "删除",
-                  icon: "file",
-                  isTop: true,
-                },
-              },
-              {
-                path: "export",
-                meta: {
-                  type: "button",
-                  title: "下载",
-                  icon: "file",
-                },
-              },
-            ],
-          },
         ],
       },
       {
@@ -2930,6 +2814,16 @@ export default [
               pattern: "paged",
             },
           },
+          {
+            path: "backups",
+            meta: {
+              type: "button",
+              title: "手动备份",
+              icon: "file",
+              isTop: true,
+              pattern: "paged",
+            },
+          },
         ],
       },
     ],

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/job-item.js

@@ -0,0 +1,15 @@
+import AppList from "../../components/list/index.js";
+import html from "html";
+import useConfig from "../../models/job-item.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/job-log.js

@@ -0,0 +1,15 @@
+import AppList from "../../components/list/index.js";
+import html from "html";
+import useConfig from "../../models/job-log.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_detail_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_sa_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_sa_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js

@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/pub_se_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};