修改页面结构，更改进入界面version空值查询所有，搜索条件可以清空数据，寄售库的字段重新修正，手动同步按钮

1 year ago · 25faf70c5f
19 changed files with 955 additions and 969 deletions
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js
@ -76,7 +76,7 @@ export default {
      </template>
      <template v-else>
        <el-input
-          :clearable="!!schema.clearable"
+          clearable
          :disabled="getDisabled()"
          :placeholder="schema.title"
          v-model="model[prop]"
--- 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
@ -618,6 +618,10 @@ export default {
        } finally {
          editFormloading.value = false;
        }
+      } else if (item.path === "sync") {
+        const url = config.edit.syncUrl;
+        const method = config.edit.syncMethod;
+        await request(url, null, { method });
      } else if (item === "filter") {
        editFormTitle.value = t("自定义查询");
        dialogVisible.value = true;
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js
@ -55,12 +55,12 @@ export default function () {
      url: queryUrl,
      method: queryMethod,
      autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
      schema: {
        title: "数据对比",
        type: "object",
        properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
          name: {
            type: "string",
            default: null,
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js
@ -54,14 +54,13 @@ export default function () {
    query: {
      url: queryUrl,
      method: queryMethod,
-
      autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
      schema: {
        title: "数据对比",
        type: "object",
        properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
          name: {
            type: "string",
            default: null,
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/adjust.js
@ -4,6 +4,11 @@ const schema = {
  title: "库存事务日志",
  type: "object",
  properties: {
+    logType: {
+      title: "库存事务分类",
+      type: "string",
+      hidden: true,
+    },
    changedNumber: {
      title: "变动单号",
      type: "string",
@ -11,7 +16,7 @@ const schema = {
    changedTime: {
      title: "变动时间",
      type: "string",
-      input: "dateTime",
+      input: "datetime",
    },
    changedType,
    changedBy: {
@ -91,6 +96,7 @@ export default function () {
        title: "通用代码",
        type: "object",
        properties: {
+          logTypes: { type: "array", hidden: true, default: ["Type500", "Type600"] },
          filters: {
            title: "项目",
            type: "array",
@ -162,6 +168,13 @@ export default function () {
                value: null,
                readOnly: true,
              },
+              // {
+              //   logic: "and",
+              //   column: "logType",
+              //   action: "in",
+              //   value: "Type500, Type600",
+              //   readOnly: true,
+              // },
            ],
          },
          skipCount: {
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/backup.js
@ -73,7 +73,7 @@ export default function () {
              },
              {
                logic: "and",
-                column: "lu",
+                column: "partCode",
                action: "like",
                value: null,
                readOnly: true,
@ -88,14 +88,14 @@ export default function () {
              {
                logic: "and",
                column: "codeType",
-                action: "like",
+                action: "equal",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
                column: "billType",
-                action: "like",
+                action: "equal",
                value: null,
                readOnly: true,
              },
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/balance.js
@ -59,7 +59,7 @@ export default function () {
              },
              {
                logic: "and",
-                column: "lu",
+                column: "partCode",
                action: "like",
                value: null,
                readOnly: true,
@ -74,14 +74,14 @@ export default function () {
              {
                logic: "and",
                column: "codeType",
-                action: "like",
+                action: "equal",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
                column: "billType",
-                action: "like",
+                action: "equal",
                value: null,
                readOnly: true,
              },
--- 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
@ -33,9 +33,9 @@ const options4 = [
  { value: "In", label: "入库" },
  { value: "Out", label: "出库" },
 ];
-const billType = { title: "发货类型", type: "number", input: "select", options: options1 };
-const codeType = { title: "生产码类型", type: "string", input: "select", options: options2 };
-const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3 };
-const changedType = { title: "变动类型", type: "string", input: "select", options: options4 };
+const billType = { title: "发货类型", type: "number", input: "select", options: options1, clearable: true };
+const codeType = { title: "生产码类型", type: "string", input: "select", options: options2, clearable: true };
+const subBillType = { title: "发货子类型", type: "number", input: "select", options: options3, clearable: true };
+const changedType = { title: "变动类型", type: "string", input: "select", options: options4, clearable: true };

 export { billType, codeType, subBillType, changedType };
--- 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
@ -14,7 +14,7 @@ const schema = {
    changedTime: {
      title: "变动时间",
      type: "string",
-      input: "dateTime",
+      input: "datetime",
    },
    changedType,
    changedBy: {
@ -22,7 +22,7 @@ const schema = {
      type: "string",
    },
    partCode: {
-      title: "实扣厂内零件号",
+      title: "LU零件号",
      type: "string",
    },
    partCode2: {
@ -45,10 +45,7 @@ const schema = {
      title: "结算生产码",
      type: "string",
    },
-    codeType: {
-      title: "生产码类型",
-      type: "string",
-    },
+    codeType,
    billType,
    subBillType,
    qty: {
@ -126,6 +123,7 @@ export default function () {
        title: "通用代码",
        type: "object",
        properties: {
+          // logTypes: { type: "array", hidden: true, default: ["Type200", "Type400"] },
          filters: {
            title: "项目",
            type: "array",
@ -157,42 +155,42 @@ export default function () {
              },
              {
                logic: "and",
-                column: "createdDate",
+                column: "billTime",
                action: "like",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
-                column: "lu",
-                action: "like",
+                column: "billType",
+                action: "equal",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
-                column: "tmpe4",
+                column: "vinCode",
                action: "like",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
-                column: "vinCode",
-                action: "like",
+                column: "codeType",
+                action: "equal",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
-                column: "codeType",
+                column: "partCode",
                action: "like",
                value: null,
                readOnly: true,
              },
              {
                logic: "and",
-                column: "proType",
+                column: "orderNum",
                action: "like",
                value: null,
                readOnly: true,
--- 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
@ -10,18 +10,22 @@ export default function () {
      //   hidden: true,
      //   showForList: false,
      // },
-      lu: {
-        title: "LU零件号",
-        type: "string",
-      },
+      // lu: {
+      //   title: "LU零件号",
+      //   type: "string",
+      // },
      partCode: {
-        title: "客户零件号",
+        title: "LU零件号",
        type: "string",
      },
      vinCode: {
        title: "生产码",
        type: "string",
      },
+      customerPartCode: {
+        title: "客户零件号",
+        type: "string",
+      },
      codeType,
      billType,
      qty: {
--- 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
@ -16,10 +16,10 @@ const schema = {
      type: "string",
      link: true,
    },
-    settleGroupNum: {
-      title: "结算分组号",
-      type: "string",
-    },
+    // settleGroupNum: {
+    //   title: "结算分组号",
+    //   type: "string",
+    // },
    amt: {
      title: "金额",
      type: "decimal",
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
@ -30,10 +30,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/bbac_sa_service";
 const queryUrl = "settleaccount/bbac_sa_service/get-list";
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+const deleteUrl = "settleaccount/bbac_sa_service/delete-list";
+const importUrl = "settleaccount/bbac_sa_service/import";
 const queryMethod = "POST";
 const deleteMethod = "POST";
 const importMethod = "POST";
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
@ -111,15 +111,11 @@ const schema = {
 };

 const queryUrl = "settleaccount/bbac_se_detail_service/get-list";
-// const deleteUrl = `${baseUrl}/delete-list`;
-// const importUrl = `${baseUrl}/import`;
 const exportUrl = "settleaccount/bbac_se_detail_service/export";
-const invokeUrl = "settleaccount/bbacse-sync/invoke";
+const syncUrl = "settleaccount/bbacse-sync/invoke";
 const queryMethod = "POST";
-// const deleteMethod = "POST";
-// const importMethod = "POST";
 const exportMethod = "POST";
-const invokeMethod = "POST";
+const syncMethod = "POST";

 export default function () {
  return {
@ -180,14 +176,10 @@ export default function () {
      schema: schema,
    },
    edit: {
-      // deleteUrl,
-      // importUrl,
      exportUrl,
-      invokeUrl,
-      // deleteMethod,
-      // importMethod,
+      syncUrl,
      exportMethod,
-      invokeMethod,
+      syncMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
@ -28,10 +28,9 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/hbpo_sa_service";
 const queryUrl = "settleaccount/hbpo_sa_service/get-list";
-const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+const deleteUrl = "settleaccount/hbpo_sa_service/delete-list";
+const importUrl = "settleaccount/hbpo_sa_service/import";
 const queryMethod = "POST";
 const deleteMethod = "POST";
 const importMethod = "POST";
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
@ -1,5 +1,3 @@
-import version from "../../version.js";
-
 const schema = {
  title: "JIS发运数据",
  type: "object",
@ -112,13 +110,12 @@ const schema = {
  },
 };

-const baseUrl = "settleaccount/hbpo_se_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
-const exportUrl = `${baseUrl}/export`;
-const invokeUrl = "settleaccount/hbpose-sync/invoke";
+const queryUrl = "settleaccount/hbpo_se_detail_service/get-list";
+const exportUrl = "settleaccount/hbpo_se_detail_service/export";
+const syncUrl = "settleaccount/hbpose-sync/invoke";
 const queryMethod = "POST";
 const exportMethod = "POST";
-const invokeMethod = "POST";
+const syncMethod = "POST";

 export default function () {
  return {
@ -180,9 +177,9 @@ export default function () {
    },
    edit: {
      exportUrl,
-      invokeUrl,
+      syncUrl,
      exportMethod,
-      invokeMethod,
+      syncMethod,
      schema: schema,
    },
  };
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
@ -55,12 +55,12 @@ export default function () {
      url: queryUrl,
      method: queryMethod,
      autoSubmit: true,
-      disableQueryOnLoad: true,
+      disableQueryOnLoad: false,
      schema: {
        title: "数据对比",
        type: "object",
        properties: {
-          type: Object.assign({ defaultSelected: true }, version),
+          type: Object.assign({ defaultSelected: false }, version),
          name: {
            type: "string",
            default: null,
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/version.js
@ -5,5 +5,5 @@ export default {
  url: "settleaccount/centralized-control/get-all",
  value: "version",
  label: "version",
-  clearable: false,
+  clearable: true,
 };
--- 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
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/jit-hbpo/input/hbpo_jit_pub_sa_service.js
@ -1,6 +1,6 @@
 import AppList from "../../../../components/list/index.js";
 import html from "html";
-import useConfig from "../../../../models/pub_sa_detail_service.js";
+import useConfig from "../../../../models/pub_sa_service.js";

 export default {
  components: { AppList },
@ -13,4 +13,4 @@ export default {
    config.query.schema.properties.businessType.default = "ZhiGongJianHBPO";
    return { config, onCommand };
  },
-};
+};