jufubao-admin-library 1.1.61 → 1.1.63

package/library/viewModules/viewStat/router/productStat.js

@@ -6,7 +6,7 @@ const role = roles.productStat;
 
 const productStatRouter = {
   path: '/stat',
-  sort: 95,
+  sort: 99,
   component: Layout,
   name: '商品统计',
   redirect: '/stat/product',

package/library/viewModules/viewStat/router/supplierStat.js

@@ -6,7 +6,7 @@ const role = roles.supplierStat;
 
 const supplierStatRouter = {
   path: '/stat',
-  sort: 95,
+  sort: 100,
   component: Layout,
   name: '供货商统计',
   redirect: '/stat/supplier',

package/library/viewModules/viewsAccounts/viewsAccounts/list.vue

@@ -73,6 +73,7 @@ import XdDialog from "@/components/XdDialog.vue";
 import {mapActions} from 'vuex'
 import {createPwd} from "@/utils/xd.base";
 import mAccounts from '@/constant/modules/mAccounts'
+import { getOptions } from "@/utils/options"
 
 export default {
   name: "PartnerAccountList",
@@ -130,7 +131,8 @@ export default {
       listValue: {},
       listForm: [],
       key: Date.now(),
-      pwdShow: 'password'
+      pwdShow: 'password',
+      subCompanyData:[],
     }
   },
 
@@ -159,6 +161,21 @@ export default {
       }
 
     })
+    // #ifdef saas-admin
+    getOptions({
+      server: 'saas-company',
+      fn: 'sub_company',
+      path: 'p1',
+      params:{
+        is_check_data_auth:'N'
+      }
+    }).then(res => {
+      this.subCompanyData = res.data.list
+    })
+    .catch(err=>{
+
+    })
+    // #endif
   },
 
   methods: {
@@ -196,6 +213,9 @@ export default {
             password =form.password;
             delete form.password;
           }
+          if(form['sub_company_ids']){
+            form['sub_company_ids'] = JSON.stringify(form['sub_company_ids'])
+          }
           let params = {
             password: password,
             user: {
@@ -336,6 +356,21 @@ export default {
           ],
         },
         // #endif
+        // #ifdef saas-admin
+         {
+          label: "数据权限:",
+          ele: "xd-select-list",
+          valueKey: "sub_company_ids",
+          value: params.sub_company_ids || [],
+          placeholder: "请选择数据权限",
+          list:this.subCompanyData,
+          multiple:true,
+          className: "input80",
+          rules: [
+            { required: true, message: '请选择数据权限', trigger: 'blur' }
+          ]
+        },
+        // #endif
         {
           label: '状态:',
           ele: 'xd-radio-status',
@@ -376,6 +411,12 @@ export default {
 
     handleTableClick ({ row, value, index, rowIndex }) {
       this.user_id = row.user_id;
+      // #ifdef saas-admin
+      let copyRow = this.$xdHelper.cloneDeep(row)
+        if(row['sub_company_ids']){
+        copyRow['sub_company_ids'] = JSON.parse(row['sub_company_ids'])
+      }
+      // #endif
       let info = {
         user_id: row.user_id,
         phone_number: row.phone_number,
@@ -386,7 +427,9 @@ export default {
         company:[{label: row.company_name, value: row.company_id}],
         is_show_saas: row.is_show_saas,
         // #endif
-
+        // #ifdef saas-admin
+        sub_company_ids:copyRow.sub_company_ids||[]
+        // #endif
       };
       this.initForm(info);
       this.dialog = true;

package/library/viewModules/viewsCompany/router/mCompany.js

@@ -7,7 +7,7 @@ const companyRouter = {
   path: '/m-company',
   name: '客户管理',
   component: Layout,
-  sort: 92,
+  sort: 91,
   redirect: '/m-company/list',
   meta: {
     title: '客户管理',

package/library/viewModules/viewsCycle/router/cycle.js

@@ -0,0 +1,54 @@
+import Layout from '@/layout'
+import roles from '@/constant/permissions' //引用权限值
+const cycleRouter = {
+  path: '/cycle',
+  component: Layout,
+  sort: 94,
+  name: '开卡周期过滤',
+  alwaysShow: false,
+  
+  meta: {
+    name: '开卡周期过滤',
+    icon: 'el-icon-s-release',
+    iconSize: 20,
+    roles: [roles.cycle.cycleList]
+  },
+  children: [
+    {
+      path: 'list',
+      name: 'cycleList',
+      component: () => import('@/viewsCycle/list'),
+      meta: {
+        title: '开卡周期过滤',
+        icon: 'el-icon-s-release',
+        roles: [roles.cycle.cycleList]
+      }
+    },
+    {
+      path: 'add',
+      name: 'addCycle',
+      component: () => import('@/viewsCycle/create'),
+      hidden: true,
+      meta: {
+        title: '创建规则',
+        icon: 'el-icon-s-release',
+        activeMenu: '/cycle/list',
+        roles: [roles.cycle.cycleCreate]
+      }
+    },
+    {
+      path: 'edit/:id',
+      name: 'editCycle',
+      component: () => import('@/viewsCycle/create'),
+      hidden: true,
+      meta: {
+        title: '编辑规则',
+        icon: 'el-icon-s-release',
+        activeMenu: '/cycle/list',
+        roles: [roles.cycle.cycleUpdate]
+      }
+    },
+  ]
+}
+
+export default cycleRouter

package/library/viewModules/viewsCycle/schemas/cycle.js

@@ -0,0 +1,123 @@
+'use strict';
+
+module.exports = {
+  name: 'cycle',
+  title: '卡周期过滤',
+  vuex: true,
+  model: [
+    {
+      title: '卡周期过滤 - 列表',
+      mapFn: "cycleList",
+      path: '/product-partner/v1/:xsiteid/:xnamespace/card-cycle-filters',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        page_size: ['page_size', 'String', '必填'],
+        page_token: ['page_token', 'String', '必填'],
+        card_number: ['卡号', 'String', ''],
+        rule_name: ['规则名称', 'String', ''],
+        status: ['状态', 'String', ''],
+      },
+      disabled: true,
+      // #ifdef partner-movie
+      role: "ROLE_MOVIE_CYCLE_FILTER_LIST",
+      // #endif
+      // #ifdef partner-mall
+      role: "ROLE_MALL_CYCLE_FILTER_LIST"
+      // #endif
+    },
+    {
+      title: '卡周期过滤 - 详情',
+      mapFn: "cycleDetail",
+      path: '/product-partner/v1/:xsiteid/:xnamespace/card-cycle-filter/:id',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        id: ['id', 'String', '是']
+      },
+      disabled: true,
+    },
+    {
+      title: "卡周期过滤 - 创建",
+      mapFn: "cycleCreate",
+      path: "/product-partner/v1/:xsiteid/:xnamespace/card-cycle-filter",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        item: {
+          rule_name: ['规则名称', 'String', '必填'],
+          comment: ['规则描述', 'String', '必填'],
+          status: ['状态', 'String', '必填'],
+          sort: ['权重', 'String', '必填'],
+          card_numbers: ['卡号', 'String', '必填'],
+          rule_data: ['规则', 'String', '必填']
+        }
+      },
+      disabled: true,
+      // #ifdef partner-movie
+      role: "ROLE_MOVIE_CYCLE_FILTER_ADD",
+      // #endif
+      // #ifdef partner-mall
+      role: "ROLE_MALL_CYCLE_FILTER_ADD"
+      // #endif
+    },
+    {
+      title: "卡周期过滤 - 修改",
+      mapFn: "cycleUpdate",
+      path: "/product-partner/v1/:xsiteid/:xnamespace/card-cycle-filter/:id",
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+        item: {
+          rule_name: ['规则名称', 'String', '必填'],
+          comment: ['规则描述', 'String', '必填'],
+          id: ['id', 'String', '必填'],
+          status: ['状态', 'String', '必填'],
+          sort: ['权重', 'String', '必填'],
+          card_numbers: ['卡号', 'String', '必填'],
+          rule_data: ['规则', 'String', '必填']
+        }
+      },
+      method: "PUT",
+      disabled: true,
+      // #ifdef partner-movie
+      role: "ROLE_MOVIE_CYCLE_FILTER_UPDATE",
+      // #endif
+      // #ifdef partner-mall
+      role: "ROLE_MALL_CYCLE_FILTER_UPDATE"
+      // #endif
+    },
+    {
+      title: '卡周期过滤 - 发布',
+      mapFn: "cyclePublish",
+      path: '/product-partner/v1/:xsiteid/:xnamespace/card-cycle-filter/publish',
+      isRule: false,
+      data: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+      },
+      disabled: true,
+      // #ifdef partner-movie
+      role: "ROLE_MOVIE_CYCLE_FILTER_PUBLISH",
+      // #endif
+      // #ifdef partner-mall
+      role: "ROLE_MALL_CYCLE_FILTER_PUBLISH",
+      // #endif
+    },
+    {
+      title: '卡周期过滤 - 记录详情',
+      mapFn: "cycleLogDetail",
+      path: '/product-partner/v1/:xsiteid/:xnamespace/policy-history/:id',
+      isRule: false,
+      params: {
+        xsiteid: ['站点Id', 'String', '必填'],
+        xnamespace: ['命名空间', 'String', '必填'],
+      },
+      disabled: true,
+    },
+  ],
+}

package/library/viewModules/viewsCycle/viewsCycle/create.vue

@@ -0,0 +1,430 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__list">
+      <xd-base-dynamic-field
+        v-if="formList !== null"
+        ref="form"
+        v-model="formParams"
+        label-width="150px"
+        :list="formList"
+        :key="renderFormKey"
+        size="medium"
+        @success="handleSuccess"
+        @onApiSuccessUrl="handleApiSuccessUrl"
+        @onGetParamsAndHeader="handleGetParamsAndHeader"
+      >
+        <template slot-scope="scope" slot="custom">
+          <el-form ref="form" :model="customForm" label-width="80px">
+            <el-form-item
+              class="custom-form-item"
+              v-for="(item, index) in customForm"
+              :key="index"
+            >
+              <span style="margin-right: 10px">开卡后</span>
+              <el-input
+                style="width: 100px"
+                v-model="item.day"
+                placeholder="请填写"
+              ></el-input>
+              <span style="margin-left: 10px">天后，根据</span>
+              <span style="color: red">进货价/售价</span>
+              <span style="margin-right: 10px">展示</span>
+              <el-input
+                style="width: 100px"
+                v-model="item.discount_ratio"
+                placeholder="请填写"
+              ></el-input>
+              <span style="margin-left: 10px">折以内的商品</span>
+              <div style="margin-left: 10px" class="">
+                <el-link
+                  :underline="false"
+                  type="primary"
+                  icon="el-icon-circle-plus"
+                  style="font-size: 26px"
+                  @click="addItem"
+                  v-if="index === customForm.length - 1"
+                ></el-link>
+                <el-link
+                  :underline="false"
+                  type="danger"
+                  icon="el-icon-remove"
+                  style="font-size: 26px"
+                  @click="removeItem(index)"
+                  v-if="customForm.length > 1"
+                ></el-link>
+              </div>
+            </el-form-item>
+          </el-form>
+        </template>
+      </xd-base-dynamic-field>
+      <div style="padding-left: 150px">
+        <el-button @click="goBack" type="primary">返回</el-button>
+        <el-button v-if="!isView" @click="handleConfirm" type="primary"
+          >保存</el-button
+        >
+      </div>
+    </el-card>
+  </div>
+</template>
+
+
+<script>
+import XdBaseDynamicField from "@/components/XdBaseDynamicField";
+import { getOptions } from "@/utils/options";
+import { Loading } from "element-ui";
+import checkPermission from "@/utils/permission";
+import { mapActions, mapState } from "vuex";
+
+export default {
+  name: "pontAdd",
+  components: {
+    XdBaseDynamicField,
+  },
+  watch: {},
+  data() {
+    return {
+      formList: null,
+      formParams: {},
+      id: null,
+      renderFormKey: Date.now(),
+      customForm: [
+        {
+          day: "",
+          discount_ratio: "",
+        },
+      ],
+      type: "",
+      isView: false,
+    };
+  },
+  created() {
+    this.id = this.$route.params.id;
+    this.type = this.$route.query.editType;
+    this.isView = this.$route.query.isView;
+
+    if (this.id) {
+      let params = {
+        id: this.id,
+        type: this.type,
+      };
+      if (this.isView) {
+        this.cycleLogDetail(params)
+          .then((res) => {
+            console.log(res, "aaaaaa");
+            this.customForm = res.data.card_cycle_filter.rule_data;
+            this.customForm = this.customForm.map((item) => {
+              item.discount_ratio = item.discount_ratio / 100;
+              return item;
+            });
+            this.initFormList(res.data.card_cycle_filter);
+          })
+          .catch((err) => {
+            console.log(err, "err");
+          });
+      } else {
+        this.cycleDetail(params)
+          .then((res) => {
+            console.log(res, "aaaaaa");
+            this.customForm = res.data.rule_data;
+            this.customForm = this.customForm.map((item) => {
+              item.discount_ratio = item.discount_ratio / 100;
+              return item;
+            });
+            this.initFormList(res.data);
+          })
+          .catch((err) => {
+            console.log(err, "err");
+          });
+      }
+    } else {
+      this.initFormList({});
+    }
+  },
+
+  methods: {
+    ...mapActions("cycle", [
+      "cycleCreate",
+      "cycleDetail",
+      "cycleUpdate",
+      "cycleLogDetail",
+    ]),
+    initFormList(params, isWitch) {
+      console.log(params, "params");
+      let formList = [
+        {
+          ele: "title",
+          label: "基础信息",
+          size: "mini",
+        },
+        {
+          label: "规则名称:", //label
+          ele: "el-input", //package 名称
+          type: "text",
+          valueKey: "rule_name", //form[valueKey]
+          value: params.rule_name || "", //v-model
+          placeholder: "输入规则名称",
+          classNmae: "input40",
+          rules: [
+            {
+              required: true,
+              message: "请输入规则名称",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          label: "规则描述:", //label
+          ele: "el-input", //package 名称
+          type: "textarea",
+          valueKey: "comment", //form[valueKey]
+          value: params.comment || "", //v-model
+          placeholder: "输入规则描述",
+          classNmae: "input40",
+          rules: [
+            {
+              required: true,
+              message: "请输入规则描述",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          label: "权重值:", //label
+          ele: "el-input", //package 名称
+          type: "number",
+          valueKey: "sort", //form[valueKey]
+          value: params.sort || "", //v-model
+          placeholder: "输入权重值",
+          classNmae: "input40",
+          rules: [
+            {
+              required: this.id ? false : true,
+              message: "请输入权重值",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          label: "规则状态:", //label
+          ele: "xd-radio",
+          valueKey: "status", //form[valueKey]
+          value: params.status || "Y", //v-model
+          placeholder: "请选择规则状态",
+          list: [
+            {
+              label: "启用",
+              value: "Y",
+            },
+            {
+              label: "禁用",
+              value: "N",
+            },
+          ],
+          rules: [
+            {
+              required: true,
+              message: "请选择规则状态",
+              trigger: ["blur", "change"],
+            },
+          ],
+        },
+        {
+          ele: "title",
+          label: "号段配置",
+          size: "mini",
+        },
+        {
+          label: "涉及号段:", //label
+          tips: "注意:开始和结束卡号段必须填写，并且开始卡号必须小于结束开号.",
+          ele: "xd-range-group", //package 名称
+          keys: ["start_number", "end_number"], //返回数组字段名称
+          defaultValue: params.card_numbers,
+          valueKey: "card_numbers", //form[valueKey]
+          placeholder: ["开始卡号", "结束卡号"],
+          rules: [
+            {
+              required: true,
+              validator(rule, value, callback) {
+                let flag = true,
+                  index = null,
+                  message = "";
+                value.map((item, idx) => {
+                  if (index === null) {
+                    //检查卡号填写为空
+                    Object.keys(item).map((k) => {
+                      if (item[k] === null) {
+                        index = idx;
+                        flag = false;
+                        message = "卡号输入不能为空！";
+                      }
+                    });
+
+                    //检查开始卡号不能大于等于结束卡号
+                    if (index === null) {
+                      if (item["start_number"] >= item["end_number"]) {
+                        index = idx;
+                        flag = false;
+                        message = "输入开始卡号不能大于等于结束卡号";
+                      }
+                    }
+                  }
+                });
+
+                if (flag) callback();
+                else callback(`第【${index + 1}】条数据有误，错误：${message}`);
+
+                // let temp = false;
+                // if (!value['week_day'] || value['week_day'].length === 0) temp = true;
+                // if (!value['week_start'] || !value['week_end']) temp = true;
+                // if (temp) callback('请设置规则')
+                // else callback();
+              },
+              trigger: ["blur", "change"],
+            },
+          ],
+        },
+        {
+          ele: "title",
+          label: "规则配置",
+          size: "mini",
+        },
+        {
+          label: "",
+          ele: "slot",
+          slot: "custom",
+        },
+      ];
+      this.formList = formList.filter((i) => i);
+      this.renderFormKey = Date.now();
+    },
+
+    handleConfirm() {
+      console.log(this.formParams, "formParams");
+      if (!this.customForm.length) {
+        this.$message({
+          type: "error",
+          message: "请添加规则",
+        });
+        return;
+      } else {
+        if (this.hasDuplicate(this.customForm)) {
+          this.$message({
+            type: "error",
+            message: "天数不能重复",
+          });
+          return;
+        }
+        const regex = /^[1-9]\d*$/;
+        const regex2 = /^\d+(?:\.\d+)?$/;
+        for (let index = 0; index < this.customForm.length; index++) {
+          if (!regex.test(this.customForm[index].day)) {
+            this.$message({
+              type: "error",
+              message: "请输入正整数",
+            });
+            return;
+          }
+          if (!regex2.test(this.customForm[index].discount_ratio)) {
+            this.$message({
+              type: "error",
+              message: "请输入正数",
+            });
+            return;
+          }
+          if (this.customForm[index].day > 999) {
+            this.$message({
+              type: "error",
+              message: "请输入小于999的数字",
+            });
+            return;
+          }
+          if (!this.customForm[index].discount_ratio) {
+            this.$message({
+              type: "error",
+              message: "请输入折扣",
+            });
+            return;
+          }
+        }
+      }
+      this.$refs.form.submit().then((res) => {
+        let data = {
+          item: this.formParams,
+        };
+        data.item.rule_data = this.$xdHelper
+          .cloneDeep(this.customForm)
+          .map((item) => {
+            item.discount_ratio = item.discount_ratio * 100;
+            return item;
+          });
+        let loading = Loading.service({});
+        if (this.id) {
+          data.id = this.id;
+          this.cycleUpdate(data)
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "编辑成功",
+              });
+              loading.close();
+              this.$bus.$emit("delTags", this.$route, {}, "systemApplyList");
+            })
+            .catch((err) => {
+              loading.close();
+              console.log(err, "err");
+            });
+        } else {
+          this.cycleCreate(data)
+            .then((res) => {
+              this.$message({
+                type: "success",
+                message: "添加成功",
+              });
+              loading.close();
+              this.$bus.$emit("delTags", this.$route, {}, "systemApplyList");
+            })
+            .catch((err) => {
+              loading.close();
+              console.log(err, "err");
+            });
+        }
+      });
+    },
+
+    hasDuplicate(arr) {
+      for (var i = 0; i < arr.length; i++) {
+        for (var j = i + 1; j < arr.length; j++) {
+          if (Number(arr[i].day) === Number(arr[j].day)) {
+            return true;
+          }
+        }
+      }
+      return false;
+    },
+
+    addItem() {
+      let temp;
+      temp = {
+        day: "",
+        discount_ratio: "",
+      };
+      this.customForm.push(temp);
+    },
+
+    removeItem(index) {
+      this.customForm.splice(index, 1);
+    },
+
+    goBack() {
+      this.$router.replace("/cycle/list");
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.custom-form-item ::v-deep .el-form-item__content {
+  display: flex;
+}
+</style>
+

package/library/viewModules/viewsCycle/viewsCycle/list.vue

@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <el-card class="app-container__search">
+      <xd-search
+        time-type
+        dateFilter
+        :picker-options="{}"
+        v-if="searchForm.length > 0"
+        v-model="searchParams"
+        :list="searchForm"
+        @onSearch="handleSearch"
+      >
+      </xd-search>
+    </el-card>
+    <el-card class="app-container__list">
+      <div class="app-container__list-pagination">
+        <div>
+          <el-button type="primary" v-if="isAdd" @click="toAdd">添加规则</el-button>
+          <el-button type="primary" v-if="isPublish" :disabled="!tables.length" @click="toPublish">发布</el-button>
+        </div>
+      </div>
+      <div class="app-container__list-table">
+        <xd-table
+          is-border
+          :headers="headers"
+          :list="tables"
+          @onClick="handleBtnClick"
+        >
+          <template slot="card_numbers" slot-scope="scope">
+            <div v-for="(item, index) in scope.row.card_numbers" :key="index">
+              {{ item.start_number }}-{{ item.end_number }}
+            </div>
+          </template>
+        </xd-table>
+      </div>
+      <div class="app-container__list-pagination">
+        <xd-pagination
+          :total="total"
+          :limit.sync="limit"
+          :page="pageSize"
+          :auto-scroll="false"
+          @onPagination="handlePagination"
+        ></xd-pagination>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import XdPagination from "@/components/XdPagination.vue";
+import XdTable from "@/components/XdTable";
+import XdSearch from "@/components/XdSearch";
+import { mapActions, mapState } from "vuex";
+import { getOptions } from "@/utils/options";
+import checkPermission from "@/utils/permission"
+import Role from "@/constant/modules/cycle"
+
+export default {
+  name: "PageTasksList",
+  components: {
+    XdPagination, //翻译插件
+    XdTable,
+    XdSearch,
+  },
+  data() {
+    return {
+      Role,
+      //搜索
+      searchForm: [], //搜索区域模块表单
+      searchParams: {}, //搜索参数
+
+      //分页参数
+      pageSize: 1, //当前页面数量
+      limit: 20, //搜索参数
+      total: 0,
+
+      //列表对象
+      tables: [],
+    };
+  },
+  computed: {
+    headers() {
+      return [
+        {
+          type: "normal",
+          prop: "id",
+          align: "center",
+          width: 120,
+          label: "ID",
+        },
+        {
+          type: "normal",
+          prop: "rule_name",
+          align: "center",
+          minWidth: 200,
+          label: "规则名称",
+        },
+        {
+          type: "normal",
+          prop: "comment",
+          align: "center",
+          width: 200,
+          label: "规则描述",
+        },
+        {
+          type: "normal",
+          prop: "card_numbers",
+          align: "center",
+          width: 180,
+          label: "生效号段",
+        },
+        {
+          type: "normal",
+          prop: "sort",
+          align: "center",
+          width: 200,
+          label: "权重", 
+        },
+        {
+          type: "status",
+          prop: "status",
+          align: "center",
+          width: 100,
+          label: "状态",
+          message: ["启用", "禁用"],
+        },
+        {
+          type: "normal",
+          prop: "updated_time",
+          align: "center",
+          width: 190,
+          label: "修改时间",
+        },
+        {
+          type: "normal",
+          prop: "op_username",
+          align: "center",
+          width: 100,
+          label: "操作人",
+        },
+        {
+          type: "operate",
+          align: "center",
+          prop: "operate",
+          width: 130,
+          isCheckHide: true,
+          label: "操作",
+          values: [
+            checkPermission([Role.cycleUpdate]) &&{ ui: "text-button", name: "编辑", type: "text", event: "edit" },
+            {
+              ui: "text-button",
+              name: "修改记录",
+              type: "text",
+              event: "logs",
+            },
+          ].filter(i=>i)
+        },
+      ].filter(i=>i)
+    },
+    isAdd(){
+      return checkPermission([Role.cycleCreate])
+    },
+    isPublish() {
+      return checkPermission([Role.cyclePublish])
+    },
+  },
+  created() {
+    this.getList();
+    this.initSearchForm();
+  },
+  methods: {
+    ...mapActions("cycle", ["cycleList", "cyclePublish"]),
+    /**
+     * @description 点击按钮操作
+     * @param value {Object}  按钮对象
+     * @param row {Object}  行对象
+     */
+    handleBtnClick({ value, row }) {
+      if (value.event === "edit") {
+        this.$router.push({
+          path: `/cycle/edit/${row.id}`,
+        });
+      } else if(value.event === "logs") {
+        this.$router.push({
+          path: `/editLog/edit-log/${row.id}?type=CF`,
+        });
+      }
+    },
+
+    onJfbTagForReload () {
+      this.getList()
+    },
+
+    toAdd() {
+      this.$router.push("/cycle/add");
+    },
+
+    toPublish() {
+      this.cyclePublish()
+        .then((res) => {
+          this.$message.success('发布成功')
+          loading.close();
+        })
+        .catch((err) => {
+          loading.close();
+        });
+    },
+
+    /**
+     * @description 获取数据列表
+     */
+    getList() {
+      let params = {
+        page_token: this.pageSize,
+        page_size: this.limit,
+        ...this.searchParams,
+      };
+      let loading = this.$loading({});
+      this.cycleList(params)
+        .then((res) => {
+          const { list, total_size } = res.data;
+          this.tables = list.map((item) => {
+            Object.assign(item, {
+              updated_time: getTimeFormat(item.updated_time),
+            });
+            return item;
+          });
+          this.total = total_size;
+          loading.close();
+        })
+        .catch((err) => {
+          loading.close();
+        });
+    },
+
+    /**
+     * @description 点击搜索进行搜索操作
+     * @param action 动作
+     * @param form 搜索请求参数
+     */
+    handleSearch({ action, form }) {
+      this.page_token = 1;
+      this.getList();
+    },
+    /**
+     * @description 初始化搜索模块
+     */
+    initSearchForm() {
+      this.searchForm = [
+        {
+          label: "卡号",
+          ele: "el-input",
+          valueKey: "card_number",
+          value: "",
+          placeholder: "请输入卡号",
+        },
+        {
+          label: "规则名称",
+          ele: "el-input",
+          valueKey: "rule_name",
+          value: "",
+          placeholder: "请输入规则名称",
+        },
+        {
+          label: "规则状态:",
+          ele: "xd-select-list",
+          valueKey: "status",
+          value: "",
+          placeholder: "请选择规则状态",
+          list: [
+            {
+              label: "启用",
+              value: "Y",
+            },
+            {
+              label: "禁用",
+              value: "N",
+            },
+          ],
+        },
+      ];
+    },
+
+    /**
+     * @description 翻页处理方法
+     * @param page {Number} 访问页面页码数
+     */
+    handlePagination(page) {
+      this.pageSize = page;
+      this.getList();
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+.xd-table {
+  .el-button {
+    margin: 0 auto;
+  }
+}
+
+.app-container__list-pagination-left {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 14px;
+  & > i {
+    margin-right: 5px;
+    font-size: 18px;
+  }
+}
+</style>

package/library/viewModules/viewsFinance/router/balance.js

@@ -4,7 +4,7 @@ import wallet from "@/constant/modules/wallet.js"
 const balanceRouter = {
   path: '/balance',
   component: Layout,
-  sort: 95,
+  sort: 96,
   name: '账户余额',
   redirect: '/balance/list',
   alwaysShow: true,

package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue

@@ -292,6 +292,13 @@ export default {
           minWidth: 100,
           label: "资金方向",
         },
+        {
+          type: "normal",
+          prop: "trade_type_name",
+          align: "center",
+          minWidth: 100,
+          label: "交易类型",
+        },
         {
           type: "normal",
           prop: "invoice_name",

package/library/viewModules/viewsFlashSale/router/flashsalem.js

@@ -4,7 +4,7 @@ import Layout from '@/layout'
 const couponRouter = {
   path: '/flashsale',
   component: Layout,
-  sort: 95,
+  sort: 97,
   name: '',
   redirect: '/flashsale/list',
   alwaysShow: true,

package/library/viewModules/viewsFreightSet/router/freight_set.js

@@ -6,7 +6,7 @@ const freight_set = roles.freight_set;
 
 const freightSetRouter = {
   path: '/delivery',
-  sort: 95,
+  sort: 98,
   component: Layout,
   name: '运费模版设置',
   redirect: '/delivery/freight_set',

package/library/viewModules/viewsThird/router/third.js

@@ -6,7 +6,7 @@ const service = roles.service
 const applyRouter = {
   path: '/apply',
   component: Layout,
-  sort: 95,
+  sort: 101,
   // #ifdef partner
   name: '核销号段调价管理',
   alwaysShow: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {
@@ -29,7 +29,7 @@
     "element-ui": "2.13.2",
     "gxd-file-preview": "1.2.1",
     "gxd-helper": "2.0.21",
-    "gxd-vue-library": "1.1.96",
+    "gxd-vue-library": "1.1.133",
     "js-base64": "^3.4.5",
     "js-cookie": "2.2.0",
     "md5": "^2.3.0",