gcs-ui-lib 1.2.8 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {

package/packages/AutoFillList/src/components/config.js

@@ -527,14 +527,6 @@ const AutoFillListHeader = [
       return row.isAutoConfirm ? "是" : "否";
     },
   },
-  {
-    label: "失效时间",
-    prop: "effectiveTime",
-    align: "center",
-    width: "180",
-    sortable: true,
-    "show-overflow-tooltip": true,
-  },
   {
     label: "生效时间",
     prop: "updateTime",

package/packages/AutoFillRuleHistory/src/components/config.js

@@ -0,0 +1,670 @@
+/*
+ * @Author: yuehong yuehong@nstc.com.cn
+ * @Date: 2023-10-09 17:51:51
+ * @LastEditors: 龚珂 gongke@nstc.com.cn
+ * @LastEditTime: 2023-11-14 09:55:12
+ * @FilePath: \gcs-rec_web\payee-web\payee\src\views\Settings\AutoFillingRules\components\config.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { $l } from "n20-common-lib/src/utils/i18n";
+// 适用范围
+const SCOPE_OPTIONS = [
+  {
+    label: $l(`全集团`), //全集团
+    value: "all",
+  },
+  {
+    label: $l(`所选单位`), //所选单位
+    value: "unit",
+  },
+  {
+    label: $l(`所选单位及所有下级`), //所选单位及所有下级
+    value: "unit_and_sub",
+  },
+];
+
+// 补填方式
+const FILL_METHOD_OPTIONS = [
+  {
+    label: $l(`资金池`), //正向匹配补填
+    value: "FTS",
+  },
+  {
+    label: $l(`退票`), //逆向匹配补填
+    value: "REFUND",
+  },
+  {
+    label: $l(`同名账户划转`), //逆向匹配补填
+    value: "TRANSFER",
+  },
+  {
+    label: $l(`内部借款`), //内部借款
+    value: "INTERNAL_BORROWING",
+  },
+  {
+    label: $l(`通用`), //逆向匹配补填
+    value: "COMMON",
+  },
+];
+
+// 匹配要求
+const MATCHE_OPTIONS = [
+  {
+    label: $l(`精确匹配`), //精确匹配
+    value: "PRECISION",
+  },
+  {
+    label: $l(`模糊匹配`), //模糊匹配
+    value: "BLUR",
+  },
+];
+
+// 匹配字段设置
+const MATCHE_FIELD = {
+  payBankNo: {
+    prop: "payBankNo",
+    type: "select",
+    multiple: false,
+    url: "/bems/1.0/bank",
+    params: { isEnable: "1" },
+    valueKey: "bankNo",
+    labelKey: "bankName",
+  },
+  payBranchBankNo: {
+    prop: "payBranchBankNo",
+    type: "select",
+    multiple: false,
+    url: "/bems/1.0/branchBank",
+    params: { isEnable: "1" },
+    valueKey: "cnapsNo",
+    labelKey: "branchBankName",
+  },
+  payAccountNo: {
+    prop: "payAccountNo",
+    type: "input",
+  },
+  currencyNo: {
+    prop: "currencyNo",
+    type: "select",
+    multiple: false,
+    url: "/api/nstc-mdm/1.0/currency",
+    params: { isEnable: "1" },
+    valueKey: "currencyNo",
+    labelKey: "currencyName",
+  },
+  recAccountNo: {
+    prop: "recAccountNo",
+    type: "input",
+  },
+  recAccountName: {
+    prop: "recAccountName",
+    type: "input",
+  },
+  recBranchBankName: {
+    prop: "recBranchBankName",
+    type: "input",
+    // multiple: false,
+    // url: "/bems/1.0/branchBank",
+    // params: { isEnable: "1" },
+    // valueKey: "cnapsNo",
+    // labelKey: "branchBankName"
+  },
+  manageUnitNo: {
+    prop: "manageUnitNo",
+    type: "select",
+    multiple: false,
+    url: "/api/nstc-mdm/1.0/mdmDataDoc",
+    params: { isEnable: "1" },
+    valueKey: "code",
+    labelKey: "name",
+  },
+  explain: {
+    prop: "explain",
+    type: "input",
+  },
+};
+
+// 补填字段设置
+const FILL_FIELD = [
+  {
+    label: $l(`预算科目`), //预算科目
+    prop: "branchBank",
+    value: 1,
+    isDefault: true,
+    isUse: true,
+  },
+  {
+    label: $l(`现金流`), //现金流
+    prop: "cashFlowNo",
+    value: 2,
+    isDefault: true,
+    isUse: true,
+  },
+  {
+    label: $l(`款项类别`), //款项类别
+    prop: "paymentCategory",
+    value: 3,
+    isDefault: true,
+    isUse: true,
+  },
+  {
+    label: $l(`关联业务`), //关联业务
+    prop: "guanlian",
+    value: 4,
+    isDefault: true,
+    isUse: true,
+  },
+  {
+    label: $l(`关联业务1`), //关联业务1
+    prop: "guanlian1",
+    value: 5,
+    isDefault: true,
+    isUse: true,
+  },
+  {
+    label: $l(`关联业务2`), //关联业务2
+    prop: "guanlian2",
+    value: 6,
+    isDefault: false,
+    isUse: true,
+  },
+  {
+    label: $l(`关联业务3`), //关联业务3
+    prop: "guanlian3",
+    value: 7,
+    isDefault: true,
+    isUse: true,
+  },
+];
+
+// 关联业务
+const ASSOCIATED_BUSINESS_OPTIONS = [
+  {
+    label: $l("资金上收"),
+    name: $l("资金上收"),
+    code: "FTS_001",
+    typeCode: "FTS.FLOW.001",
+    type: "up",
+    isCross: false,
+  },
+  {
+    label: $l("资金下拨"),
+    name: $l("资金下拨"),
+    code: "FTS_002",
+    typeCode: "FTS.FLOW.002",
+    type: "down",
+    isCross: false,
+  },
+  {
+    label: $l("主动上存"),
+    name: $l("主动上存"),
+    code: "FTS_003",
+    typeCode: "FTS.FLOW.006",
+    type: "up",
+    isCross: false,
+  },
+  {
+    label: $l("请款下拨"),
+    name: $l("请款下拨"),
+    code: "FTS_004",
+    typeCode: "FTS.FLOW.009",
+    type: "down",
+    isCross: false,
+  },
+  {
+    label: $l("资金调入"),
+    name: $l("资金调入"),
+    code: "FTS_005",
+    typeCode: "FTS.FLOW.003",
+    type: "up",
+    isCross: false,
+  },
+  {
+    label: $l("资金调出"),
+    name: $l("资金调出"),
+    code: "FTS_006",
+    typeCode: "FTS.FLOW.004",
+    type: "down",
+    isCross: false,
+  },
+  {
+    label: $l("外债借入"),
+    name: $l("外债借入"),
+    code: "FTS_007",
+    typeCode: "FTS.FLOW.017",
+    type: "up",
+    isCross: true,
+  },
+  {
+    label: $l("对外放款"),
+    name: $l("对外放款"),
+    code: "FTS_008",
+    typeCode: "FTS.FLOW.018",
+    type: "down",
+    isCross: true,
+  },
+  {
+    label: $l("外债借入还款"),
+    name: $l("外债借入还款"),
+    code: "FTS_009",
+    typeCode: "FTS.FLOW.019",
+    type: "down",
+    isCross: true,
+  },
+  {
+    label: $l("对外放款还款"),
+    name: $l("对外放款还款"),
+    code: "FTS_010",
+    typeCode: "FTS.FLOW.020",
+    type: "up",
+    isCross: true,
+  },
+  {
+    label: $l("结息"),
+    name: $l("结息"),
+    code: "FTS_011",
+    typeCode: "",
+    type: "",
+    isCross: false,
+  },
+  {
+    label: $l("手续费"),
+    name: $l("手续费"),
+    code: "FTS_012",
+    typeCode: "",
+    type: "",
+    isCross: true,
+  },
+];
+const tableHeader = [
+  {
+    label: $l(`收款单位`), // '收款单位'
+    prop: "RULEID",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`规则名称`), // '规则名称'
+    prop: "RULENAME",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`适用范围`), // '适用范围'
+    prop: "APPLYRANGENAME",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`适用单位`), // '适用单位'
+    prop: "CLTNO",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`匹配优先级`), // '匹配优先级'
+    prop: "MATCHPRIORITY",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`匹配补填方式`), // '匹配补填方式'
+    prop: "FILLWAYNAME",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`收款金融机构（大行）`), // '收款金融机构（大行）'
+    prop: "payBankNo",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`收款金融机构（支行）`), // '收款金融机构（支行）'
+    prop: "payBranchBankNo",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`收款账号`), // '收款账号'
+    prop: "recAcc",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`对方户名`), // '对方户名'
+    prop: "recAccountName",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`摘要`), // '摘要'
+    prop: "explain",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`预算科目`), // '预算科目'
+    prop: "budgetCode",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`现金流`), // '现金流'
+    prop: "cashFlowNo",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`款项类别`), // '款项类别'
+    prop: "propNo",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`关联业务`), // '关联业务'
+    prop: "docmType",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`自动确认`), // '自动确认'
+    prop: "AUTOSUBMIT",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`生效时间`), // '生效时间'
+    prop: "EFFECTTIME",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+  {
+    label: $l(`操作人`), // '操作人'
+    prop: "CREATORNO",
+    align: "left",
+    width: "200",
+    isDefault: true,
+  },
+];
+const NODE_GROUP = {
+  matchingFieldCode: "accountNo",
+  logicalOperation: "",
+  matchingOperation: "",
+  matchingFieldName: "本方账号",
+  mValues: "",
+  key: Math.random(),
+};
+const AutoFillListHeader = [
+  {
+    type: "checkbox",
+    fixed: "left",
+    static: "pre", // 静态不被"显示列"显示的,且最终会被拼接到"显示列"排序后的表格的"前面"
+  },
+  {
+    type: "seq",
+    label: "序号",
+    width: "56",
+    fixed: "left",
+    align: "center",
+  },
+  {
+    slotName: "matchingId",
+    label: "规则编号",
+    prop: "matchingId",
+    align: "center",
+    minWidth: "114",
+    "show-overflow-tooltip": true,
+  },
+  {
+    label: "规则名称",
+    prop: "matchingRuleName",
+    width: "240",
+    "show-overflow-tooltip": true,
+  },
+  {
+    label: $l("规则类型"),
+    prop: "matchingRuleType",
+    align: "center",
+    minWidth: "114",
+    "show-overflow-tooltip": true,
+    formatter: ({ cellValue }) => {
+      let doc = {
+        GENERAL: $l("预先补填"),
+        INDEPENDENT: $l("完结补填"),
+      };
+      return doc[cellValue] || "--";
+    },
+  },
+  {
+    label: $l("适用账户"),
+    prop: "usedAccountType",
+    align: "center",
+    minWidth: "114",
+    "show-overflow-tooltip": true,
+    formatter: ({ cellValue }) => {
+      let doc = {
+        BANK_ACCOUNT: $l("银行账户"),
+        THIRD_ACCOUNT: $l("三方账户"),
+      };
+      return doc[cellValue] || "--";
+    },
+  },
+  {
+    label: "适用范围",
+    prop: "usedScope",
+    align: "center",
+    width: "200",
+    formatter: ({ row }) => {
+      let doc = {
+        all: $l(`全集团`),
+        unit: $l(`所选单位`),
+        unit_and_sub: $l(`所选单位及所有下级`),
+      };
+      return doc[row.usedScope] || "--";
+    },
+  },
+  {
+    label: "适用单位",
+    prop: "usedUnit",
+    slotName: "usedUnit",
+    align: "center",
+    width: "200",
+  },
+  // {
+  //   label: "适用业务",
+  //   prop: "usedBusiness",
+  //   align: "center",
+  //   width: "200",
+  //   formatter: ({ row }) => {
+  //     const o = FILL_METHOD_OPTIONS.find(
+  //       (item) => item.value === row.usedBusiness
+  //     );
+  //     if (!o) return "--";
+  //     return o.label;
+  //   },
+  // },
+  {
+    label: "匹配优先级",
+    prop: "matchingPriority",
+    align: "center",
+    width: "130",
+    formatter: ({ row }) => {
+      return row.matchingPriority;
+    },
+  },
+  {
+    label: "补填信息",
+    prop: "fillInfo",
+    align: "center",
+    slotName: "fillInfo",
+    width: "120",
+  },
+  {
+    label: "自动确认",
+    prop: "isAutoConfirm",
+    align: "center",
+    width: "120",
+    formatter: ({ row }) => {
+      return row.isAutoConfirm ? "是" : "否";
+    },
+  },
+  {
+    label: "失效时间",
+    prop: "updateTime",
+    align: "center",
+    width: "180",
+    sortable: true,
+    "show-overflow-tooltip": true,
+  },
+  {
+    label: "生效时间",
+    prop: "effectiveTime",
+    align: "center",
+    width: "180",
+    sortable: true,
+    "show-overflow-tooltip": true,
+  },
+
+  {
+    label: "操作人",
+    prop: "updator",
+    align: "center",
+    width: "160",
+    "show-overflow-tooltip": true,
+  },
+  {
+    slotName: "operate",
+    label: "操作",
+    static: "next", // 静态不被"显示列"显示的,且最终会被拼接到"显示列"排序后的表格的"后面"
+  },
+];
+const AutoFillListFilter = [
+  {
+    id: "usedUnitLike",
+    label: $l("适用单位"), //适用单位
+    type: "text",
+    value: "usedUnitLike",
+    isDefault: true,
+    // static: true,
+    props: {
+      clearable: true,
+    },
+  },
+  {
+    id: "matchingIdLike",
+    label: $l("规则编号"), //规则编号
+    type: "text",
+    value: "matchingIdLike",
+    isDefault: true,
+    // static: true,
+    props: {
+      clearable: true,
+    },
+  },
+  {
+    id: "matchingRuleNameLike",
+    label: $l("规则名称"), //规则名称
+    type: "text",
+    value: "matchingRuleNameLike",
+    isDefault: true,
+    props: {
+      clearable: true,
+    },
+  },
+  {
+    id: "usedScope",
+    label: $l("适用范围"), //适用范围
+    type: "select",
+    value: "usedScope",
+    width: "200px",
+    options: SCOPE_OPTIONS,
+    props: {
+      clearable: true,
+      filterable: true,
+    },
+  },
+  {
+    id: "matchingPriority",
+    label: $l("匹配优先级"), //匹配优先级
+    type: "number",
+    value: "matchingPriority",
+    props: {
+      min: 0,
+      max: 9999999999999,
+      clearable: true,
+      isClearable: true,
+      "d-num": 0,
+    },
+  },
+  {
+    id: "usedBusiness",
+    label: $l("适用业务"), //适用业务
+    type: "select",
+    value: "usedBusiness",
+    options: FILL_METHOD_OPTIONS,
+    props: {
+      clearable: true,
+      filterable: true,
+    },
+  },
+  {
+    id: "isAutoConfirm",
+    label: $l("自动确认"), //自动确认
+    type: "select",
+    value: "isAutoConfirm",
+    isDefault: false,
+    options: [
+      { value: 1, label: $l("是") },
+      { value: 0, label: $l("否") },
+    ],
+    props: {
+      clearable: true,
+      filterable: true,
+    },
+  },
+  {
+    id: "usedAccountType",
+    label: $l("适用账户"), //自动确认
+    type: "select",
+    value: "usedAccountType",
+    isDefault: false,
+    options: [
+      { value: "BANK_ACCOUNT", label: $l("银行账户") },
+      { value: "THIRD_ACCOUNT", label: $l("三方账户") },
+    ],
+    props: {
+      clearable: true,
+      filterable: true,
+    },
+  },
+];
+export {
+  SCOPE_OPTIONS,
+  FILL_METHOD_OPTIONS,
+  MATCHE_FIELD,
+  MATCHE_OPTIONS,
+  FILL_FIELD,
+  ASSOCIATED_BUSINESS_OPTIONS,
+  tableHeader,
+  NODE_GROUP,
+  AutoFillListFilter,
+  AutoFillListHeader,
+};

package/packages/AutoFillRuleHistory/src/main.vue

@@ -157,7 +157,7 @@ import {
 import {
   AutoFillListFilter,
   AutoFillListHeader,
-} from "^/AutoFillList/src/components/config";
+} from "./components/config";
 import { matchingHisList, matchingSetting } from "@/api/setting";
 import downloadBlob from "n20-common-lib/src/utils/downloadBlob";
 import { deepClone } from "@/utils/index";

package/packages/AutoFillService/src/components/basic.vue

@@ -119,7 +119,7 @@
           v-model="form.matchingPriority"
           clearable
           class="input-w"
-          :min="0"
+          :min="1"
           :placeholder="$l('请输入')"
           :max="9999"
         />

package/packages/AutoFillService/src/main.vue

@@ -157,7 +157,7 @@ export default {
         isAutoConfirm: 1,
         matchingRuleName: "",
         usedBusiness: "",
-        matchingPriority: 0,
+        matchingPriority: 1,
         matchingFillCommons: [], // 补填字段规则集合
         matchingFillDimensions: [],
       },