gcs-ui-lib 1.2.37 → 1.2.38

package/package.json

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

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

@@ -524,7 +524,7 @@ const AutoFillListHeader = [
     align: "center",
     width: "120",
     formatter: ({ row }) => {
-      return row.isAutoConfirm ? "是" : "否";
+      return row.isAutoConfirm ?  $l("是") : $l("否");
     },
   },
   {

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

@@ -188,7 +188,7 @@ export default {
       } else if (this.type == "paymentCategory") {
         params = {
           activeFlag: 1,
-          direction:  this.settingSource == '1' ? 1 : 0,
+          directionList:  [this.settingSource == '1' ? 1 : 0, 2].join(','),
           resultType: 2,
         };
       } else {
@@ -198,33 +198,8 @@ export default {
       }
       let res = await this.Api(params);
       res = this.tranData(res);
-      if (this.type === "paymentCategory"){
-        const res1 = await getPaymentCategory({ ...params, direction: "2" })
-        this.treeData = this.mergeTree(res, res1);
-      } else {
-        this.type == "cashflow" && this.handleData(res);
-        this.treeData = res;
-      }
-    },
-
-    // 递归合并两棵款项类别树（按paymentCategoryNo去重）
-    mergeTree(arr1, arr2) {
-      const map = new Map();
-      arr1?.forEach((item) => {
-        map.set(item.paymentCategoryNo, item);
-      });
-      arr2?.forEach((item) => {
-        if (map.has(item.paymentCategoryNo)) {
-          const existing = map.get(item.paymentCategoryNo);
-          existing.children = this.mergeTree(
-              existing.children,
-              item.children
-          );
-        } else {
-          map.set(item.paymentCategoryNo, item);
-        }
-      });
-      return Array.from(map.values());
+      this.type == "cashflow" && this.handleData(res);
+      this.treeData = res;
     },
     tranData(res) {
       const eachItem = (parent, list) => {