gcs-ui-lib 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcs-ui-lib",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "private": false,
   "main": "./lib/gcs-ui-lib.common.js",
   "scripts": {
@@ -98,6 +98,12 @@
     "last 2 versions",
     "not dead"
   ],
+  "files": [
+    "lib",
+    "packages",
+    "src",
+    "types"
+  ],
   "description": "```\r yarn install\r ```",
   "author": "chenzhiliang",
   "license": "ISC"

package/packages/AutoFillDetail/src/components/fillDetail.vue

@@ -73,10 +73,6 @@ export default {
     CLExpandablePane: ExpandablePane,
   },
   props: {
-    isNew: {
-      type: Boolean,
-      default: true,
-    },
     DetailFormData: {
       type: Object,
       default: () => {},
@@ -163,17 +159,6 @@ export default {
     };
   },
   watch: {
-    isNew: {
-      handler(newVal) {
-        if (!newVal) {
-          this.FillFieldHeader = this.FillFieldHeader.filter(
-            (item) => item.prop !== "matchingValueType"
-          );
-        }
-      },
-      deep: true,
-      immediate: true,
-    },
   },
   computed: {
     showGroup() {

package/packages/AutoFillDetail/src/demo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Trade :matching-id="266" :isNew="false"></Trade>
+  <Trade :matching-id="266" ></Trade>
 </template>
 
 <script>

package/packages/AutoFillDetail/src/main.vue

@@ -4,7 +4,7 @@
     <div slot="header" v-if="needHeaderGo">
       <CLPageHeader
         @back="goBackCommon"
-        :content="$l('自动补填规则详情')"
+        :content="$l('补填规则详情')"
       ></CLPageHeader>
     </div>
     <!-- 基本匹配规则 -->
@@ -22,7 +22,7 @@
           detail.matchingRuleName || "--"
         }}</el-descriptions-item>
         <!-- 规则类型 -->
-        <el-descriptions-item :label="$l('规则类型')" v-if="isNew">{{
+        <el-descriptions-item :label="$l('规则类型')">{{
           detail.matchingRuleType == "GENERAL" ? $l("预先补填") : $l("完结补填")
         }}</el-descriptions-item>
         <!-- 适用范围 -->
@@ -41,6 +41,9 @@
         <el-descriptions-item :label="$l('适用业务')">{{
           detail.usedBusiness | usedBusinessFilter
         }}</el-descriptions-item>
+        <el-descriptions-item :label="$l('适用账户')">{{
+          detail.usedAccountType | usedAccountTypeFilter
+        }}</el-descriptions-item>
         <el-descriptions-item :label="$l('是否自动确认')">{{
           detail.isAutoConfirm | isAutoConfirmFilter
         }}</el-descriptions-item>
@@ -60,7 +63,6 @@
           :is="activeValue"
           :DetailFormData="detail"
           :options="options"
-          :isNew="isNew"
           :localNode="detail.matchingHierarchy"
           :filedList="filedList"
         ></component>
@@ -117,9 +119,13 @@ export default {
     FillDetail: () => import("./components/fillDetail.vue"),
   },
   props: {
-    isNew: {
-      type: Boolean,
-      default: true,
+    refillBasis: {
+      type: [String, Number],
+      default: "",
+    },
+    fillType: {
+      type: String,
+      default: "BANK_ACCOUNT",
     },
     needHeaderGo: {
       type: Boolean,
@@ -162,6 +168,8 @@ export default {
     };
   },
   async created() {
+    //合并补填，在重写页面请求，这里不请求
+    if (this.refillBasis == "3") return;
     this.queryDatasetList();
     this.getDetail();
     this.matchingSetting();
@@ -181,6 +189,13 @@ export default {
       };
       return doc[val] || "--";
     },
+    usedAccountTypeFilter(val) {
+      let doc = {
+        BANK_ACCOUNT: $l(`银行账户`),
+        THIRD_ACCOUNT: $l(`三方账户`),
+      };
+      return doc[val] || "--";
+    },
     isAutoConfirmFilter(val) {
       let doc = {
         1: $l(`是`),
@@ -227,7 +242,7 @@ export default {
       this.activeValue = item.value;
     },
     async matchingSetting() {
-      this.filedList = await matchingSetting(1, this.settingSource);
+      this.filedList = await matchingSetting(1, this.settingSource, this.fillType);
     },
     async getDetail() {
       if (!this.matchingId && !this.matchingHiId) return;

package/packages/AutoFillDetection/src/components/HandEntred.vue

@@ -64,57 +64,30 @@
         ></el-option>
       </el-select>
     </el-form-item>
-    <template v-if="IsPayment">
-      <el-form-item :label="$l('对方账号')" prop="opAccountNo">
-        <el-input
-          class="input-w"
-          clearable
-          :placeholder="$l('请输入')"
-          v-model="formInline.opAccountNo"
-        />
-      </el-form-item>
-      <el-form-item :label="$l('对方户名')" prop="opAccountName">
-        <el-input
-          class="input-w"
-          clearable
-          :placeholder="$l('请输入')"
-          v-model="formInline.opAccountName"
-        />
-      </el-form-item>
-      <el-form-item :label="$l('对方开户行名')" prop="opBranchBankName">
-        <el-input
-          class="input-w"
-          clearable
-          :placeholder="$l('请输入')"
-          v-model="formInline.opBranchBankName"
-        />
-      </el-form-item>
-    </template>
-    <template v-else>
-      <el-form-item :label="$l('对方账号')" prop="opAccountNo">
-        <el-input
-          class="input-w"
-          :placeholder="$l('请输入')"
-          v-model="formInline.opAccountNo"
-        />
-      </el-form-item>
-      <el-form-item :label="$l('对方户名')" prop="opAccountName">
-        <el-input
-          class="input-w"
-          clearable
-          :placeholder="$l('请输入')"
-          v-model="formInline.opAccountName"
-        />
-      </el-form-item>
-      <el-form-item :label="$l('对方开户行名')" prop="opBranchBankName">
-        <el-input
-          class="input-w"
-          clearable
-          :placeholder="$l('请输入')"
-          v-model="formInline.opBranchBankName"
-        />
-      </el-form-item>
-    </template>
+    <el-form-item :label="$l('对方账号')" prop="opAccountNo">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.opAccountNo"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('对方户名')" prop="opAccountName">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.opAccountName"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('对方开户行名')" prop="opBranchBankName">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.opBranchBankName"
+      />
+    </el-form-item>
     <el-form-item :label="$l('银行流水号')" prop="hostId">
       <el-input
         class="input-w"

package/packages/AutoFillDetection/src/components/HandEntredThird.vue

@@ -0,0 +1,225 @@
+<template>
+  <el-form
+    class="label-width-8em pt-8"
+    label-width="8em"
+    ref="formRef"
+    :model="formInline"
+  >
+    <el-form-item
+      :label="$l('单位名称')"
+      prop="unitNo"
+      :rules="[
+        { required: true, message: $l('请选择单位名称'), trigger: 'change' },
+      ]"
+    >
+      <SelectTreeUnitForm
+        ref="selectTreeUnitForm"
+        v-model="formInline.unitNo"
+        :placeholder="$l('请选择')"
+        :url="'/api/nstc-ptms/1.0/common/fundTree'"
+        :listUrl="'/api/nstc-ptms/1.0/common/fundTree/list'"
+        :moduleNo="'PTMS'"
+        node-key="id"
+        :relaNo="'payment001'"
+        :upDateValue="defaultSelect"
+        @dataChange="handleUnitChange"
+      />
+    </el-form-item>
+    <el-form-item
+      :label="$l('金融机构')"
+      prop="bankNo"
+      :rules="[
+        { required: true, message: $l('请输入金融机构'), trigger: 'change' },
+      ]"
+    >
+      <NstcBank
+        class="input-w"
+        clearable
+        :params="{
+          organizationType: 4,
+        }"
+        v-model="formInline.bankNo"
+        @set-name="(name) => (formInline.bankName = name)"
+      />
+    </el-form-item>
+    <el-form-item
+      :label="$l('账号')"
+      prop="accountNo"
+      :rules="[{ required: true, message: $l('请输入账号'), trigger: 'blur' }]"
+    >
+      <el-input
+        class="input-w"
+        :placeholder="$l('请输入')"
+        v-model="formInline.accountNo"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('币种')" prop="currencyNo">
+      <el-select
+        v-model="formInline.currencyNo"
+        class="input-w"
+        clearable
+        filterable
+        @change="handleCurrencyChange"
+        :placeholder="$l('请选择')"
+      >
+        <el-option
+          v-for="item in currencyList"
+          :key="item.currencyNo"
+          :label="item.currencyName"
+          :value="item.currencyNo"
+        ></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item
+      :label="$l('动账原因')"
+      prop="postScript"
+      :rules="[
+        { required: true, message: $l('请输入动账原因'), trigger: 'blur' },
+      ]"
+    >
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.postScript"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('商户代码')" prop="merchantCode">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.merchantCode"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('商户名称')" prop="merchantName">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.merchantName"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('支付交易号')" prop="paymentTransactionNumber">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.paymentTransactionNumber"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('平台订单号')" prop="platformOrderNumber">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.platformOrderNumber"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('收付渠道')" prop="tradeChannel">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.tradeChannel"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('对方账号')" prop="opAccountNo">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.opAccountNo"
+      />
+    </el-form-item>
+    <el-form-item :label="$l('商品名称')" prop="productName">
+      <el-input
+        class="input-w"
+        clearable
+        :placeholder="$l('请输入')"
+        v-model="formInline.productName"
+      />
+    </el-form-item>
+
+    <el-form-item :label="$l('备注')" prop="remark" class="col-span-24">
+      <el-input
+        type="textarea"
+        rows="3"
+        clearable
+        v-model="formInline.remark"
+        :placeholder="$l('请输入')"
+        maxlength="200"
+        show-word-limit
+      ></el-input>
+    </el-form-item>
+    <el-form-item :label="$l('描述')" prop="description" class="col-span-24">
+      <el-input
+        type="textarea"
+        rows="3"
+        clearable
+        v-model="formInline.description"
+        :placeholder="$l('请输入')"
+        maxlength="200"
+        show-word-limit
+      ></el-input>
+    </el-form-item>
+    <el-button size="mini" type="primary" @click="handleSubmit">
+      {{ $l("自动匹配") }}
+    </el-button>
+  </el-form>
+</template>
+
+<script>
+import { getCurrencyData } from "@/api/common";
+
+export default {
+  props: {
+    settingSource: {
+      type: [Number, String],
+      default: 2,
+    },
+  },
+  computed: {
+    IsPayment() {
+      return this.settingSource == 2;
+    },
+  },
+  components: {
+    SelectTreeUnitForm: () =>
+      import("../../../SelectTreeUnitForm/src/main.vue"),
+    NstcBank: () => import("../../../Bank/src/main.vue"),
+  },
+  data() {
+    return {
+      defaultSelect: [],
+      formInline: {},
+      currencyList: [],
+    };
+  },
+  mounted() {
+    this.getCurrencyList();
+  },
+  methods: {
+    async handleSubmit() {
+      this.$refs["formRef"].validate((valid) => {
+        if (valid) {
+          this.$emit("handleSubmit", this.formInline);
+        }
+      });
+    },
+    handleCurrencyChange(val) {
+      const data = this.currencyList.find((item) => item.currencyNo === val);
+      this.formInline["currencyName"] = data["currencyName"];
+    },
+    handleUnitChange(units) {
+      const [unit] = units || [];
+      this.formInline.unitName = unit?.unitName;
+    },
+    getCurrencyList() {
+      getCurrencyData({ isEnable: 1 }, false).then((res) => {
+        this.currencyList = res;
+      });
+    },
+  },
+};
+</script>

package/packages/AutoFillDetection/src/components/RuleHit.vue

@@ -97,6 +97,7 @@ export default {
         query: {
           id: row.matchingId,
           type: "edit",
+          fillType: row.usedAccountType,
         },
       });
     }

package/packages/AutoFillDetection/src/components/THIRD_ACCOUNT.vue

@@ -0,0 +1,200 @@
+<template>
+  <div>
+    <ClAdvancedFilter
+      :visible.sync="multiple"
+      filterId="payment-aauto-fill-rr3-r32r-third-32r-rewr"
+      :model="formInline"
+      onlyKey="id"
+      :filter-list="filterList"
+      @search="handleFilter"
+      @enter="handleFilter"
+      @clear="handleClear"
+    />
+    <ClTablePro
+      ref="xTable"
+      :data="tableData"
+      :columns="TableHeader"
+      :height="320"
+      :loading="loading"
+      :rowConfig="{
+        keyField: 'recordId',
+        isCurrent: true,
+      }"
+      auto-resize
+      @cell-click="handleCellClick"
+      @sort-change-method="handleSortChange"
+    >
+      <vxe-column
+        slot="radio"
+        slot-scope="{ column }"
+        v-bind="column"
+        :field="column.prop"
+        :title="column.label"
+      >
+        <el-radio
+          v-model="selectedId"
+          :label="row.recordId"
+          slot-scope="{ row }"
+          class="auto-fill-radio-class"
+          @change="handleRadioChange(row)"
+        ></el-radio>
+      </vxe-column>
+    </ClTablePro>
+    <div class="flex-box flex-v flex-lr m-t-s pb-4">
+      <el-button size="mini" type="primary" @click="handleSubmit">{{
+        $l("自动匹配")
+      }}</el-button>
+      <div class="flex-box flex-r">
+        <Pagination
+          class="pagination"
+          :page-obj="page"
+          :page-key="{ no: 'current', size: 'size', total: 'total' }"
+          @change="getList"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  Pagination,
+  AdvancedFilter,
+  Page,
+  TablePro,
+  TableProOperateColumn,
+  axios,
+} from "n20-common-lib";
+import { thirdAccountRecordQuery } from "@/api/setting";
+import { third_filterList, third_tableHeader } from "./config.js";
+import { parseTime } from "@/utils";
+
+export default {
+  components: {
+    Pagination,
+    ClAdvancedFilter: AdvancedFilter,
+    Page,
+    ClTablePro: TablePro,
+    ClTableProOperateColumn: TableProOperateColumn,
+  },
+  props: {
+    settingSource: {
+      type: [Number, String],
+      default: 2,
+    },
+  },
+  data() {
+    return {
+      selectRow: null,
+      page: {
+        current: 1,
+        size: 10,
+        total: 0,
+      },
+      selectedId: "",
+      tableData: [],
+      sortParams: null,
+      multiple: true,
+      formInline: {
+        startRecordDate: parseTime(
+          new Date() - 7 * 24 * 60 * 60 * 1000,
+          "{y}-{m}-{d}",
+        ),
+        endRecordDate: parseTime(new Date(), "{y}-{m}-{d}"),
+      },
+      loading: false,
+      TableHeader: [...third_tableHeader],
+      filterList: [...third_filterList],
+    };
+  },
+  computed: {
+    IsPayment() {
+      return this.settingSource == 2;
+    },
+  },
+  mounted() {
+    this.getList();
+    this.getTableTotal()
+  },
+  methods: {
+    handleFilter() {
+      this.$rulesValidateForm("ruleValidate", (valid) => {
+        if (valid) {
+          this.selectedId = null;
+          this.selectRow = null;
+          this.page.current = 1;
+          this.getList();
+          this.getTableTotal()
+          this.$emit("clear");
+        }
+      });
+    },
+    getTableTotal() {
+      const data = this.makeParams();
+      axios
+        .post("/api/aims/1.0/account/third/record/count", data, {loading: false})
+        .then((res) => {
+          this.page.total = res.data;
+        });
+      return this.tableData.length;
+    },
+    handleSubmit() {
+      if (!this.selectRow) return this.$message.error("请选择流水");
+      this.$emit("handleSubmit", this.selectRow);
+    },
+    makeParams() {
+      return {
+        pageNo: this.page.current,
+        pageSize: this.page.size,
+        isInclude: 0,
+        ...this.formInline,
+        recordType: 0,
+        balanceDir: this.IsPayment ? "1" : "2", //1 支出  2收入
+        sort: this.sortParams,
+      };
+    },
+    handleClear() {
+      this.formInline = {};
+    },
+    async getList() {
+      this.loading = true;
+      const data = this.makeParams();
+      axios
+        .post("/api/aims/1.0/account/third/record/query", data, {loading: false})
+        .then((res) => {
+          console.log(res, 8888);
+          this.tableData = res.data.accountRecordViewList;
+          this.loading = false;
+        });
+    },
+    handleCellClick({ row }) {
+      console.log(row);
+      this.selectedId = row.recordId;
+      this.selectRow = { ...row };
+    },
+    handleRadioChange(row) {
+      this.selectRow = this.tableData.find(
+        (item) => item.recordId === this.selectedId,
+      );
+    },
+    handleSortChange(data) {
+      if (data.length) {
+        let obj = data[0] || {};
+        this.sortParams = {
+          key: obj.column,
+          action: !obj.asc ? "DESC" : "ASC",
+        };
+      } else {
+        this.sortParams = null;
+      }
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+::v-deep .auto-fill-radio-class .el-radio__label {
+  display: none;
+}
+</style>