gcs-ui-lib 1.2.39 → 1.2.41

package/package.json

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

package/packages/AutoFillDetection/src/main.vue

@@ -6,7 +6,7 @@
       class="m-b-s"
       :content="$l('补填规则检测')"
     />
-    <el-form class="label-width-8em description-b-s" :label-width="'8em'">
+    <el-form class="label-width-8em description-b-s" :label-width="'14em'">
       <el-form-item :label="$l('数据来源')" prop="description">
         <el-radio-group v-model="searchData.radio" @change="handleRadio">
           <el-radio :label="'SelectEntries'">{{ $l("选择流水") }}</el-radio>

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

@@ -11,7 +11,7 @@
         children: 'children',
         label: nodeName,
         value: nodeKey,
-        disabled: (data) => !Number(data.activeFlag || 0),
+        disabled: 'disabled',
       }"
     >
     </CLSelectTree>
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import {getCashflow, getPaymentCategory, getRecUnit} from "@/api/common";
+import {getPaymentCategory} from "@/api/common";
 import {SelectTree} from "n20-common-lib";
 
 export default {
@@ -65,19 +65,7 @@ export default {
           url: getPaymentCategory,
           nodeKey: "paymentCategoryNo",
           nodeName: "paymentCategoryName",
-        },
-        {
-          type: "cashflow",
-          url: getCashflow,
-          nodeKey: "flowNo",
-          nodeName: "flowName",
-        },
-        {
-          type: "unit",
-          url: getRecUnit,
-          nodeKey: "unitNo",
-          nodeName: "unitName",
-        },
+        }
       ],
     };
   },
@@ -117,9 +105,6 @@ export default {
     },
   },
   computed: {
-    showOptName() {
-      return this.type == "cashflow" ? "idAndName" : this.nodeName;
-    },
     inputValue: {
       get() {
         return this.value;
@@ -131,19 +116,10 @@ export default {
   },
   methods: {
     treeChange(val, obj = {}) {
-      let data = {};
-      if (this.type === "cashflow") {
-        data = {
-          flowNo: obj[this.nodeKey] || "",
-          flowName: obj[this.nodeName] || "",
-        };
-      } else {
-        data = {
-          conProp: obj[this.nodeKey] || "",
-          conPropName: obj[this.nodeName] || "",
-        };
-      }
-      console.log(data, "data");
+      const data = {
+        conProp: obj[this.nodeKey] || "",
+        conPropName: obj[this.nodeName] || "",
+      };
       this.$emit("change", data);
     },
     treeFind(tree, value, type) {
@@ -177,43 +153,16 @@ export default {
     },
     //请求数据
     async getData() {
-      let params = {};
-      if (this.type == "cashflow") {
-        params = {
-          flowDir: this.settingSource == '2' ? "out" : "in",
-          // inputMethod: "INPUT",
-          resultType: 1,
-          showFlag: 1,
-        };
-      } else if (this.type == "paymentCategory") {
-        params = {
-          activeFlag: 1,
-          directionList:  [this.settingSource == '1' ? 1 : 0, 2].join(','),
-          resultType: 2,
-        };
-      } else {
-        params = {
-          resultType: 1,
-        };
-      }
-      let res = await this.Api(params);
-      res = this.tranData(res);
-      this.type == "cashflow" && this.handleData(res);
-      this.treeData = res;
-    },
-    tranData(res) {
-      const eachItem = (parent, list) => {
-        list.forEach((item) => {
-          item["idAndName"] = item[this.nodeKey] + " " + item[this.nodeName];
-          if (item.children && item.children.length) {
-            eachItem(item, item.children);
-          }
-        });
+      const directions = [this.settingSource == '1' ? 1 : 0, 2];
+      const params = {
+        activeFlag: 1,
+        directionList: directions.join(),
+        resultType: 2,
       };
-      if (res) {
-        eachItem(null, res);
-      }
-      return res;
+      const data = await getPaymentCategory(params);
+      this.handlePaymentCategoryDataData(data, directions);
+      console.log(data, 'data')
+      this.treeData = data;
     },
 
     onSelectCashFlowNode(data) {
@@ -221,19 +170,6 @@ export default {
       this.filterText = data[this.nodeName];
       // this.emitlabel(data);
     },
-    onSelectCashFlowNodeOnlyLast(data) {
-      if (
-        data.inputMethod == "INPUT" &&
-        (data.children == null || data.children.length == 0)
-      ) {
-        this.showPopoverFlag = false;
-        this.filterText = data[this.nodeName];
-      } else {
-        return this.$message.warning(
-          "只能选择填报方式为“录入项”，且为最末级的现金流"
-        );
-      }
-    },
     //根据编号回显名称
     findNameByNo(data, value) {
       let newItem = {};
@@ -253,18 +189,11 @@ export default {
       };
     },
     //给每个对象加disabled属性
-    handleData(arr) {
+    handlePaymentCategoryDataData(arr, directions = []) {
       arr?.forEach((it) => {
-        if (
-          it.inputMethod == "INPUT" &&
-          (it.children == null || it.children.length == 0)
-        ) {
-          it.disabled = false;
-        } else {
-          it.disabled = true;
-        }
+        it.disabled = !directions.includes(it.direction);
         if (Array.isArray(it.children) && it.children.length > 0) {
-          this.handleData(it.children);
+          this.handlePaymentCategoryDataData(it.children, directions);
         }
       });
     },