Merge branch '0601Action' into test

src/views/teamBuild/components/newForecast-list.vue

@@ -19,7 +19,12 @@
         <el-form-item>
           <el-button type="danger" native-type="seach">搜索</el-button>
           <!-- <el-button native-type="reset" type="primary">重置</el-button> -->
-          <el-button @click="exporOrPreList" type="primary" v-permission="'studentRegistration/registerOrPreListExport'">导出</el-button>
+          <el-button
+            @click="exporOrPreList"
+            type="primary"
+            v-permission="'studentRegistration/registerOrPreListExport'"
+            >导出</el-button
+          >
         </el-form-item>
       </save-form>
       <div class="tableWrap">
@@ -55,7 +60,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="预报名时间差" >
+          <el-table-column align="center" label="预报名时间差">
             <template slot-scope="scope">
               {{ scope.row.perRegIntervalStr }}
             </template>
@@ -101,7 +106,7 @@ import pagination from "@/components/Pagination/index";
 import { getRegisterOrPreList } from "../api";
 import cleandeep from "clean-deep";
 import moment from "moment";
-import{Export}  from "@/utils/downLoadFile";
+import { Export } from "@/utils/downLoadFile";
 
 export default {
   name: "forecastName",
@@ -178,18 +183,20 @@ export default {
         return "--";
       }
     },
-    exporOrPreList(){
-       let params = this.searchForm;
+    exporOrPreList() {
+      let params = this.searchForm;
       Export(
         this,
         {
           method: "get",
           url: "/api-web/studentRegistration/registerOrPreListExport",
-          params:{...params, musicGroupId: this.musicGroupId,}
+          params: { ...params, musicGroupId: this.musicGroupId },
+          fileName: "时间数据统计.xls",
         },
+
         "是否导出时间数据统计？"
       );
-    }
+    },
   },
 };
 </script>

src/views/teamBuild/signupList.vue

@@ -270,6 +270,17 @@
             <el-option label="否" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model.trim="searchFrom.payingStatus"
+            clearable
+            filterable
+            placeholder="缴费中状态"
+          >
+            <el-option label="缴费中" :value="1"></el-option>
+            <el-option label="预约中" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <!-- 专业actualSubjectId 调剂isAllowAdjust 手机号name -->
         <el-form-item>
           <el-button type="danger" native-type="search">搜索</el-button>
@@ -335,6 +346,13 @@
                 </el-tooltip>
               </p>
             </template>
+            <template slot-scope="scope">
+              <div>
+                <el-button type="text" @click="getCheckNum(scope.row)">{{
+                  scope.row.checkNum
+                }}</el-button>
+              </div>
+            </template>
           </el-table-column>
         </el-table>
         <div
@@ -423,7 +441,7 @@
           <!-- v-show='status == "PAY"' -->
           <el-table-column
             label="报名缴费状态"
-            fixed="right"
+
             prop="paymentStatus"
             align="center"
           >
@@ -433,6 +451,18 @@
               </div>
             </template>
           </el-table-column>
+                  <el-table-column
+            label="订单状态"
+
+            prop="payingStatus"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.payingStatus | filtersPayingStatus }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column
             label="是否购买云教练"
             fixed="right"
@@ -1115,6 +1145,16 @@ export default {
   activated() {
     this.init();
   },
+  filters:{
+    filtersPayingStatus(val){
+      let obj ={
+        0:'--',
+        1:'缴费中',
+        2:'预约中'
+      }
+      return obj[val]
+    }
+  },
   methods: {
     permission(str) {
       return permission(str);
@@ -1786,6 +1826,14 @@ export default {
         }
       });
     },
+    getCheckNum(row) {
+      console.log(row);
+      this.searchFrom.subject = row.subjectId;
+      // this.searchFrom.paymentStatus = 1+'';
+      this.searchFrom.payingStatus = 2
+      this.searchFrom.hasCloudTeacher = 0;
+      this.search()
+    },
   },
   watch: {
     "quitForm.isMaintenanceFee"(val) {
@@ -1843,6 +1891,7 @@ export default {
         this.$refs["quitForm"].resetFields();
       }
     },
+
     // visitVisiable(val) {
     //   if (!val) {
     //     this.$refs["visitForm"].resetFields();