Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/service/serviceFeeManage/index.vue

@@ -9,7 +9,7 @@
        :statistics="true"
        :operates-list="operatesList"
      />
      <PagerView class="page" />
      <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
    </div>
    <TableCommonView ref="tableListRef" :table-list="tableList" @getSelectArray="getSelectArray">
      <template slot="tableButton">
@@ -30,10 +30,12 @@
<script>
import AddServiceFeeManageDialog from "@/views/service/serviceFeeManage/AddServiceFeeManageDialog"
import { getServiceFeeManageList, getDelServiceFeeManage } from "@/api/serviceManage/serviceFeeManage"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"

export default {
  name: "ServiceFeeManage",
  props: {},
  mixins: [pageMixin],
  components: {
    AddServiceFeeManageDialog
  },
@@ -90,8 +92,8 @@
          { label: "客户编号", prop: "client_id" }, // 客户编号
          { label: "客户状态", prop: "client_status_id" }, // 客户状态
          { label: "产品名称", prop: "productName" }, // 产品名称
          // { label: "服务开始日期", prop: "startDate", isTime: true, width: 150 }, // 服务开始日期
          { label: "服务到期日", prop: "latest_date", isTime: true, width: 160 } // 服务到期日
          // { label: "服务开始日期", prop: "startDate", width: 150 }, // 服务开始日期
          { label: "服务到期日", prop: "latest_date", width: 160 } // 服务到期日
        ]
      }
      this.searchOptions = []
@@ -103,7 +105,11 @@
    // 请求数据
    async getData() {
      this.loading = true
      await getServiceFeeManageList()
      await getServiceFeeManageList({
        keyword: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
@@ -119,6 +125,7 @@
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.data.count
            } else {
              this.tableList.tableInfomation = []
            }