更改了BusinessType和invoice改变了部分列名，消除了空格

1 year ago · 7b49c416d2
13 changed files with 169 additions and 114 deletions
--- 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
@ -261,7 +261,6 @@ export default {
                </el-form-item>
              </el-form>
            </template>
-
            <template v-else-if="editFormMode==='import'">
              <app-form
                mode="import"
@ -427,7 +426,6 @@ export default {
    const exportModel = ref(defaultExportModel);
    const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
    const importModel = ref(defaultImportModel);
-
    const factories = ref([]);
    const versions = ref([]);
    const fileList = ref([]);
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js
@ -3,15 +3,15 @@ const schema = {
  type: "object",
  properties: {
    erpMaterialCode: {
-      title: "厂内零件号",
+      title: "厂内物料号",
      type: "string",
    },
    settleMaterialCode: {
-      title: "客户零件号",
+      title: "客户物料号",
      type: "string",
    },
    materialDesc: {
-      title: "物料描述",
+      title: "厂内物料描述",
      type: "string",
    },
  },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material.js
@ -3,11 +3,11 @@ const schema = {
  type: "object",
  properties: {
    factory: {
-      title: "客户物料号",
+      title: "工厂",
      type: "string",
    },
    materialCode: {
-      title: "厂内物料号",
+      title: "物料号",
      type: "string",
    },
    materialDesc: {
@ -19,7 +19,11 @@ const schema = {
      type: "string",
    },
    estimateType: {
-      title: "产品类型",
+      title: "估价类",
+      type: "string",
+    },
+    estimateTypeDesc: {
+      title: "估价类描述",
      type: "string",
    },
  },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js
@ -15,7 +15,7 @@ const schema = {
      type: "DateTime",
    },
    endDate: {
-      title: "结算时间",
+      title: "结束时间",
      type: "DateTime",
    },
    clientCode: {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js
@ -18,7 +18,7 @@ const schema = {
      input: "datetime",
    },
    endTime: {
-      title: "结算时间",
+      title: "结束时间",
      type: "string",
      input: "datetime",
    },
@ -26,14 +26,13 @@ const schema = {
      title: "客户编码",
      type: "string",
    },
-    businessType: {
-      title: "业务类别",
+    date: {
+      title: "合同签订时间",
      type: "string",
-      input: "select",
-      options: businessTypes,
+      input: "datetime",
    },
-    version: {
-      title: "版本",
+    contractNo: {
+      title: "合同号",
      type: "string",
    },
  },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_se_detail_service.js
@ -1,51 +1,80 @@
-import version from "./version.js";
-import state from "./state.js";
-
 const schema = {
  title: "结算数据",
  type: "object",
  properties: {
-    version,
-    state,
-    shippingDate: {
-      title: "发货时间",
-      type: "DateTime",
-    },
    wmsBillNum: {
      title: "发运单号",
      type: "string",
    },
-    lu: {
+    billTime: {
+      title: "发货时间",
+      type: "string",
+      input: "datetime",
+    },
+    partCode: {
      title: "零件号",
      type: "string",
    },
-    pn: {
-      title: "生产号",
+    batch: {
+      title: "批次",
+      type: "string",
+    },
+    oper: {
+      title: "发货人",
+      type: "string",
+    },
+    dnBillNum: {
+      title: "DN单据号",
      type: "string",
    },
-    keyCode: {
-      title: "组合键值（LU+PN）",
+    dnBillTime: {
+      title: "DN单据时间",
      type: "string",
+      input: "datetime",
    },
-    qty: {
-      title: "数量",
-      type: "decimal",
+    dnOper: {
+      title: "DN单添加人",
+      type: "string",
    },
-    seqNumber: {
-      title: "日顺序号",
+    deliveryIndex: {
+      title: "交付索引",
      type: "string",
    },
-    assemblyCode: {
-      title: "小总成号",
+    custId: {
+      title: "客户",
      type: "string",
    },
-    injectionCode: {
-      title: "注塑码",
+    deliveryHose: {
+      title: "发货仓库",
      type: "string",
    },
-    beginDate: {
-      title: "订单时间",
-      type: "DateTime",
+    fromLocCode: {
+      title: "来源库位",
+      type: "string",
+    },
+    fromHose: {
+      title: "来源仓库",
+      type: "string",
+    },
+    fromErpLocCode: {
+      title: "来源ERP库存",
+      type: "string",
+    },
+    toLocCode: {
+      title: "目标库位",
+      type: "string",
+    },
+    toErpLocCode: {
+      title: "目标Erp库位",
+      type: "string",
+    },
+    toHose: {
+      title: "目标仓库",
+      type: "string",
+    },
+    remark: {
+      title: "备注",
+      type: "string",
    },
  },
 };
@ -107,6 +136,10 @@ export default function () {
          sorting: {
            hidden: true,
          },
+          businessType: {
+            hidden: true,
+            default: 0,
+          },
        },
      },
    },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js
@ -1,3 +1,5 @@
+import businessTypes from "./business-type.js";
+
 const schema = {
  title: "客户替换件关系",
  type: "object",
@ -10,13 +12,10 @@ const schema = {
      title: "替换客户零件号",
      type: "string",
    },
-    clientCode: {
-      title: "客户编码",
-      type: "string",
-    },
    businessType: {
      title: "业务类型",
-      type: "EnumBusinessType",
+      input: "select",
+      options: businessTypes,
    },
  },
 };
--- 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
@ -108,15 +108,6 @@ export default [
                  isTop: true,
                },
              },
-              // {
-              //   path: "delete",
-              //   meta: {
-              //     type: "button",
-              //     title: "删除",
-              //     icon: "file",
-              //     isTop: true,
-              //   },
-              // },
              {
                path: "synchronous",
                meta: {
@ -192,7 +183,6 @@ export default [
              type: "page",
              title: "EDI与发运数据对比",
              icon: "file",
-              enumBusinessType: "BBAC",
            },
            children: [
              {
@ -238,7 +228,6 @@ export default [
              type: "page",
              title: "EDI、发运与结算比对",
              icon: "file",
-              enumBusinessType: "BBAC",
            },
            children: [
              {
@ -644,15 +633,6 @@ export default [
                  isTop: true,
                },
              },
-              // {
-              //   path: "delete",
-              //   meta: {
-              //     type: "button",
-              //     title: "删除",
-              //     icon: "file",
-              //     isTop: true,
-              //   },
-              // },
              {
                path: "synchronous",
                meta: {
@ -728,7 +708,6 @@ export default [
              type: "page",
              title: "EDI与发运数据对比",
              icon: "file",
-              enumBusinessType: "HBPO",
            },
            children: [
              {
@ -774,7 +753,6 @@ export default [
              type: "page",
              title: "EDI、发运与结算比对",
              icon: "file",
-              enumBusinessType: "HBPO",
            },
            children: [
              {
@ -1071,7 +1049,6 @@ export default [
      },
    ],
  },
-
  {
    path: "jit",
    meta: {
@ -1646,7 +1623,6 @@ export default [
      },
    ],
  },
-
  {
    path: "bj",
    meta: {
@ -1756,15 +1732,6 @@ export default [
                  isTop: true,
                },
              },
-              // {
-              //   path: "delete",
-              //   meta: {
-              //     type: "button",
-              //     title: "删除",
-              //     icon: "file",
-              //     isTop: true,
-              //   },
-              // },
              {
                path: "synchronous",
                meta: {
@ -2079,7 +2046,6 @@ export default [
      },
    ],
  },
-
  {
    path: "in",
    meta: {
@ -2189,15 +2155,6 @@ export default [
                  isTop: true,
                },
              },
-              // {
-              //   path: "delete",
-              //   meta: {
-              //     type: "button",
-              //     title: "删除",
-              //     icon: "file",
-              //     isTop: true,
-              //   },
-              // },
              {
                path: "synchronous",
                meta: {
@ -2512,7 +2469,6 @@ export default [
      },
    ],
  },
-
  {
    path: "invoice",
    meta: {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/input/bj_pub_se_detail_service.js
@ -10,6 +10,7 @@ export default {
    const onCommand = async (item, rows) => {
      console.log(item.path, item, rows);
    };
+    config.query.schema.properties.businessType.default = 7;
    return { config, onCommand };
  },
 };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/input/in_pub_se_detail_service.js
@ -10,6 +10,7 @@ export default {
    const onCommand = async (item, rows) => {
      console.log(item.path, item, rows);
    };
+    config.query.schema.properties.businessType.default = 8;
    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
@ -16,46 +16,27 @@ export default {
            <el-tab-pane label="invoicE_WAIT_DETAIL" v-if="model.invoicE_WAIT_DETAIL.length">
              <el-auto-resizer>
                <template #default="{ height, width }">
-                  <el-table-v2
-                    fixed
-                    :data="model.invoicE_WAIT_DETAIL"
-                    :columns="columns1"
-                    :width="width"
-                    :height="height"
-                  />
+                  <el-table-v2 :data="model.invoicE_WAIT_DETAIL" :columns="columns1" :width="width" :height="height" />
                </template>
              </el-auto-resizer>
            </el-tab-pane>
            <el-tab-pane label="invoicE_MAP_GROUP" v-if="model.invoicE_MAP_GROUP.length">
              <el-auto-resizer>
                <template #default="{ height, width }">
-                  <el-table-v2
-                    fixed
-                    :data="model.invoicE_MAP_GROUP"
-                    :columns="columns2"
-                    :width="width"
-                    :height="height"
-                  />
+                  <el-table-v2 :data="model.invoicE_MAP_GROUP" :columns="columns2" :width="width" :height="height" />
                </template>
              </el-auto-resizer>
            </el-tab-pane>
            <el-tab-pane label="invoicE_NOT_SETTLE" v-if="model.invoicE_NOT_SETTLE.length">
              <el-auto-resizer>
                <template #default="{ height, width }">
-                  <el-table-v2
-                    fixed
-                    :data="model.invoicE_NOT_SETTLE"
-                    :columns="columns3"
-                    :width="width"
-                    :height="height"
-                  />
+                  <el-table-v2 :data="model.invoicE_NOT_SETTLE" :columns="columns3" :width="width" :height="height" />
                </template>
              </el-auto-resizer>
            </el-tab-pane>
          </el-tabs>
        </el-col>
      </el-row>
-
      <template #footer>
        <span class="dialog-footer">
          <el-button type="primary" @click="drawer=false"> {{$t('confirm')}} </el-button>
@ -76,7 +57,28 @@ export default {
    const drawer = ref(false);
    const loading = ref(false);
    const model = ref({
-      invoicE_WAIT_DETAIL: [{ version: "version" }],
+      invoicE_WAIT_DETAIL: [
+        {
+          version: 11111,
+          invbillNum: "INV230725142640-001",
+          inGroupNum: "INV2023",
+          lu: "lu",
+          price: 11111,
+          qty: 11111,
+          amt: 11111,
+          bussiessType: "bussiessType",
+        },
+        {
+          version: 22222,
+          invbillNum: "INV230725142640-002",
+          inGroupNum: "INV2023",
+          lu: "lu",
+          price: 22222,
+          qty: 22222,
+          amt: 22222,
+          bussiessType: "bussiessType",
+        },
+      ],
      invoicE_MAP_GROUP: [{ version: "version" }],
      invoicE_NOT_SETTLE: [{ version: "version" }],
    });
@ -96,18 +98,78 @@ export default {
        dataKey: "version",
        title: "期间",
      },
+      {
+        dataKey: "invbillNum",
+        title: "发票号",
+      },
+      {
+        dataKey: "invGroupNum",
+        title: "发票分组号",
+      },
+      {
+        dataKey: "lu",
+        title: "零件号",
+      },
+      {
+        dataKey: "price",
+        title: "单价",
+      },
+      {
+        dataKey: "qty",
+        title: "数量",
+      },
+      {
+        dataKey: "amt",
+        title: "金额",
+      },
+      {
+        dataKey: "bussiessType",
+        title: "业务分类",
+      },
    ];
    const columns2 = [
      {
        dataKey: "version",
        title: "期间",
      },
+      {
+        dataKey: "invbillNum",
+        title: "发票号",
+      },
+      {
+        dataKey: "inGroupNum",
+        title: "发票分组号",
+      },
+      {
+        dataKey: "settleGroupNum",
+        title: "结算分组号",
+      },
+      {
+        dataKey: "amt",
+        title: "金额",
+      },
    ];
    const columns3 = [
      {
        dataKey: "version",
        title: "期间",
      },
+      {
+        dataKey: "invGroupNum",
+        title: "发票分组号",
+      },
+      {
+        dataKey: "settleGroupNum",
+        title: "结算分组号",
+      },
+      {
+        dataKey: "lu",
+        title: "可结算分组号",
+      },
+      {
+        dataKey: "lu1",
+        title: "不可结算分组号",
+      },
    ];
    return { config, onCommand, drawer, loading, model, columns1, columns2, columns3 };
  },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/bbac_jit_pub_se_detail_service.js
@ -10,6 +10,7 @@ export default {
    const onCommand = async (item, rows) => {
      console.log(item.path, item, rows);
    };
+    config.query.schema.properties.businessType.default = 3;
    return { config, onCommand };
  },
 };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/input/hbpo_jit_pub_se_detail_service.js
@ -10,6 +10,7 @@ export default {
    const onCommand = async (item, rows) => {
      console.log(item.path, item, rows);
    };
+    config.query.schema.properties.businessType.default = 4;
    return { config, onCommand };
  },
 };