Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

rk

2 天以前 609a1931953b2298016bd2b0d6b410666b5ad7b9

 admin/src/views/business/couponVerificationRecord.vue

@@ -2,13 +2,13 @@
  <TableLayout :permissions="['business:bikes:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="抖音券码" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入抖音券码" @keypress.enter.native="search"></el-input>
      <el-form-item label="抖音券码" prop="originCode">
        <el-input v-model="searchForm.originCode" placeholder="请输入抖音券码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="验券状态" prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择验券状态">
          <el-option label="正常" value="1"></el-option>
          <el-option label="停用" value="0"></el-option>
      <el-form-item label="验券状态" prop="cancelStatus">
        <el-select v-model="searchForm.cancelStatus" placeholder="请选择验券状态">
          <el-option label="成功" value="0"></el-option>
          <el-option label="撤销" value="1"></el-option>
        </el-select>
      </el-form-item>
      <section>
@@ -23,21 +23,25 @@
        :data="tableData.list"
        stripe
      >
        <el-table-column prop="id" label="订单编号" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="会员信息" min-width="100px"></el-table-column>
        <el-table-column prop="creator" label="卡券类型" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="团购商品名称" min-width="100px"></el-table-column>
        <el-table-column prop="editor" label="券码" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="验券时间" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="验券状态" min-width="100px"></el-table-column>
        <el-table-column prop="orderCode" label="订单编号" min-width="100px"></el-table-column>
        <el-table-column prop="memberOpenid" label="会员信息" min-width="100px"></el-table-column>
        <el-table-column prop="category" label="卡券类型" min-width="100px"></el-table-column>
        <el-table-column prop="couponName" label="团购商品名称" min-width="100px"></el-table-column>
        <el-table-column prop="originCode" label="券码" min-width="100px"></el-table-column>
        <el-table-column prop="verifyTime" label="验券时间" min-width="100px"></el-table-column>
        <el-table-column prop="exchangerName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="cancelStatus" label="验券状态" min-width="100px">
          <template slot-scope="{row}">
            <el-tag :type="row.cancelStatus === 0 ? 'success' : 'danger'">{{ row.cancelStatus === 0 ? '成功' : '核验撤销' }} </el-tag>
          </template>
        </el-table-column>
        <el-table-column
          label="操作"
          min-width="120"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text">撤销</el-button>
            <el-button type="text" :loading="cancelingId === row.id" v-if="row.cancelStatus !== 1" @click="handleCancel(row)">撤销</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -58,26 +62,44 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import ProductConfigurationWindow from '@/components/business/productConfiguration.vue'
import { cancel } from '@/api/business/douyinVerify'
export default {
  name: 'Goods',
  extends: BaseTable,
  components: { TableLayout, Pagination, ProductConfigurationWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        name: ''
      }
        originCode: '',
        cancelStatus: ''
      },
      cancelingId: null
    }
  },
  created () {
    this.config({
      module: '自行车信息表',
      api: '/business/bikes',
      module: '抖音券验券记录表',
      api: '/business/douyinVerify',
      'field.id': 'id',
      'field.main': 'id'
    })
    this.search()
  },
  methods: {
    handleCancel (row) {
      this.$confirm('确定要撤销这条验券记录吗？', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        this.cancelingId = row.id
        cancel({ id: row.id }).then((res) => {
          this.search()
        }).finally(() => {
          this.cancelingId = null
        })
      }).catch(() => {})
    }
  }
}
</script>