UPDATE

1 year ago · 4633167946
15 changed files with 202 additions and 169 deletions
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_map_group.js
@ -39,21 +39,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/code-setting";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const baseUrl = "settleaccount/invoice_service";
+const queryUrl = `${baseUrl}/detail_queryUrl`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";

 export default function () {
  return {
@ -114,18 +102,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
-      exportUrl,
-      detailsMethod,
-      createMethod,
-      updateMethod,
-      deleteMethod,
-      importMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
@ -39,7 +39,8 @@ const schema = {
  },
 };

-const queryUrl = `${baseUrl}/get-list`;
+const baseUrl = "settleaccount/invoice_service";
+const queryUrl = `${baseUrl}/detail_queryUrl`;
 const queryMethod = "POST";

 export default function () {
@ -101,18 +102,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
-      exportUrl,
-      detailsMethod,
-      createMethod,
-      updateMethod,
-      deleteMethod,
-      importMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
@ -103,6 +103,7 @@ export default function () {
      schema: schema,
    },
    edit: {
+      queryUrl,
      exportUrl,
      rejectUrl,
      passedUrl,
@ -111,6 +112,7 @@ export default function () {
      rejectMethod,
      passedMethod,
      sync_qadMethod,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_wait_detail.js
@ -39,21 +39,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/code-setting";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const baseUrl = "settleaccount/invoice_service";
+const queryUrl = `${baseUrl}/detail_queryUrl`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";

 export default function () {
  return {
@ -114,18 +102,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
-      exportUrl,
-      detailsMethod,
-      createMethod,
-      updateMethod,
-      deleteMethod,
-      importMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js
@ -39,21 +39,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/bbac_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/bbac_sa_service/detail_query";
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";
+

 export default function () {
  return {
@ -114,18 +102,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
-      exportUrl,
-      detailsMethod,
-      createMethod,
-      updateMethod,
-      deleteMethod,
-      importMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js
@ -53,7 +53,7 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/bbac_can_sa_detail_service";
+const baseUrl = "settleaccount/bbac_can_sa_service";
 const queryUrl = `${baseUrl}/detail-query`;
 const queryMethod = "POST";

@ -116,6 +116,8 @@ export default function () {
      schema: schema,
    },
    edit: {
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
@ -27,12 +27,8 @@ const schema = {
 };

 const baseUrl = "settleaccount/bbac_pd_service";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = `${baseUrl}/detail-query`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const exportMethod = "POST";

 export default function () {
  return {
@ -93,10 +89,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      exportUrl,
-      detailsMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js
@ -39,21 +39,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/hbpo_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const baseUrl = "settleaccount/hbpo_sa_service";
+const queryUrl = `${baseUrl}detail_query`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
-const importMethod = "POST";
-const exportMethod = "POST";

 export default function () {
  return {
@ -114,18 +102,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      createUrl,
-      updateUrl,
-      deleteUrl,
-      importUrl,
-      exportUrl,
-      detailsMethod,
-      createMethod,
-      updateMethod,
-      deleteMethod,
-      importMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
@ -52,12 +52,10 @@ const schema = {
 };

 const baseUrl = "settleaccount/hbpo_ba_service";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = `${baseUrl}/detail-query`;
+
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const exportMethod = "POST";
+

 export default function () {
  return {
@ -118,10 +116,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      exportUrl,
-      detailsMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js
@ -53,11 +53,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
+const baseUrl = "settleaccount/hbpo_can_sa_service";
+const queryUrl = `${baseUrl}/detail_query`;
 const queryMethod = "POST";
-const detailsMethod = "POST";

 export default function () {
  return {
@ -118,8 +116,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      detailsMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
@ -27,16 +27,8 @@ const schema = {
 };

 const baseUrl = "settleaccount/hbpo_pd_service";
-const queryUrl = `${baseUrl}/get-list`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const createUrl = `${baseUrl}/create`;
-const updateUrl = `${baseUrl}/update/%s`;
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/code-setting-upload-excel-import`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = `${baseUrl}/detail_query`;
 const queryMethod = "POST";
-const detailsMethod = "POST";
-const exportMethod = "POST";

 export default function () {
  return {
@ -97,10 +89,8 @@ export default function () {
      schema: schema,
    },
    edit: {
-      detailsUrl,
-      exportUrl,
-      detailsMethod,
-      exportMethod,
+      queryUrl,
+      queryMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_sa_service.js
@ -0,0 +1,92 @@
+import version from "./version.js";
+import state from "./state.js";
+
+const schema = {
+  title: "结算数据",
+  type: "object",
+  properties: {
+    version,
+    state,
+    billNum: {
+      title: "关联结算单号",
+      type: "string",
+    },
+  },
+};
+
+const queryUrl = "settleaccount/pub_sa_service/get-list";
+const deleteUrl = "settleaccount/pub_sa_service/delete";
+const importUrl = "settleaccount/pub_sa_service/import-by-business-type";
+const queryMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+
+export default function () {
+  return {
+    query: {
+      url: queryUrl,
+      method: queryMethod,
+      hasFilter: true,
+      schema: {
+        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,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      queryUrl,
+      deleteUrl,
+      importUrl,
+      queryMethod,
+      deleteMethod,
+      importMethod,
+      schema: schema,
+    },
+  };
+}
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
@ -19,20 +19,20 @@ const schema = {
  },
 };

-const queryUrl = "identity/roles";
-const deletetUrl = "identity/roles/{id}";
-const updateUrl = "identity/roles/{id}";
-const createUrl = "identity/roles/{id}";
+const queryUrl = "role/get-list";
+const deleteUrl = "role/delete/%s";
+const updateUrl = "role/update/%s";
+const createUrl = "role/create";
 const queryMethod = "GET";
-const deletetMethod = "DELETE";
+const deleteMethod = "DELETE";
 const updateMethod = "PUT";
-const createMethod = "GET";
+const createMethod = "POST";

 export default function () {
  return {
    query: {
-      url: "identity/roles",
-      method: "GET",
+      url: queryUrl,
+      method: queryMethod,
      schema: {
        title: "用户",
        type: "object",
@ -56,12 +56,11 @@ export default function () {
      schema: schema,
    },
    edit: {
-      queryUrl,
-      deletetUrl,
+      deleteUrl,
      updateUrl,
      createUrl,
-      queryMethod,
-      deletetMethod,
+
+      deleteMethod,
      updateMethod,
      createMethod,
      schema: schema,
--- 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
@ -259,6 +259,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "export",
                meta: {
@ -869,6 +878,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "export",
                meta: {
@ -1359,6 +1377,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "export",
                meta: {
@ -1829,6 +1856,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "export",
                meta: {
@ -2299,6 +2335,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "update-data",
+                meta: {
+                  type: "button",
+                  title: "更新结算数据状态",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "export",
                meta: {
@ -2719,6 +2764,7 @@ export default [
      type: "group",
      title: "实际采购成本",
      icon: "folder",
+      isHidden: true,
    },
    children: [
      {
@ -2727,6 +2773,7 @@ export default [
          type: "page",
          title: "实际采购成本",
          icon: "file",
+          isHidden: true,
        },
        children: [
          {
@ -2813,7 +2860,7 @@ export default [
        path: "record",
        meta: {
          type: "page",
-          title: "库存事务查询",
+          title: "库存事物查询",
          icon: "file",
        },
        children: [
@ -2836,6 +2883,16 @@ export default [
              pattern: "paged",
            },
          },
+          {
+            path: "data-export",
+            meta: {
+              type: "button",
+              title: "补货数据导出",
+              icon: "file",
+              isTop: true,
+              pattern: "paged",
+            },
+          },
        ],
      },
      {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/jit_jit_pub_sa_service.js
@ -1,6 +1,6 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../models/jit/input/jit_jit_pub_sa_service.js";
+import useConfig from "../../../models/pub_sa_service.js";

 export default {
  components: { AppList },