gcs-ui-lib 1.2.2 → 1.2.3

package/packages/AutoFillRuleHistory/src/main.vue

@@ -1,21 +1,26 @@
 <template>
   <ClPage :style="{ height: test ? '100%' : '' }">
     <div slot="header" ref="formWrap">
-      <div class="flex-box flex-r">
+      <cl-page-header @back="$goBackCommon" content="历史规则查询">
+      </cl-page-header>
+      <div
+        class="flex-box flex-r"
+        style="position: absolute; top: 2px; right: 16px"
+      >
         <el-button
-            icon="n20-icon-shuaxin"
-            plain
-            onlyicon
-            size="mini"
-            @click="refresh"
+          icon="n20-icon-shuaxin"
+          plain
+          onlyicon
+          size="mini"
+          @click="refresh"
         />
         <el-button
-            icon="n20-icon-iconfontshaixuan "
-            plain
-            onlyicon
-            size="mini"
-            class="m-l-s"
-            @click="multiple = !multiple"
+          icon="n20-icon-iconfontshaixuan "
+          plain
+          onlyicon
+          size="mini"
+          class="m-l-s"
+          @click="multiple = !multiple"
         />
         <el-dropdown trigger="click" class="m-l-s" @command="exportFn">
           <span class="el-dropdown-link">
@@ -24,94 +29,84 @@
             ></el-button>
           </span>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="xls">{{
-                $l(".xls格式")
-              }}
+            <el-dropdown-item command="xls"
+              >{{ $l(".xls格式") }}
             </el-dropdown-item>
-            <el-dropdown-item command="xlsx">{{
-                $l(".xlsx格式")
-              }}
+            <el-dropdown-item command="xlsx"
+              >{{ $l(".xlsx格式") }}
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
       <ClAdvancedFilter
-          :visible.sync="multiple"
-          :filterId="`RulesManage-payment-filter-rules-${settingSource}432-rf3231`"
-          :model="formData"
-          onlyKey="id"
-          :filter-list="filterList"
-          @search="refresh"
-          @enter="refresh"
-          @clear="clearSearch"
+        :visible.sync="multiple"
+        :filterId="`RulesManage-payment-filter-rules-${settingSource}432-rf3231`"
+        :model="formData"
+        onlyKey="id"
+        :filter-list="filterList"
+        @search="refresh"
+        @enter="refresh"
+        @clear="clearSearch"
       />
     </div>
     <div style="flex: 1; position: relative; height: 100%">
       <div style="position: absolute; width: 100%; height: 100%">
         <CLTablePro
-            ref="vTable"
-            :loading="loading"
-            :data="tableData"
-            :columns="tableHeader"
-            :height="'100%'"
-            :clearSelect="false"
-            auto-resize
-            :rowConfig="{
-              keyField: 'md5Code'
-            }"
-            :checkboxConfig="{
-              reserve: true,
-            }"
-            :key="`table-pro-${fillField.length}`"
-            @selection-change-method="handleSelectionChange"
-            @sort-change-method="sortChange"
+          ref="vTable"
+          :loading="loading"
+          :data="tableData"
+          :columns="tableHeader"
+          :height="'100%'"
+          :clearSelect="false"
+          auto-resize
+          :rowConfig="{
+            keyField: 'md5Code',
+          }"
+          :checkboxConfig="{
+            reserve: true,
+          }"
+          :key="`table-pro-${fillField.length}`"
+          @selection-change-method="handleSelectionChange"
+          @sort-change-method="sortChange"
         >
           <vxe-column
-              slot="usedUnit"
-              slot-scope="{ column }"
-              v-bind="column"
-              :field="column.prop"
-              :title="column.label"
+            slot="usedUnit"
+            slot-scope="{ column }"
+            v-bind="column"
+            :field="column.prop"
+            :title="column.label"
           >
             <template slot-scope="{ row }">
               <div v-html="row.usedUnit || '--'" :title="row.usedUnits"></div>
             </template>
           </vxe-column>
           <vxe-column
-              slot="matchingId"
-              slot-scope="{ column }"
-              v-bind="column"
-              :field="column.prop"
-              :title="column.label"
+            slot="matchingId"
+            slot-scope="{ column }"
+            v-bind="column"
+            :field="column.prop"
+            :title="column.label"
           >
             <template slot-scope="{ row }">
-              <el-button
-                  type="text"
-                  @click="
-                  $router.push({
-                    path: '/RulesDetailHiId',
-                    query: { id: row.matchingIdHi },
-                  })
-                "
-              >{{ row.matchingId }}-{{ row.matchingIdHi }}
-              </el-button
-              >
+              <el-button type="text" @click="handleClick(row)"
+                >{{ row.matchingId }}-{{ row.matchingIdHi }}
+              </el-button>
             </template>
           </vxe-column>
           <vxe-colgroup
-              width="220"
-              slot="fillInfo"
-              :title="$l('补填信息')"
-              align="center"
+            width="220"
+            slot="fillInfo"
+            :title="$l('补填信息')"
+            align="center"
           >
             <template v-for="item in fillField">
               <vxe-column
-                  v-if="fillField.length"
-                  :key="item.fieldCode"
-                  :field="item.fieldCode"
-                  :title="item.fieldName"
-                  align="center"
-                  :width="200"
+                v-if="fillField.length"
+                :key="item.fieldCode"
+                :field="item.fieldCode"
+                :title="item.fieldName"
+                align="center"
+                :width="200"
               >
                 <template slot-scope="scope">
                   <div>
@@ -125,23 +120,23 @@
       </div>
     </div>
     <div
-        class="page-footer-shadow flex-box flex-lr flex-v pt-4 pb-4"
-        slot="footer"
+      class="page-footer-shadow flex-box flex-lr flex-v pt-4 pb-4"
+      slot="footer"
     >
       <div class="flex-box flex-v">
         <StatisItem
-            :type="$l('已选合计')"
-            :list="[{ label: $l('笔数'), value: selectRows.length }]"
+          :type="$l('已选合计')"
+          :list="[{ label: $l('笔数'), value: selectRows.length }]"
         />
         <StatisItem
-            :type="$l('全部合计')"
-            :list="[{ label: $l('笔数'), value: pagination.total }]"
+          :type="$l('全部合计')"
+          :list="[{ label: $l('笔数'), value: pagination.total }]"
         />
       </div>
       <ClPagination
-          :page-obj="pagination"
-          :page-key="{ no: 'current', size: 'size', total: 'total' }"
-          @change="queryData"
+        :page-obj="pagination"
+        :page-key="{ no: 'current', size: 'size', total: 'total' }"
+        @change="queryData"
       />
     </div>
   </ClPage>
@@ -150,20 +145,38 @@
 <script>
 import {
   StatisItem,
-  AdvancedFilter as ClAdvancedFilter, dayjs,
+  AdvancedFilter as ClAdvancedFilter,
+  dayjs,
   Dialog as CLDialog,
   Page as ClPage,
-  Pagination as ClPagination, TablePro as CLTablePro
+  Pagination as ClPagination,
+  TablePro as CLTablePro,
+  PageHeader as ClPageHeader,
 } from "n20-common-lib";
-import {AutoFillListFilter, AutoFillListHeader} from "^/AutoFillList/src/components/config";
-import {matchingHisList, matchingSetting} from "@/api/setting";
+import {
+  AutoFillListFilter,
+  AutoFillListHeader,
+} from "^/AutoFillList/src/components/config";
+import { matchingHisList, matchingSetting } from "@/api/setting";
 import downloadBlob from "n20-common-lib/src/utils/downloadBlob";
 
 export default {
   name: "NstcAutoFillRuleHistory",
-  components: {CLTablePro, ClPagination, CLDialog, ClPage, ClAdvancedFilter, StatisItem},
+  components: {
+    CLTablePro,
+    ClPagination,
+    CLDialog,
+    ClPage,
+    ClAdvancedFilter,
+    StatisItem,
+    ClPageHeader,
+  },
 
   props: {
+    type: {
+      type: String,
+      default: "single",
+    },
     // 1:收入  2: 支出
     settingSource: {
       type: [Number, String],
@@ -185,6 +198,13 @@ export default {
   },
   data(vm) {
     return {
+      list: [
+        {
+          label: vm.$l("历史规则查询"),
+          value: "all",
+        },
+      ],
+      name: vm.$l("历史规则查询"),
       Dvisible: false,
       pagination: {
         size: 50,
@@ -227,40 +247,26 @@ export default {
       selectRowIds: [],
       selectRows: [],
       fillField: [], // 补填动态字段
-      filterList: AutoFillListFilter,
+      filterList: [],
       tableHeader: [],
       fillCommonConditionList: [],
-      orders: {action: "DESC", key: "updateTime"},
+      orders: { action: "DESC", key: "updateTime" },
     };
   },
 
   async mounted() {
-    this.tableHeader = [...AutoFillListHeader]
-    // this.tableHeader.splice(10, 1,
-    //     {
-    //       label: "生效时间",
-    //       prop: "effectiveTime",
-    //       align: "center",
-    //       width: "180",
-    //       sortable: true,
-    //       "show-overflow-tooltip": true,
-    //     },
-    //     {
-    //       label: "失效时间",
-    //       prop: "updateTime",
-    //       align: "center",
-    //       width: "180",
-    //       sortable: true,
-    //       "show-overflow-tooltip": true,
-    //     },
-    //     );
-    // console.log(this.tableHeader)
-    await this.matchingSetting();
-  },
-  activated() {
+    this.tableHeader = [...AutoFillListHeader];
+    this.filterList = [...AutoFillListFilter];
     this.queryData();
+    await this.matchingSetting();
   },
   methods: {
+    handleClick(row) {
+      this.$router.push({
+        path: "/RulesDetailHiId",
+        query: { id: row.matchingIdHi, fillType: row.usedAccountType },
+      });
+    },
     clearSearch() {
       for (const key in this.formData) {
         const el = this.formData[key];
@@ -290,7 +296,14 @@ export default {
         };
       }
       params.exportType = type;
-      let res = await this.$axios.post('/api/aims/record/record-matching/1.0/history/export', params, {responseType: "blob"});
+      if (this.type && this.type == "merageFill") {
+        params.refillBasis = "3";
+      }
+      let res = await this.$axios.post(
+        "/api/aims/record/record-matching/1.0/history/export",
+        params,
+        { responseType: "blob" },
+      );
       let t = dayjs().format("YYYYMMDD");
       let fn = this.$l("历史规则查询") + "-" + t + "." + type;
       downloadBlob(res, fn);
@@ -299,17 +312,25 @@ export default {
     // 获取动态匹配/补填字段
     async matchingSetting() {
       this.fillCommonConditionList = [];
-      this.fillField = await matchingSetting(2,this.settingSource);
+      this.fillField = await matchingSetting(
+        2,
+        this.settingSource,
+        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');
+      if (this.settingSource == "2") {
+        this.fillField = this.fillField.filter(
+          (item) => item.fieldCode != "paymentCategory",
+        );
       }
       // 收款排除付款类型
-      if (this.settingSource == '1') {
-        this.fillField = this.fillField.filter((item) => item.fieldCode != 'paymentTypeNo');
+      if (this.settingSource == "1") {
+        this.fillField = this.fillField.filter(
+          (item) => item.fieldCode != "paymentTypeNo",
+        );
       }
       for (let i of this.fillField) {
         this.fillCommonConditionList.push({
@@ -343,7 +364,7 @@ export default {
     },
     sortChange(data) {
       if (!data.length) {
-        this.orders = {action: "DESC", key: "updateTime"};
+        this.orders = { action: "DESC", key: "updateTime" };
         return;
       }
       let obj = data[0] || {};
@@ -354,7 +375,7 @@ export default {
       this.queryData();
     },
     async queryData() {
-      let map = {...this.formData};
+      let map = { ...this.formData };
       for (let i of this.fillCommonConditionList) {
         if (map[i.fillFieldCode]) {
           i.fillValueLike = map[i.fillFieldCode];
@@ -373,8 +394,11 @@ export default {
         ...map,
       };
       try {
-        this.loading = true
-        const {records, total} = await matchingHisList(params);
+        if (this.type && this.type == "merageFill") {
+          params.refillBasis = "3";
+        }
+        this.loading = true;
+        const { records, total } = await matchingHisList(params);
         this.tableData = (records || []).map((item) => {
           if (typeof item.usedUnit == "string") {
             item.usedUnit = JSON.parse(item.usedUnit);
@@ -382,31 +406,32 @@ export default {
           }
           if (item.usedUnit?.length > 5) {
             item.usedUnit = item.usedUnit.slice(0, 5);
-            item.usedUnit.push({unitName: "....."});
+            item.usedUnit.push({ unitName: "....." });
           }
           for (let i of item.matchingFillCommons) {
             let fv = undefined;
             try {
               fv = JSON.parse(i.fillValue);
-            } catch {
-            }
+            } catch {}
             item[i.fillFieldCode] = fv?.budgetAccountName || fv?.name;
           }
-          console.log(window.btoa(`${item.matchingId}${item.updateTime}`))
+          console.log(window.btoa(`${item.matchingId}${item.updateTime}`));
           return {
             ...item,
             md5Code: window.btoa(`${item.matchingId}${item.updateTime}`),
             usedUnits: item.usedUnits?.map((item) => item.unitName)?.join("\n"),
-            usedUnit: item.usedUnit?.map((item) => item.unitName)?.join("<br/>"),
+            usedUnit: item.usedUnit
+              ?.map((item) => item.unitName)
+              ?.join("<br/>"),
           };
         });
         this.pagination.total = total || 0;
       } catch (err) {
-        console.error(err)
-        this.tableData = []
-        this.pagination.total = 0
+        console.error(err);
+        this.tableData = [];
+        this.pagination.total = 0;
       } finally {
-        this.loading = false
+        this.loading = false;
       }
     },
     handleSelectionChange(rows) {
@@ -418,5 +443,5 @@ export default {
       this.selectRows = rows;
     },
   },
-}
+};
 </script>

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

@@ -35,7 +35,10 @@
       class="auto-rule"
       :key="item.key + '-auto-rule'"
     >
-      <div class="auto-group-item" :class="{'auto-group-item-disabled':disabled}">
+      <div
+        class="auto-group-item"
+        :class="{ 'auto-group-item-disabled': disabled }"
+      >
         <label class="auto-group-item-label">匹配字段</label>
         <el-select
           v-model="item.matchingFieldCode"
@@ -58,7 +61,7 @@
         class="auto-group-item"
         :class="{
           'auto-required': localNode.vaild && !item.matchingOperation,
-          'auto-group-item-disabled':disabled
+          'auto-group-item-disabled': disabled,
         }"
       >
         <label class="auto-group-item-label">匹配关系</label>
@@ -80,10 +83,9 @@
       </div>
       <div
         class="auto-group-item"
-        v-if="isNew"
         :class="{
           'auto-required': localNode.vaild && !item.matchingValueType,
-          'auto-group-item-disabled':disabled
+          'auto-group-item-disabled': disabled,
         }"
       >
         <label class="auto-group-item-label">匹配值</label>
@@ -106,7 +108,7 @@
         class="auto-group-item item-content"
         :class="{
           'auto-required': autoValus(item),
-          'auto-group-item-disabled':disabled
+          'auto-group-item-disabled': disabled,
         }"
       >
         <label class="auto-group-item-label">匹配内容</label>
@@ -162,7 +164,6 @@
       <condition-group
         :localNode="child"
         :emptyList="emptyList"
-        :isNew="isNew"
         :options="options"
         :ref="`conditionGroup${idx}`"
         @delete="deleteGrout(idx)"
@@ -215,9 +216,9 @@ const ruleItem = {
 export default {
   name: "ConditionGroup",
   props: {
-    isNew: {
+    NoNeedDefaultValue: {
       type: Boolean,
-      default: true,
+      default: false,
     },
     options: {
       type: Array,
@@ -278,8 +279,8 @@ export default {
     disabledOps() {
       return (val, item) => {
         return (
-          !["EQUALS", "NOT_EQUALS"].includes(item.matchingOperation) &&
-          val == "DYNAMIC"
+            !["EQUALS", "NOT_EQUALS", "CONTAINS", "NOT_CONTAINS"].includes(item.matchingOperation) &&
+            val === "DYNAMIC"
         );
       };
     },
@@ -294,7 +295,7 @@ export default {
   },
   async mounted() {},
   methods: {
-    handChangeValueType(val, item){
+    handChangeValueType(val, item) {
       this.$set(item, "TmValues", []);
       this.$set(item, "mValues", []);
     },
@@ -314,17 +315,22 @@ export default {
       }
     },
     addItem() {
+      let temp = structuredClone(ruleItem);
+      // 新增规则时，若无需默认值，则匹配字段为空
+      if (this.NoNeedDefaultValue) {
+        temp.matchingFieldCode = "";
+      }
       let arr = this.localNode.matchingRules;
       if (Array.isArray(arr)) {
-        this.localNode.matchingRules.push({ ...ruleItem });
+        this.localNode.matchingRules.push({ ...temp });
       } else {
-        this.localNode.matchingRules = [{ ...ruleItem }];
+        this.localNode.matchingRules = [{ ...temp }];
       }
     },
     handChangeOperation(val, item) {
       // if (this.emptyList.includes(val)) {
-        this.$set(item, "mValues", []);
-        this.$set(item, "TmValues", []);
+      this.$set(item, "mValues", []);
+      this.$set(item, "TmValues", []);
       // }
       this.$set(item, "matchingValueType", "FIXED");
       this.$set(item, "key", uuid());
@@ -352,7 +358,14 @@ export default {
       }
     },
     addGroup() {
-      let matchingRules = JSON.parse(JSON.stringify(groupItem));
+      let temp = structuredClone(groupItem);
+      // 新增分组时，若无需默认值，则匹配字段为空
+      if (this.NoNeedDefaultValue) {
+        for (let i of temp) {
+          i.matchingFieldCode = "";
+        }
+      }
+      let matchingRules = JSON.parse(JSON.stringify(temp));
       for (let i of matchingRules) {
         i.key = uuid();
       }
@@ -376,7 +389,7 @@ export default {
       if (!this.textarea)
         return this.$message.warning(this.$l("请输入匹配内容"));
       let temp = this.textarea.split("\n");
-      temp = temp.filter(item=>!!item)
+      temp = temp.filter((item) => !!item);
       this.$set(
         this.localNode.matchingRules[this.currentIndex],
         "mValues",
@@ -395,7 +408,12 @@ export default {
       this.visible = true;
     },
     addRule(idx) {
-      let item = JSON.parse(JSON.stringify(ruleItem));
+      let temp = structuredClone(ruleItem);
+      // 新增规则时，若无需默认值，则匹配字段为空
+      if (this.NoNeedDefaultValue) {
+        temp.matchingFieldCode = "";
+      }
+      let item = JSON.parse(JSON.stringify(temp));
       item.key = uuid();
       this.localNode.matchingRules.splice(idx + 1, 0, { ...item });
     },