gcs-ui-lib 1.2.2 → 1.2.3

package/packages/MergeAutoFill/merge/merageFillService.vue

@@ -0,0 +1,168 @@
+<template>
+  <n20-page class="content-box">
+    <n20-page-header
+      @back="
+        () => {
+          this.$destroy();
+          this.$goBackCommon();
+        }
+      "
+      :content="headerTitle"
+      slot="header"
+      class="m-b-s"
+    ></n20-page-header>
+    <add-template
+      :form="form"
+      @unitOptions="unitOptions"
+      @changeDimensions="changeDimensions"
+      ref="basicRef"
+      :settingSource="settingSource"
+    />
+    <n20-secondary-tab :init.sync="activeName" :data="list" @click="clickTab" />
+    <div :class="{ 'm-l-32': activeValue == 'ConditionGroup' }">
+      <div v-if="activeValue == 'ConditionGroup'" class="m-b-s">
+        <i class="el-icon-warning-outline color-warning m-r-s"></i
+        >{{ $l("匹配值为多个时，点击编辑按钮，在编辑弹窗中以换行形式维护") }}
+      </div>
+      <keep-alive>
+        <component
+          :is="activeValue"
+          :ref="activeValue"
+          :localNode="tree"
+          :cltNos="cltNos"
+          :basicForm="form"
+          :options="options"
+          :settingSource="settingSource"
+          :emptyList="emptyList"
+          :filedList="filedList"
+          :NoNeedDefaultValue="true"
+        ></component>
+      </keep-alive>
+    </div>
+    <div slot="footer" class="page-button-shadow flex-box flex-c flex-v">
+      <el-button type="primary" @click="submit">{{ $l("保存") }}</el-button>
+      <el-button plain @click="$goBackCommon">{{ $l("取消") }}</el-button>
+    </div>
+  </n20-page>
+</template>
+
+<script>
+import NstcAutoFillService from "../../AutoFillService/src/main.vue";
+import { uuid ,deepClone} from "@/utils/index";
+import { NODE_GROUP } from "../../AutoFillService/src/components/config.js";
+import { axios } from "n20-common-lib";
+NODE_GROUP.matchingFieldCode = "";
+const tempTree = {
+  logicalOperation: "AND",
+  root: true,
+  matchingRules: [
+    // 条件项
+    { ...NODE_GROUP, key: uuid() },
+  ],
+  children: [
+    {
+      logicalOperation: "AND",
+      matchingRules: [
+        {
+          ...NODE_GROUP,
+          key: uuid(),
+        },
+        {
+          ...NODE_GROUP,
+          key: uuid(),
+        },
+      ],
+    },
+  ],
+};
+//递归处理动态值的匹配内容
+function flatData(node, vm) {
+  node?.matchingRules?.forEach((i) => {
+    if (!i.matchingValueType) {
+      i.matchingValueType = "FIXED";
+    }
+    if (i.matchingValueType === "DYNAMIC") {
+      vm.$set(i, "TmValues", i.matchingValues[0]?.split("."));
+    }
+    vm.$set(i, "mValues", i.matchingValues);
+    vm.$set(i, "key", uuid());
+  });
+  if (node?.children?.length) {
+    for (let i of node?.children) {
+      flatData(i, vm);
+    }
+  }
+}
+export default {
+  name: "NstcMergeAutoFillService",
+  extends: NstcAutoFillService,
+  components: {
+    addTemplate: () => import("./merageBasic.vue"),
+  },
+  data() {
+    return {
+      type: this.$route.query.type,
+    };
+  },
+  async mounted() {
+    this.$set(this.form, "usedAccountType", "THIRD_ACCOUNT");
+  },
+  methods: {
+    async matchingSetting() {
+      this.tree = deepClone(tempTree);
+    },
+    changeDimensions(val) {
+      this.filedList = val;
+    },
+    async init() {
+      if (!this.mcId) return;
+      let { data: res } = await axios.get(
+        `/api/aims/record/record-matching/1.0/matching-info/${this.mcId}`,
+      );
+      this.form = res || {};
+      if (res.usedBanks) {
+        let usedBank = res.usedBanks.map((item) => item.bankCode);
+        this.form.usedBank = usedBank[0];
+      }
+
+      //处理不填信息，通用补填信息补填内容
+      this.form.matchingFillCommons = res.matchingFillCommons.map((i) =>
+        this.list2obj(i),
+      );
+      this.form.matchingFillDimensions = res.matchingFillDimensions.map((i) =>
+        this.list2obj(i),
+      );
+      let treeData = { ...res.matchingHierarchy, root: true };
+      flatData(treeData, this);
+      this.tree = treeData;
+      this.form.frequencyMergingName = "日";
+      //修改复制时,通过选中的维度,设置匹配字段的下拉值.
+      this.$refs.basicRef?.changeDimensions(this.form.dimensionsMergingList);
+    },
+    async submit() {
+      await this.$refs.basicRef.submit();
+      //校验基本信息
+      if (this.activeValue == "ConditionGroup") {
+        let res = await this.vaiildGroup();
+        if (!res) return;
+      } else await this.vaildFill();
+
+      //主要处理扩展字段多选的问题，还要兼容历史数据。
+      let mc = this.dealMC();
+      let data = {
+        ...this.form,
+        refillBasis: 3,
+        matchingFillCommons: mc,
+        matchingHierarchy: this.delData(this.tree),
+        settingSource: this.settingSource, //设置来源（1-收款，2-付款）
+      };
+      if (this.$route.query.type == "copy") {
+        delete data.matchingId;
+      }
+      await axios.post("/api/aims/record/record-matching/1.0/save", data);
+      this.$message.success(this.$l("保存成功"));
+      this.$goBackCommon();
+    },
+  },
+};
+</script>

package/packages/MergeAutoFill/merge/merageHistoryRules.vue

@@ -0,0 +1,133 @@
+<template>
+  <NstcAutoFillRuleHistory
+    :setting-source="2"
+    :pageRelaNo="pageRelaNo"
+    key="nafh"
+    :type="'merge'"
+    :fList="filterList"
+    :hList="tableHeader"
+  />
+</template>
+
+<script>
+import {
+  AutoFillListHeader,
+  AutoFillListFilter,
+} from "gcs-ui-lib/packages/AutoFillList/src/components/config";
+import { $l } from "n20-common-lib";
+export default {
+  components: {
+    NstcAutoFillRuleHistory: () => import("./ExtendMergeHistory.vue"),
+  },
+  async mounted() {
+    this.pushHeader();
+    this.pushFilter();
+  },
+  data() {
+    return {
+      filterList: [],
+      tableHeader: [],
+      pageRelaNo: {
+        export: "payment001",
+      },
+    };
+  },
+  methods: {
+    pushFilter() {
+      let rbs = [
+        {
+          id: "refillBasis",
+          label: $l("补填依据"), //自动确认
+          type: "select",
+          value: "refillBasis",
+          isDefault: false,
+          options: [
+            { value: 1, label: $l("流水要素") },
+            { value: 2, label: $l("关联对私批量指令") },
+          ],
+          props: {
+            clearable: true,
+            filterable: true,
+          },
+        },
+        {
+          label: $l("适用银行"),
+          type: "select",
+          value: "usedBankCodeList",
+          id: "usedBankCodeList",
+          multiple: true,
+          options: [],
+          props: {
+            filterable: true,
+            labelKey: "bankName",
+            valueKey: "bankNo",
+          },
+          width: "168px",
+          reqOptions: {
+            method: "get",
+            url: "/api/nstc-mdm/1.0/bank",
+            resList: "data",
+            params: { isEnable: 1 },
+          },
+        },
+        {
+          id: "isMatchChildOrder",
+          label: $l("是否匹配子指令"), //自动确认
+          type: "select",
+          value: "isMatchChildOrder",
+          isDefault: false,
+          options: [
+            { value: 1, label: $l("是") },
+            { value: 0, label: $l("否") },
+          ],
+          props: {
+            clearable: true,
+            filterable: true,
+          },
+        },
+      ];
+      this.filterList = [...AutoFillListFilter, ...rbs].filter(
+        (item) => !["usedBusiness", "usedAccountType"].includes(item.id),
+      );
+    },
+    pushHeader() {
+      this.tableHeader = [...AutoFillListHeader];
+      let rbs = {
+        label: $l("合并频次"),
+        prop: "frequencyMerging",
+        align: "center",
+        minWidth: "144",
+        "show-overflow-tooltip": true,
+        formatter: ({ row }) => {
+          let doc = {
+            day: "日",
+          };
+          return doc[row.frequencyMerging];
+        },
+      };
+      let ctn = {
+        label: $l("规则类型"),
+        prop: "matchingRuleType",
+        align: "center",
+        minWidth: "114",
+        "show-overflow-tooltip": true,
+        formatter: ({ cellValue }) => {
+          let doc = {
+            GENERAL: $l("预先补填"),
+            INDEPENDENT: $l("完结补填"),
+          };
+          return doc[cellValue] || "--";
+        },
+      };
+
+      // this.tableHeader = [...this.tableHeader, ...ctn];
+      //保证顺序与ui一致（直接修改this.tableHeader，会修改了config的值。历史规则同步修改了）
+      this.tableHeader.splice(3, 0, rbs);
+      this.tableHeader.splice(5, 0, ctn);
+      this.tableHeader = this.tableHeader.filter(
+        (item) => !["usedBusiness", "usedAccountType"].includes(item.prop),
+      );
+    },
+  },
+};
+</script>

package/packages/MergeAutoFill/merge/mergeFillDetail.vue

@@ -0,0 +1,148 @@
+<template>
+  <n20-page class="content-box">
+    <div slot="header" v-if="needHeaderGo">
+      <n20-page-header
+        @back="goBackCommon"
+        :content="$l('合并补填规则详情')"
+      ></n20-page-header>
+    </div>
+    <!-- 基本匹配规则 -->
+    <n20-expandable-pane :title="$l('基本匹配规则')" class="m-t-m">
+      <n20-descriptions>
+        <el-descriptions-item :label="$l('规则编号')"
+          >{{ detail.matchingId }}
+          <span v-if="detail.matchingIdHi"
+            >-{{ detail.matchingIdHi }}</span
+          ></el-descriptions-item
+        >
+        <!-- 规则名称 -->
+        <el-descriptions-item :label="$l('规则名称')">{{
+          detail.matchingRuleName || "--"
+        }}</el-descriptions-item>
+        <!-- 适用范围 -->
+        <el-descriptions-item :label="$l('适用范围')">{{
+          detail.usedScope | usedScopeFilter
+        }}</el-descriptions-item>
+        <!-- 规则类型 -->
+        <el-descriptions-item :label="$l('规则类型')">{{
+          detail.matchingRuleType == "GENERAL" ? $l("预先补填") : $l("完结补填")
+        }}</el-descriptions-item>
+        <!-- 适用单位 -->
+        <el-descriptions-item :label="$l('适用单位')">{{
+          detail.usedUnits | usedUnitsFilter
+        }}</el-descriptions-item>
+        <!-- 匹配优先级 -->
+        <el-descriptions-item :label="$l('匹配优先级')">{{
+          detail.matchingPriority ?? "--"
+        }}</el-descriptions-item>
+        <el-descriptions-item :label="$l('是否自动确认')">{{
+          detail.isAutoConfirm | isAutoConfirmFilter
+        }}</el-descriptions-item>
+        <el-descriptions-item :label="$l('合并频次')">日</el-descriptions-item>
+        <el-descriptions-item :label="$l('生效时间')">{{
+          detail.updateTime || "--"
+        }}</el-descriptions-item>
+        <el-descriptions-item :label="$l('操作人')">{{
+          detail.updator || "--"
+        }}</el-descriptions-item>
+        <el-descriptions-item :label="$l('合并维度')">
+          <el-checkbox-group v-model="detail.dimensionsMergingList" disabled>
+            <el-checkbox
+              :label="item.fieldCode"
+              v-for="item in dimensionsList"
+              :key="item.fieldCode"
+              >{{ item.fieldName }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-descriptions-item>
+      </n20-descriptions>
+    </n20-expandable-pane>
+    <n20-secondary-tab :init.sync="activeName" :data="list" @click="clickTab" />
+    <div :class="{ 'm-l-32': activeValue == 'ConditionGroup' }">
+      <keep-alive>
+        <component
+          disabled
+          :is="activeValue"
+          :DetailFormData="detail"
+          :options="options"
+          :localNode="detail.matchingHierarchy"
+          :filedList="dimensionsList"
+        ></component>
+      </keep-alive>
+    </div>
+  </n20-page>
+</template>
+
+<script>
+import NstcAutoFillDetail from "../../AutoFillDetail/src/main.vue";
+import { $l } from "n20-common-lib/src/utils/i18n";
+import { axios, dayjs } from "n20-common-lib";
+export default {
+  name: "NstcMergeAutoFillDetail",
+  extends: NstcAutoFillDetail,
+  data() {
+    return {
+      dimensionsList: [],
+      options: [],
+      dayjs,
+      tableData: [],
+      list: [
+        {
+          name: "匹配规则",
+          value: "ConditionGroup",
+        },
+        { name: "补填信息", value: "FillDetail" },
+      ],
+      activeName: "匹配规则",
+      activeValue: "ConditionGroup",
+      detail: {
+        matchingFillDimensions: [],
+        matchingFillCommons: [],
+        matchingHierarchy: {},
+      },
+      filedList: [],
+    };
+  },
+  filters: {
+    usedBanksFilter(val) {
+      if (!val) return "--";
+      let temp = val.map((item) => item.bankName);
+      if (temp.length == 0) return "--";
+      return temp.join(",");
+    },
+    refillBasisFilter(val) {
+      if (val == "1") {
+        return $l("流水要素");
+      } else if (val == "2") {
+        return $l("关联对私批量指令");
+      } else {
+        return "--";
+      }
+    },
+  },
+  async created() {
+    this.queryDatasetList();
+    this.getDetail();
+    this.init();
+  },
+  mounted() {},
+  methods: {
+    async init() {
+      let res = await axios.get(
+        `/api/aims/record/record-matching/1.0/matching-field-setting/3/2`,
+        {
+          usedAccountType: "THIRD_ACCOUNT",
+        },
+      );
+      //  matchingSetting(3, 2, "THIRD_ACCOUNT");
+      this.dimensionsList = (res.data || []).map((item) => {
+        return {
+          ...item,
+          disabled: ["unitName", "currencyName"].includes(item.fieldCode),
+        };
+      });
+    },
+    async handleOrder(val = 0) {},
+  },
+};
+</script>

package/packages/MergeAutoFill/merge/mergeFillList.vue

@@ -0,0 +1,94 @@
+<script>
+import NstcAutoFillList from "../../AutoFillList/src/main.vue";
+
+export default {
+  name: "NstcMergeAutoFillList",
+  extends: NstcAutoFillList,
+  async mounted() {
+    await this.$nextTick();
+    this.filterList = this.fList;
+    this.tableHeader = this.hList;
+    this.queryData();
+  },
+  props: {
+    // 列表类型
+    type: {
+      type: String,
+      default: "single",
+    },
+    // 1:收入  2: 支出
+    settingSource: {
+      type: [Number, String],
+      default: "2",
+    },
+    test: {
+      type: Boolean,
+      default: false,
+    },
+    pageRelaNo: {
+      type: Object,
+      default: () => {
+        return {
+          add: null, //新增
+          delete: null, //删除
+          detection: null, //检测
+          import: null, //导入
+          export: null, //导出
+          edit: null, //编辑
+          copy: null, //复制
+        };
+      },
+    },
+    fList: {
+      type: Array,
+      default: () => [],
+    },
+    hList: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  methods: {
+    editFn(row) {
+      this.$router.push({
+        path: "/editMergeRules",
+        query: {
+          matchingId: row.matchingId,
+          type: "edit",
+        },
+      });
+    },
+    copyFn(row) {
+      this.$router.push({
+        path: "/AddMergeRules",
+        query: {
+          matchingId: row.matchingId,
+          type: "copy",
+        },
+      });
+    },
+    handleClick(row) {
+      this.$router.push({
+        path: "/merageRulesDetail",
+        query: { id: row.matchingId },
+      });
+    },
+    goAutoMerge() {
+      return this.$router.push({
+        path: "/merageHistoryRules",
+        query: {
+          type: this.type,
+        },
+      });
+    },
+    handleAdd() {
+      return this.$router.push({
+        path: "/AddMergeRules",
+        query: {
+          type: this.type,
+        },
+      });
+    },
+  },
+};
+</script>

package/packages/Trade/src/components/all/index.vue

@@ -572,7 +572,7 @@ export default {
       });
     },
     setChange(list) {
-      const index = list.findIndex((res) => res.isNew && !res.children);
+      const index = list.findIndex((res) => !res.children);
       if (index !== -1) return this.$message.warning(`新增字段必须包含子级！`);
       let dto = {
         approvalType: "6",