gcs-ui-lib 1.2.35 → 1.2.36

package/package.json

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

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

@@ -19,8 +19,9 @@
 </template>
 
 <script>
-import { getCashflow, getPaymentCategory, getRecUnit } from "@/api/common";
-import { SelectTree } from "n20-common-lib";
+import {getCashflow, getPaymentCategory, getRecUnit} from "@/api/common";
+import {SelectTree} from "n20-common-lib";
+
 export default {
   props: {
     value: {
@@ -197,10 +198,34 @@ export default {
       }
       let res = await this.Api(params);
       res = this.tranData(res);
-      this.type == "cashflow" && this.handleData(res);
-      this.treeData = 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());
+    },
     tranData(res) {
       const eachItem = (parent, list) => {
         list.forEach((item) => {