up

src/views/apply/Change.vue

@@ -1,62 +1,4 @@
-<style lang="scss">
-    .apply{
-       .filter{
-            background: #fff;
-            padding: 20px 20px 10px; 
-            border:1px solid #EDEDED;
-            border-radius:2px;
-            margin-bottom: 10px;
-            margin-top: 10px;
-            .el-form-item{
-                margin-bottom: 10px;
-            }
-            .el-input,.el-select{
-                width: 150px;
-            }
-    
-       }
-       .el-button--small, .el-button--small.is-round {
-            padding: 9px 5px;
-        }
-       .el-divider--horizontal{
-           margin: 10px 0 20px;
-       }
-       .divider{
-        //    margin-bottom: 15px;
-           background: #fff;
-           padding: 10px;
-       }
-       thead{
-           th{
-               background: #eee;
-           }
-       }   
-       .el-button--warning {
-        color: #FFF;
-        background-color: #FFB800;
-        border-color: #FFB800;
-        }
-        .el-button--info {
-        color: #FFF;
-        background-color: #393D49;
-        border-color: #393D49;
-        }  
-    }
-    .checkList{
-           padding:0 10px;
-           label{
-               margin: 5px 0;
-           }
-    }
-    .table{
-        button{
-            padding:6px;
-        }
-    }
-    .el-table__fixed-right::before, .el-table__fixed::before{
-        background: none;
-    }
-</style>
+
 <template>
     <section class="apply">
         <p>报名列表 > {{subject_item}} > 换证</p>
@@ -106,12 +48,11 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="培训班级">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
+                <el-form-item label="培训班级">
+                    <el-select v-model="form.class_id" placeholder="请选择">
+                        <el-option v-for="(item,index) in class_list" :key='index' :label="item.name"  :value="item.cid"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="公司名称">
                         <el-input placeholder="公司名称" v-model="form.company"></el-input>
                 </el-form-item>
@@ -148,10 +89,11 @@
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
                 <el-button @click="setStatus(3,'已培训')"  size="small" type="warning" >已培训,待考试</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-divider  direction="vertical"></el-divider>
                 <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
                 <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-button @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
-                <el-divider  direction="vertical"></el-divider>
+                
                 
                 
                 &nbsp;
@@ -256,6 +198,7 @@ export default {
     return{
       key:1,
       checkList:[],
+      class_list:[],
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
@@ -533,6 +476,9 @@ export default {
     },
   },
   created(){
+      this.$api.getClass({page_size:1000}).then(res=>{
+          this.class_list=res.data.data.list;
+      })
       this.subject_id=this.$route.path.split('/')[2]
       this.$api.getSubList().then(res=>{
           let data=res.data.data;

src/views/apply/New.vue

@@ -15,9 +15,7 @@
             }
     
        }
-       .el-button--small, .el-button--small.is-round {
-            padding: 9px 5px;
-        }
+       
        .el-divider--horizontal{
            margin: 10px 0 20px;
        }
@@ -25,6 +23,12 @@
         //    margin-bottom: 15px;
            background: #fff;
            padding: 10px;
+           .el-button--small, .el-button--small.is-round {
+                padding: 9px 5px;
+            }
+            .el-button+.el-button{
+                margin-left: 5px;
+            }
        }
        thead{
            th{
@@ -106,12 +110,11 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="培训班级">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
+                <el-form-item label="培训班级">
+                    <el-select v-model="form.class_id" placeholder="请选择">
+                        <el-option v-for="(item,index) in class_list" :key='index' :label="item.name"  :value="item.cid"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="公司名称">
                         <el-input placeholder="公司名称" v-model="form.company"></el-input>
                 </el-form-item>
@@ -146,12 +149,13 @@
                 <el-button @click="setStatus(1,'审核通过')" size="small" type="success" >审核通过</el-button>
                 <el-button @click="setStatus(-2,'审核不通过')" size="small" type="info" >审核不通过</el-button>
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
-                <el-button @click="setStatus(3,'已培训')"  size="small" type="warning" >已培训</el-button>
+                <el-button @click="setStatus(3,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-divider  direction="vertical"></el-divider>
                 <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
                 <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-button @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
-                <el-divider  direction="vertical"></el-divider>
+                
                 
                 
                 &nbsp;
@@ -276,6 +280,7 @@ export default {
           {name:'实名认证', value:'verify1',checked:true},
           {name:'ID', value:'id',checked:false},
       ],
+      class_list:[],
       text:'批量设置培训时间',
       date_type:1,
       time1:null,
@@ -531,6 +536,9 @@ export default {
     },
   },
   created(){
+      this.$api.getClass({page_size:1000}).then(res=>{
+          this.class_list=res.data.data.list;
+      })
       this.subject_id=this.$route.path.split('/')[2]
       this.$api.getSubList().then(res=>{
           let data=res.data.data;

src/views/apply/Update.vue

@@ -1,62 +1,4 @@
-<style lang="scss">
-    .apply{
-       .filter{
-            background: #fff;
-            padding: 20px 20px 10px; 
-            border:1px solid #EDEDED;
-            border-radius:2px;
-            margin-bottom: 10px;
-            margin-top: 10px;
-            .el-form-item{
-                margin-bottom: 10px;
-            }
-            .el-input,.el-select{
-                width: 150px;
-            }
-    
-       }
-       .el-button--small, .el-button--small.is-round {
-            padding: 9px 5px;
-        }
-       .el-divider--horizontal{
-           margin: 10px 0 20px;
-       }
-       .divider{
-        //    margin-bottom: 15px;
-           background: #fff;
-           padding: 10px;
-       }
-       thead{
-           th{
-               background: #eee;
-           }
-       }   
-       .el-button--warning {
-        color: #FFF;
-        background-color: #FFB800;
-        border-color: #FFB800;
-        }
-        .el-button--info {
-        color: #FFF;
-        background-color: #393D49;
-        border-color: #393D49;
-        }  
-    }
-    .checkList{
-           padding:0 10px;
-           label{
-               margin: 5px 0;
-           }
-    }
-    .table{
-        button{
-            padding:6px;
-        }
-    }
-    .el-table__fixed-right::before, .el-table__fixed::before{
-        background: none;
-    }
-</style>
+
 <template>
     <section class="apply">
         <p>报名列表 > {{subject_item}} > 复审</p>
@@ -106,12 +48,11 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <!-- <el-form-item label="培训班级">
-                    <el-select v-model="form.a" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
+                <el-form-item label="培训班级">
+                    <el-select v-model="form.class_id" placeholder="请选择">
+                        <el-option v-for="(item,index) in class_list" :key='index' :label="item.name"  :value="item.cid"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="公司名称">
                         <el-input placeholder="公司名称" v-model="form.company"></el-input>
                 </el-form-item>
@@ -148,10 +89,11 @@
                 <el-button @click="setStatus(2,'已付款')" size="small" type="primary" >已付款</el-button>
                 <el-button @click="setStatus(3,'已培训')"  size="small" type="warning" >已培训,待考试</el-button>
                 <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-divider  direction="vertical"></el-divider>
                 <el-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
                 <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
                 <el-button @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
-                <el-divider  direction="vertical"></el-divider>
+                
                 
                 
                 &nbsp;
@@ -256,6 +198,7 @@ export default {
     return{
       key:1,
       checkList:[],
+      class_list:[],
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
@@ -533,6 +476,9 @@ export default {
     },
   },
   created(){
+      this.$api.getClass({page_size:1000}).then(res=>{
+          this.class_list=res.data.data.list;
+      })
       this.subject_id=this.$route.path.split('/')[2]
       this.$api.getSubList().then(res=>{
           let data=res.data.data;

src/views/classes/Index.vue

@@ -21,6 +21,14 @@
            }
        }
     }
+    .table{
+        button{
+            padding:6px;
+        }
+    }
+    .el-table__fixed-right::before, .el-table__fixed::before{
+        background: none;
+    }
 </style>
 <template>
     <section class="apply">
@@ -52,11 +60,11 @@
                 width="55">
                 </el-table-column> -->
                 <el-table-column
-                prop="name"
+                prop="name"  width="200"
                 label="班级名称">
                 </el-table-column>
                 <el-table-column
-                prop="subject_item"
+                prop="subject_item" width="300"
                 label="培训项目">
                 </el-table-column>
                 <el-table-column
@@ -75,10 +83,11 @@
                 prop="ctime"  width="200"
                 label="创建时间">
                 </el-table-column>
-                <el-table-column
-                prop="zip"  width="150"
+                <el-table-column fixed="right"
+                prop="zip"  width="200"
                 label="操作">
                 <template slot-scope="scope">
+                    <el-button @click="download(scope.row.id)" size="mini"  type="success">导出学员</el-button>
                     <el-button @click="$router.push({path:'/classes/add',query:{id:scope.row.id}})" size="mini" type="warning">编辑</el-button>
                     <el-button @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>

src/views/user/Index.vue

@@ -64,6 +64,10 @@
                 </template>
                 </el-table-column>
                 <el-table-column
+                prop="openid"
+                label="openid">
+                </el-table-column>
+                <el-table-column
                 prop="verify"
                 label="实名认证">
                 <template slot-scope="scope">