修改寄售的库的下拉列表，建立inventory文件，建立新页面按钮

1 year ago · e6094d827a
8 changed files with 328 additions and 63 deletions
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/inventory.js
@ -0,0 +1,22 @@
+const options1 = [
+  { value: 0, label: "无" },
+  { value: 1, label: "JIS件" },
+  { value: 2, label: "JIT直供件" },
+  { value: 3, label: "印度件" },
+  { value: 4, label: "北汽4S备件" },
+];
+const options2 = [
+  { value: "01", label: "前保" },
+  { value: " 02", label: "后保" },
+  { value: "03", label: " 左门槛" },
+  { value: "04", label: "右门槛" },
+  { value: "05", label: "扰流板" },
+  { value: "06", label: "前左轮眉" },
+  { value: "07", label: "前右轮眉 " },
+  { value: "08", label: "后左轮眉" },
+  { value: "09", label: "后右轮眉" },
+];
+const proType = { title: "发货类型", type: "number", input: "select", options: options1 };
+const codeType = { title: "生产码类型", type: "string", input: "select", options: options2 };
+
+export { proType, codeType };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/log.js
@ -1,3 +1,5 @@
+import { proType, codeType } from "./inventory.js";
+
 //变动单据号、发生时间、生产码类型、、订单号、库位、变动数、EDI顺序号、备注、变动类型（In、Out标识）、发货类型（JIS\JIT\买单件\备件等）、
 //实扣LU零件号、实扣客户零件号、结算LU零件号、结算客户零件号、实扣生产码、结算生产码
 //库位、开始结束时间段、发货类型、生产码、生产码类型、LU零件号、订单号
@ -9,36 +11,33 @@ const schema = {
      title: "变动单号",
      type: "string",
    },
-    CreatedDate: {
+    createdDate: {
      title: "发生时间",
      type: "string",
    },
-    CodeType: {
-      title: "生产码类型",
-      type: "string",
-    },
-    Tmpe4: {
+    codeType,
+    tmpe4: {
      title: "订单号",
      type: "string",
    },
-    ErpToLoc: {
+    erpToLoc: {
      title: "库位",
      type: "string",
    },
-    Count: {
+    count: {
      title: "变动数",
      type: "number",
    },
-    ProType: {
-      title: "变动单号",
-      type: "发货类型",
+    changedType: {
+      title: "变动类型",
+      type: "string",
    },
-    VinCode: {
+    proType,
+    vinCode: {
      title: "生产码",
      type: "string",
    },
-
-    LU: {
+    lu: {
      title: "LU零件号",
      type: "string",
    },
@ -100,6 +99,48 @@ export default function () {
                value: null,
                readOnly: true,
              },
+              {
+                logic: "and",
+                column: "createdDate",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "lu",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "tmpe4",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "vinCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "codeType",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "proType",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
            ],
          },
          skipCount: {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js
@ -1,3 +1,5 @@
+import { proType, codeType } from "./inventory.js";
+
 export default function () {
  return {
    title: "寄售库存",
@ -24,27 +26,29 @@ export default function () {
        title: "生产码",
        type: "string",
      },
-      codeType: {
-        title: "生产码类型",
-        type: "string",
-        input: "select",
-        options: [
-          { value: "01", label: "前保" },
-          { value: "02", label: "后保" },
-          { value: "03", label: "门槛" },
-        ],
-      },
-      proType: {
-        title: "发货类型",
-        type: "string",
-        input: "select",
-        options: [
-          { value: "JIS", label: "JIS" },
-          { value: "JIT", label: "JIT" },
-          { value: "买单件", label: "买单件" },
-          { value: "备件", label: "备件" },
-        ],
-      },
+      codeType,
+      proType,
+      // codeType: {
+      //   title: "生产码类型",
+      //   type: "string",
+      //   input: "select",
+      //   options: [
+      //     { value: "01", label: "前保" },
+      //     { value: "02", label: "后保" },
+      //     { value: "03", label: "门槛" },
+      //   ],
+      // },
+      // proType: {
+      //   title: "发货类型",
+      //   type: "string",
+      //   input: "select",
+      //   options: [
+      //     { value: "JIS", label: "JIS" },
+      //     { value: "JIT", label: "JIT" },
+      //     { value: "买单件", label: "买单件" },
+      //     { value: "备件", label: "备件" },
+      //   ],
+      // },
      qty: {
        title: "数量",
        type: "string",
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_relationship.js
@ -0,0 +1,132 @@
+const schema = {
+  title: "通用代码",
+  type: "object",
+  properties: {
+    project: {
+      title: "项目",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    value: {
+      title: "值",
+      type: "string",
+      readOnly: true,
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+      ],
+    },
+    description: {
+      title: "描述",
+      type: "string",
+      input: "textarea",
+      showForList: true,
+      rules: [
+        {
+          required: true,
+        },
+        { max: 60 },
+      ],
+    },
+  },
+};
+
+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 queryMethod = "POST";
+const detailsMethod = "POST";
+const createMethod = "POST";
+const updateMethod = "POST";
+const deleteMethod = "POST";
+const importMethod = "POST";
+const exportMethod = "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: "project",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+            ],
+          },
+          skipCount: {
+            hidden: true,
+            default: 0,
+          },
+          maxResultCount: {
+            hidden: true,
+            default: 10,
+          },
+          sorting: {
+            hidden: true,
+          },
+        },
+      },
+    },
+    table: {
+      schema: schema,
+    },
+    edit: {
+      detailsUrl,
+      createUrl,
+      updateUrl,
+      deleteUrl,
+      importUrl,
+      exportUrl,
+      detailsMethod,
+      createMethod,
+      updateMethod,
+      deleteMethod,
+      importMethod,
+      exportMethod,
+      schema: schema,
+    },
+  };
+}
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
@ -478,6 +478,44 @@ export default [
          ],
        },
      },
+      {
+        path: "tb_relationdhip",
+        meta: {
+          type: "page",
+          title: "客户库位关系表",
+          icon: "file",
+          children: [
+            {
+              path: "query",
+              meta: {
+                type: "button",
+                title: "查询",
+                icon: "file",
+                isTop: true,
+              },
+            },
+            {
+              path: "import",
+              meta: {
+                type: "button",
+                title: "导入",
+                icon: "file",
+                isTop: true,
+              },
+            },
+            {
+              path: "export",
+              meta: {
+                type: "button",
+                title: "导出",
+                icon: "file",
+                isTop: true,
+                pattern: "paged",
+              },
+            },
+          ],
+        },
+      },
      {
        path: "job-item",
        meta: {
--- 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
@ -1656,6 +1656,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "import",
+                meta: {
+                  type: "button",
+                  title: "导入",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "delete",
                meta: {
@ -2079,6 +2088,15 @@ export default [
                  isTop: true,
                },
              },
+              {
+                path: "import",
+                meta: {
+                  type: "button",
+                  title: "导入",
+                  icon: "file",
+                  isTop: true,
+                },
+              },
              {
                path: "delete",
                meta: {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/tb_relationdhip.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/tb_relationdhip.js
@ -0,0 +1,15 @@
+import AppList from "../../components/list/index.js";
+import html from "html";
+import useConfig from "../../models/tb_relationship.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 };
+  },
+};
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js
@ -57,39 +57,16 @@ export default {
    const drawer = ref(false);
    const loading = ref(false);
    const model = ref({
-      invoicE_WAIT_DETAIL: [
-        {
-          version: 1111,
-          invbillNum: "INV230725142640-001",
-          inGroupNum: "INV2023",
-          lu: "lu",
-          price: 1111,
-          qty: 1111,
-          amt: 1111,
-          bussiessType: "bussiessType",
-        },
-        {
-          version: 2222,
-          invbillNum: "INV230725142640-002",
-          inGroupNum: "INV2023",
-          lu: "lu",
-          price: 2222,
-          qty: 2222,
-          amt: 2222,
-          bussiessType: "bussiessType",
-        },
-      ],
-      invoicE_MAP_GROUP: [
-        { version: 1111, invbillNum: "INV230725142640-001", inGroupNum: "INV2023", settleGroupNum: "1111", amt: 1111 },
-      ],
-      invoicE_NOT_SETTLE: [{ version: "version" }],
+      invoicE_WAIT_DETAIL: [],
+      invoicE_MAP_GROUP: [],
+      invoicE_NOT_SETTLE: [],
    });
    const onCommand = async (item, rows) => {
      drawer.value = true;
      loading.value = true;
      const data = { [item.path]: rows[0][item.path] };
-      // const response = await request("settleaccount/b-bAC_BA_SERVICE/detail-query", data, { method: "POST" });
-      // model.value = response.data;
+      const response = await request("settleaccount/invoice_service/detail-query", data, { method: "POST" });
+      model.value = response.data;
      await delay(1000);
      loading.value = false;
    };
@ -98,78 +75,96 @@ export default {
        key: "version",
        dataKey: "version",
        title: "期间",
+        width: 100,
      },
      {
        dataKey: "invbillNum",
        title: "发票号",
+        width: 100,
      },
      {
        dataKey: "invGroupNum",
        title: "发票分组号",
+        width: 100,
      },
      {
        dataKey: "lu",
        title: "零件号",
+        width: 100,
      },
      {
        dataKey: "price",
        title: "单价",
+        width: 100,
      },
      {
        dataKey: "qty",
        title: "数量",
+        width: 100,
      },
      {
        dataKey: "amt",
        title: "金额",
+        width: 100,
      },
      {
        dataKey: "bussiessType",
        title: "业务分类",
+        width: 100,
      },
    ];
    const columns2 = [
      {
        dataKey: "version",
        title: "期间",
+        width: 100,
      },
      {
        dataKey: "invbillNum",
        title: "发票号",
+        width: 100,
      },
      {
        dataKey: "inGroupNum",
        title: "发票分组号",
+        width: 100,
      },
      {
        dataKey: "settleGroupNum",
        title: "结算分组号",
+        width: 100,
      },
      {
        dataKey: "amt",
        title: "金额",
+        width: 100,
      },
    ];
    const columns3 = [
      {
        dataKey: "version",
        title: "期间",
+        width: 100,
      },
      {
        dataKey: "invGroupNum",
        title: "发票分组号",
+        width: 100,
      },
      {
        dataKey: "settleGroupNum",
        title: "结算分组号",
+        width: 100,
      },
      {
        dataKey: "lu",
        title: "可结算分组号",
+        width: 100,
      },
      {
        dataKey: "lu1",
        title: "不可结算分组号",
+        width: 100,
      },
    ];
    return { config, onCommand, drawer, loading, model, columns1, columns2, columns3 };