gcs-ui-lib 1.2.14 → 1.2.16

package/package.json

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

package/packages/AutoFillList/src/main.vue

@@ -235,6 +235,7 @@ import {
 } from "@/api/setting.js";
 import { AutoFillListHeader, AutoFillListFilter } from "./components/config";
 import downloadBlob from "n20-common-lib/src/utils/downloadBlob.js";
+import n20, { linkPush } from "n20-common-lib";
 import {
   Pagination,
   AdvancedFilter,
@@ -355,17 +356,14 @@ export default {
   },
   methods: {
     handleClick(row) {
-      this.$router.push({
-        path: "/RulesDetail",
-        query: { id: row.matchingId, fillType: row.usedAccountType },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/RulesDetail`, {
+        id: row.matchingId,
+        fillType: row.usedAccountType,
       });
     },
     handleAdd() {
-      this.$router.push({
-        path: "/AddRules",
-        query: {
-          title: this.$l("新增补填规则"),
-        },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/AddRules`, {
+        title: this.$l("新增补填规则"),
       });
     },
     viewsMulti(val) {
@@ -373,9 +371,7 @@ export default {
       return "--";
     },
     detection() {
-      this.$router.push({
-        path: "/checkRules",
-      });
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/checkRules`); 
     },
     async paginationChange(val) {
       this.pagination = val;
@@ -392,34 +388,25 @@ export default {
       }
     },
     editFn(row) {
-      this.$router.push({
-        path: "/editeRules",
-        query: {
-          matchingId: row.matchingId,
-          type: "edit",
-          fillType: row.usedAccountType,
-          title: this.$l("修改补填规则"),
-        },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/editeRules`, {
+        matchingId: row.matchingId,
+        type: "edit",
+        fillType: row.usedAccountType,
+        title: this.$l("修改补填规则"),
       });
     },
     copyFn(row) {
-      this.$router.push({
-        path: "/AddRules",
-        query: {
-          matchingId: row.matchingId,
-          type: "copy",
-          fillType: row.usedAccountType,
-          title: this.$l("复制补填规则"),
-        },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/AddRules`, {
+        matchingId: row.matchingId,
+        type: "copy",
+        fillType: row.usedAccountType,
+        title: this.$l("复制补填规则"),
       });
     },
     goAutoMerge(row) {
-      this.$router.push({
-        path: "/historyRules",
-        query: {
-          settingSource: this.settingSource,
-          fillType: row.usedAccountType,
-        },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/historyRules`, {
+        settingSource: this.settingSource,
+        fillType: row.usedAccountType,
       });
     },
     // 后端导出
@@ -462,21 +449,21 @@ export default {
       this.fillField = await matchingSetting(
         2,
         this.settingSource,
-        this.type == "merageFill" ? "THIRD_ACCOUNT" : "BANK_ACCOUNT",
+        this.type == "merageFill" ? "THIRD_ACCOUNT" : "BANK_ACCOUNT"
       );
       this.fillField = this.fillField.filter(
-        (item) => !item.fieldCode.includes("Extend"),
+        (item) => !item.fieldCode.includes("Extend")
       );
       //1:收入  2: 支出
       if (this.settingSource == "2") {
         this.fillField = this.fillField.filter(
-          (item) => item.fieldCode != "paymentCategory",
+          (item) => item.fieldCode != "paymentCategory"
         );
       }
       // 收款排除付款类型
       if (this.settingSource == "1") {
         this.fillField = this.fillField.filter(
-          (item) => !["paymentTypeNo", "fundsUseCode"].includes(item.fieldCode),
+          (item) => !["paymentTypeNo", "fundsUseCode"].includes(item.fieldCode)
         );
       }
       for (let i of this.fillField) {

package/packages/AutoFillRuleHistory/src/main.vue

@@ -154,13 +154,11 @@ import {
   TablePro as CLTablePro,
   PageHeader as ClPageHeader,
 } from "n20-common-lib";
-import {
-  AutoFillListFilter,
-  AutoFillListHeader,
-} from "./components/config";
+import { AutoFillListFilter, AutoFillListHeader } from "./components/config";
 import { matchingHisList, matchingSetting } from "@/api/setting";
 import downloadBlob from "n20-common-lib/src/utils/downloadBlob";
 import { deepClone } from "@/utils/index";
+import n20, { linkPush } from "n20-common-lib";
 export default {
   name: "NstcAutoFillRuleHistory",
   components: {
@@ -252,7 +250,7 @@ export default {
       tableHeader: deepClone(AutoFillListHeader),
       fillCommonConditionList: [],
       orders: { action: "DESC", key: "updateTime" },
-      filterKey:0,
+      filterKey: 0,
     };
   },
 
@@ -262,9 +260,9 @@ export default {
   },
   methods: {
     handleClick(row) {
-      this.$router.push({
-        path: "/RulesDetailHiId",
-        query: { id: row.matchingIdHi, fillType: row.usedAccountType },
+      linkPush(`/${this.settingSource == 2?'payment':'payee'}/RulesDetailHiId`, {
+        id: row.matchingIdHi,
+        fillType: row.usedAccountType,
       });
     },
     clearSearch() {
@@ -302,7 +300,7 @@ export default {
       let res = await this.$axios.post(
         "/api/aims/record/record-matching/1.0/history/export",
         params,
-        { responseType: "blob" },
+        { responseType: "blob" }
       );
       let t = dayjs().format("YYYYMMDD");
       let fn = this.$l("历史规则查询") + "-" + t + "." + type;
@@ -315,21 +313,21 @@ export default {
       this.fillField = await matchingSetting(
         2,
         this.settingSource,
-        this.type == "merageFill" ? "THIRD_ACCOUNT" : "BANK_ACCOUNT",
+        this.type == "merageFill" ? "THIRD_ACCOUNT" : "BANK_ACCOUNT"
       );
       this.fillField = this.fillField.filter(
-        (item) => !item.fieldCode.includes("Extend"),
+        (item) => !item.fieldCode.includes("Extend")
       );
       //1:收入  2: 支出
       if (this.settingSource == "2") {
         this.fillField = this.fillField.filter(
-          (item) => item.fieldCode != "paymentCategory",
+          (item) => item.fieldCode != "paymentCategory"
         );
       }
       // 收款排除付款类型
       if (this.settingSource == "1") {
         this.fillField = this.fillField.filter(
-          (item) => item.fieldCode != "paymentTypeNo",
+          (item) => item.fieldCode != "paymentTypeNo"
         );
       }
       for (let i of this.fillField) {
@@ -351,7 +349,7 @@ export default {
           });
         }
       }
-      this.filterKey += 1
+      this.filterKey += 1;
     },
     refresh() {
       this.pagination.current = 1;

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

@@ -385,6 +385,7 @@ export default {
           prop: "amount",
           minWidth: "190",
           align: "right",
+          sortable: true,
           formatter: "formatAmount", // 金额格式化
           isDefault: true,
         },

package/packages/Trade/src/components/dynamicColumnMixin.js

@@ -1,69 +1,84 @@
-import { axios } from 'n20-common-lib'
+import { axios } from "n20-common-lib";
 
 export default {
   data() {
     return {
-      eyeView: false
-    }
+      eyeView: false,
+    };
   },
   methods: {
     // 排序
-    sortMethod({ data, column, property, order }) {
+    sortMethod({ data, sortList }) {
+      //兼容预算的高版本
+      if (!sortList || sortList.length === 0) return;
+      let { field, order } = sortList[0];
       data.sort((a, b) => {
         // 处理字段为空的情况，确保空值始终排在最后
-        const aValue = a[property]
-        const bValue = b[property]
+        const aValue = a[field];
+        const bValue = b[field];
 
         // 统一比较逻辑
         const compare = (v1, v2) => {
-          if (typeof v1 === 'string' && typeof v2 === 'string') {
-            return v1.localeCompare(v2)
+          if (typeof v1 === "string" && typeof v2 === "string") {
+            return v1.localeCompare(v2);
           } else {
-            return v1 - v2
+            return v1 - v2;
           }
-        }
+        };
         // 处理空值，确保空值始终排在最后
-        if (aValue === 0 || aValue === null) return order === 'asc' ? 1 : -1
-        if (bValue === 0 || bValue === null) return order === 'asc' ? -1 : 1
+        if (aValue === 0 || aValue === null) return order === "asc" ? 1 : -1;
+        if (bValue === 0 || bValue === null) return order === "asc" ? -1 : 1;
         // 根据排序顺序返回结果
-        return order === 'desc' ? compare(bValue, aValue) : compare(aValue, bValue)
-      })
+        return order === "desc"
+          ? compare(bValue, aValue)
+          : compare(aValue, bValue);
+      });
     },
     getDynamicColumn(typeCode = undefined, approvalType) {
-      axios.get(`/bems/activiti/actNsSortColumn/querySortColumn/${typeCode}/${approvalType}`).then(({ data }) => {
-        this.checkColumns =
-          data && data.sortColumn && data.sortColumn.length > 0 ? JSON.parse(data.sortColumn) : this.originColumn
-      })
+      axios
+        .get(
+          `/bems/activiti/actNsSortColumn/querySortColumn/${typeCode}/${approvalType}`
+        )
+        .then(({ data }) => {
+          this.checkColumns =
+            data && data.sortColumn && data.sortColumn.length > 0
+              ? JSON.parse(data.sortColumn)
+              : this.originColumn;
+        });
     },
     saveDynamicColumn(data) {
       axios.post(`/bems/activiti/actNsSortColumn/saveOrUpDateColumn`, data, {
-        noMsg: true
-      })
-      this.dialogVisible = false
+        noMsg: true,
+      });
+      this.dialogVisible = false;
     },
     /**
      * 查看业务状态
      */
     async seeBussStatus() {
       if (!this.eyeView) {
-        this.eyeView = true
-        let dto = (this.tableDate||[]).map((res) => {
+        this.eyeView = true;
+        let dto = (this.tableDate || []).map((res) => {
           return {
             businessId: res.businessId,
-            typeCode: res.typeCode
-          }
-        })
+            typeCode: res.typeCode,
+          };
+        });
         let dtos = {
-          dtos: dto
-        }
-        const { data, code } = await this.$axios.post(`/api/settlement-order/api/position/order/work/flow`, dtos)
+          dtos: dto,
+        };
+        const { data, code } = await this.$axios.post(
+          `/api/settlement-order/api/position/order/work/flow`,
+          dtos
+        );
         if (code === 200) {
-          this.tableDate = (this.tableDate||[]).map((res) => {
-            res[`${res.businessId}${res.typeCode}`] = data[`${res.businessId}${res.typeCode}`]
-            return res
-          })
+          this.tableDate = (this.tableDate || []).map((res) => {
+            res[`${res.businessId}${res.typeCode}`] =
+              data[`${res.businessId}${res.typeCode}`];
+            return res;
+          });
         }
       }
-    }
-  }
-}
+    },
+  },
+};

package/src/App.vue

@@ -7,7 +7,7 @@
       <el-container>
         <el-header>组件演示</el-header>
         <el-main>
-          <router-view />
+          <router-view style="height: calc(100% - 60px);"/>
         </el-main>
       </el-container>
     </el-container>