提交一下

1

src/views/couponManager/couponUpdate.vue

@@ -48,13 +48,13 @@
             <el-select
               :disabled="isDisabled"
               placeholder="领券方式"
-              v-model.trim="form.type"
+              v-model.trim="form.issuanceType"
               filterable
               clearable
               style="width: 355px !important"
             >
-              <el-option value="0" label="主动领取"></el-option>
-              <el-option value="1" label="手动发放"></el-option>
+              <el-option :value="0" label="主动领取"></el-option>
+              <el-option :value="1" label="手动发放"></el-option>
             </el-select>
           </el-form-item>
         </el-col>

src/views/couponManager/index.vue

@@ -36,6 +36,34 @@
             ></el-option>
           </el-select>
         </el-form-item> -->
+        <el-form-item prop="typeDetail">
+          <el-select
+            placeholder="请选择优惠券类型"
+            v-model.trim="searchForm.typeDetail"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in coupontypeDetail"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          prop="issuanceType"
+        >
+          <el-select
+            placeholder="领券方式"
+            v-model.trim="searchForm.issuanceType"
+            filterable
+            clearable
+          >
+            <el-option :value="0" label="主动领取"></el-option>
+            <el-option :value="1" label="手动发放"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="status">
           <el-select
             placeholder="优惠券状态"
@@ -86,12 +114,19 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="studentId" label="类型">
+          <!-- <el-table-column align="center" prop="studentId" label="类型">
             <template slot-scope="scope">
               <div>
                 {{ scope.row.type | couponTypeFilter }}
               </div>
             </template>
+          </el-table-column> -->
+          <el-table-column align="center" prop="studentId" label="使用类型">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.typeDetail | coupontypeDetailType }}
+              </div>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -330,12 +365,12 @@
                     >删除</el-button
                   >
                 </auth>
-                <auth auths="sysCoupon/delete">
+                <auth auths="sysCoupon/delete" v-if="scope.row.issuanceType">
                   <el-button type="text" @click="getCoupon(scope.row)"
                     >手动发放</el-button
                   >
                 </auth>
-                <auth auths="sysCoupon/delete">
+                <auth auths="sysCoupon/delete" v-if="scope.row.issuanceType">
                   <el-button type="text" @click="getCouponRecord(scope.row)"
                     >发放记录</el-button
                   >
@@ -385,19 +420,22 @@ import { getToken } from "@/utils/auth";
 import pagination from "@/components/Pagination/index";
 import load from "@/utils/loading";
 import { getSysCoupon, resetSysCoupon, delSysCoupon } from "./api";
-import { couponTypeList } from "@/utils/searchArray";
+import { couponTypeList, coupontypeDetailList } from "@/utils/searchArray";
 import Tooltip from "@/components/Tooltip/index";
 import couponGrant from "./couponGrant";
-import couponRecord from './couponRecord'
+import couponRecord from "./couponRecord";
 export default {
-  components: { pagination, Tooltip, couponGrant,couponRecord },
+  components: { pagination, Tooltip, couponGrant, couponRecord },
   data() {
     return {
+      coupontypeDetail: coupontypeDetailList,
       couponTypeList,
       searchForm: {
         search: null,
         type: null,
         status: null,
+        typeDetail: null,
+        issuanceType:null
       },
       activeRow: null,
       tableList: [],

src/views/resetTeaming/modals/review-detail.vue

@@ -87,7 +87,7 @@
           {{ scope.row.courseType | courseTypeFormat }}
         </template>
       </el-table-column>
-      <el-table-column prop="isStudentOptional" label="是否可选" width="100px">
+      <el-table-column prop="isStudentOptional" label="是否必选" width="100px">
         <template slot-scope="scope">{{
           scope.row.isStudentOptional ? "是" : "否"
         }}</template>
@@ -127,7 +127,7 @@
           {{ scope.row.courseType | courseTypeFormat }}
         </template>
       </el-table-column>
-      <el-table-column prop="isStudentOptional" label="是否可选" width="100px">
+      <el-table-column prop="isStudentOptional" label="是否必选" width="100px">
         <template slot-scope="scope">{{
           scope.row.isStudentOptional ? "是" : "否"
         }}</template>
@@ -184,7 +184,7 @@
     >
       <el-table-column prop="name" label="会员类型" width="120">
       </el-table-column>
-      <el-table-column prop="optionalFlag" label="是否可选" width="100px">
+      <el-table-column prop="optionalFlag" label="是否必选" width="100px">
         <template slot-scope="scope">{{
           scope.row.optionalFlag ? "是" : "否"
         }}</template>
@@ -270,7 +270,7 @@
     >
       <el-table-column prop="activityName" label="活动方案" width="120">
       </el-table-column>
-      <el-table-column prop="optionalFlag" label="是否可选" width="100px">
+      <el-table-column prop="optionalFlag" label="是否必选" width="100px">
         <template slot-scope="scope">{{
           scope.row.optionalFlag ? "是" : "否"
         }}</template>