lex 2 سال پیش
والد
کامیت
ecdc488742
2فایلهای تغییر یافته به همراه18 افزوده شده و 14 حذف شده
  1. 15 11
      src/views/courseCredentials/detail.vue
  2. 3 3
      src/views/courseCredentials/index.vue

+ 15 - 11
src/views/courseCredentials/detail.vue

@@ -9,13 +9,13 @@
     >
       <el-form-item prop="search">
         <el-input
-          placeholder="活动编号/来源"
+          placeholder="活动编号/活动名称"
           clearable
           type="text"
           v-model.trim="searchForm.search"
         ></el-input>
       </el-form-item>
-      <el-form-item prop="hasSubCourse">
+      <!-- <el-form-item prop="hasSubCourse">
         <el-select
           class="multiple"
           clearable
@@ -36,7 +36,7 @@
           <el-option label="是" :value="1"></el-option>
           <el-option label="否" :value="0"></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button native-type="submit" type="primary">搜索</el-button>
@@ -59,20 +59,24 @@
         label="活动名称"
       ></el-table-column>
       <el-table-column
+        width="160px"
         align="center"
-        prop="organName"
+        prop="createTime"
         label="时间"
       ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="organName"
-        label="付费方式"
-      ></el-table-column>
+      <el-table-column align="center" prop="freeFlag" label="付费方式">
+        <template slot-scope="scope">
+          {{ scope.row.freeFlag ? "赠送" : "付费" }}
+        </template>
+      </el-table-column>
       <el-table-column align="center" prop="organName" label="排课资格">
+        <template slot-scope="scope">
+          {{ scope.row.subCourseNum }}/{{ scope.row.totalCourseNum }}
+        </template>
       </el-table-column>
       <el-table-column
         align="center"
-        prop="subNoCoursePrice"
+        prop="subCoursePrice"
         label="剩余金额"
       ></el-table-column>
     </el-table>
@@ -92,7 +96,7 @@ import pagination from "@/components/Pagination/index";
 import { queryDetailPage } from "./api";
 export default {
   name: "detail",
-  prop: ["userId"],
+  props: ["userId"],
   components: {
     pagination
   },

+ 3 - 3
src/views/courseCredentials/index.vue

@@ -14,7 +14,7 @@
       >
         <el-form-item prop="search">
           <el-input
-            placeholder="活动编号/来源"
+            placeholder="学生编号/姓名"
             clearable
             type="text"
             v-model.trim="searchForm.search"
@@ -241,7 +241,7 @@
     </div>
 
     <el-dialog :visible.sync="detailVisible" title="查看详情" width="900px">
-      <detail :userId="selectUserId" />
+      <detail v-if="detailVisible" :userId="selectUserId" />
     </el-dialog>
   </div>
 </template>
@@ -306,7 +306,7 @@ export default {
       this.search();
     },
     gotoDetail(row) {
-      console.log(row, "121212");
+      // console.log(row, "121212", row.userId);
       this.selectUserId = row.userId;
       this.detailVisible = true;
     }