tanyanfei 5 jaren geleden
bovenliggende
commit
c01a5b523b
5 gewijzigde bestanden met toevoegingen van 99 en 91 verwijderingen
  1. 22 25
      src/views/apply/Change.vue
  2. 25 28
      src/views/apply/New.vue
  3. 21 24
      src/views/apply/Update.vue
  4. 3 3
      src/views/user/Detail.vue
  5. 28 11
      src/views/user/Index.vue

+ 22 - 25
src/views/apply/Change.vue

@@ -72,34 +72,31 @@
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
-                <el-tab-pane name="-3" label="全部"></el-tab-pane>
-                <el-tab-pane name="0" label="待审核"></el-tab-pane>
-                <el-tab-pane name="2" label="已支付待培训"></el-tab-pane>
+                <el-tab-pane name="-3" label="报名列表"></el-tab-pane>
+                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
+                <el-tab-pane name="0" label="审核中"></el-tab-pane>
                 <el-tab-pane name="-2" label="审核未通过"></el-tab-pane>
                 <el-tab-pane name="1" label="待付款"></el-tab-pane>
-                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
-                <!-- <el-tab-pane name="7" label="已培训待考试"></el-tab-pane> -->
-                <el-tab-pane name="4" label="考试完成"></el-tab-pane>
-                <!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
+                <el-tab-pane name="2" label="已付款,待培训"></el-tab-pane>                
+                <el-tab-pane name="7" label="已培训待考试"></el-tab-pane>
+                <el-tab-pane name="3" label="考试完成"></el-tab-pane>
+                <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
         <div class="divider">
-                <el-button @click="setStatus(1,'审核通过')" size="small" type="success" >审核通过</el-button>
+                <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>
                 
                 
                 
                 &nbsp;
                 <el-button style="float:right" @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
                 &nbsp;&nbsp;
-                <el-dropdown  trigger="click" style="float:right;margin-right:10px">
+                <el-dropdown  trigger="click" style="float:right;margin-right:5px">
                     <el-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -112,10 +109,13 @@
                     </el-dropdown-menu>
                 </el-dropdown>
                 &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
+                <el-button style="float:right;margin-right:5px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
                &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
-
+                <el-button style="float:right;margin-right:5px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
+              
         </div>
         <el-table
                 class="table" :fit='true'
@@ -138,16 +138,13 @@
                         <el-button size="mini" v-if='scope.row.order_status==2' type="primary">{{scope.row.order_status_1}}</el-button> 
                         <el-button size="mini" v-if='scope.row.order_status==3' type="warning">{{scope.row.order_status_1}}</el-button>
                         <el-button size="mini" v-if='scope.row.order_status==4' type="success">{{scope.row.order_status_1}}</el-button>         
+                        <template  v-if='scope.row.order_status<2'>
+                            <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
+                            <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
+                        </template>   
                     </template>
                     </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
-                    :prop="item.value"  :label="item.name" :class-name="item.value">
-                    <template  slot-scope="scope">
-                        <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
-                        <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
-                    </template>
-                    </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             
@@ -210,7 +207,7 @@ export default {
           {name:'培训类型', value:'train_type',checked:true},
           {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-          {name:'支付状态', value:'pay_status_1',checked:true},
+        //   {name:'支付状态', value:'pay_status_1',checked:true},
           {name:'培训费用', value:'price',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},

+ 25 - 28
src/views/apply/New.vue

@@ -134,34 +134,31 @@
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
-                <el-tab-pane name="-3" label="全部"></el-tab-pane>
-                <el-tab-pane name="0" label="待审核"></el-tab-pane>
-                <el-tab-pane name="2" label="已支付待培训"></el-tab-pane>
+                <el-tab-pane name="-3" label="报名列表"></el-tab-pane>
+                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
+                <el-tab-pane name="0" label="审核中"></el-tab-pane>
                 <el-tab-pane name="-2" label="审核未通过"></el-tab-pane>
                 <el-tab-pane name="1" label="待付款"></el-tab-pane>
-                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
-                <!-- <el-tab-pane name="7" label="已培训待考试"></el-tab-pane> -->
+                <el-tab-pane name="2" label="已付款,待培训"></el-tab-pane>                
+                <el-tab-pane name="7" label="已培训待考试"></el-tab-pane>
                 <el-tab-pane name="3" label="考试完成"></el-tab-pane>
-                <!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
+                <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
         <div class="divider">
-                <el-button @click="setStatus(1,'审核通过')" size="small" type="success" >审核通过</el-button>
+                <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(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>
                 
                 
                 
                 &nbsp;
                 <el-button style="float:right" @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
                 &nbsp;&nbsp;
-                <el-dropdown  trigger="click" style="float:right;margin-right:10px">
+                <el-dropdown  trigger="click" style="float:right;margin-right:5px">
                     <el-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -174,10 +171,13 @@
                     </el-dropdown-menu>
                 </el-dropdown>
                 &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
+                <el-button style="float:right;margin-right:5px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
                &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
-
+                <el-button style="float:right;margin-right:5px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
+              
         </div>
         <el-table
                 class="table" :fit='true'
@@ -198,17 +198,14 @@
                         <el-button size="mini" v-if='scope.row.order_status==0' type="warning">{{scope.row.order_status_1}}</el-button> 
                         <el-button size="mini" v-if='scope.row.order_status==1' type="danger">{{scope.row.order_status_1}}</el-button> 
                         <el-button size="mini" v-if='scope.row.order_status==2' type="primary">{{scope.row.order_status_1}}</el-button> 
-                        <el-button size="mini" v-if='scope.row.order_status==3' type="success">{{scope.row.order_status_1}}</el-button>         
-                    </template>
-                    </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
-                    :prop="item.value"  :label="item.name" :class-name="item.value">
-                    <template  slot-scope="scope">
-                        <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
-                        <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
+                        <el-button size="mini" v-if='scope.row.order_status==3' type="success">{{scope.row.order_status_1}}</el-button>  
+                        <template  v-if='scope.row.order_status<2'>
+                            <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
+                            <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
+                        </template>       
                     </template>
                     </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             
@@ -262,7 +259,7 @@ export default {
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
-          {name:'状态', value:'order_status_1',checked:true,width:'120px'},
+          {name:'状态', value:'order_status_1',checked:true,width:'200px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
           {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
@@ -270,14 +267,14 @@ export default {
           {name:'培训类型', value:'train_type',checked:true},
           {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-          {name:'支付状态', value:'pay_status_1',checked:true},
+        //   {name:'支付状态', value:'pay_status_1',checked:true},
           {name:'培训费用', value:'price',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
           {name:'更新时间', value:'ctime',checked:false,width:'170px'},
           {name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
           {name:'领证方式', value:'receive_card',checked:false},
-          {name:'实名认证', value:'verify1',checked:true},
+          {name:'实名认证', value:'verify_1',checked:true},
           {name:'ID', value:'id',checked:false},
       ],
       class_list:[],
@@ -323,8 +320,8 @@ export default {
                     if(item.order_status == -2)status='审核未通过';
                     if(item.order_status == -1)status='待提交资料';
                     if(item.order_status == 0)status='待审核';
-                    if(item.order_status == 1)status='审核通过待付款';
-                    if(item.order_status == 2)status='学习中';
+                    if(item.order_status == 1)status='已审核,待付款';
+                    if(item.order_status == 2)status='已支付,学习中';
                     if(item.order_status == 3)status='已完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status

+ 21 - 24
src/views/apply/Update.vue

@@ -72,34 +72,31 @@
                 <el-divider></el-divider>
             </el-form>
             <el-tabs v-model="order_status" @tab-click="tabClick">
-                <el-tab-pane name="-3" label="全部"></el-tab-pane>
-                <el-tab-pane name="0" label="待审核"></el-tab-pane>
-                <el-tab-pane name="2" label="已支付待培训"></el-tab-pane>
+                <el-tab-pane name="-3" label="报名列表"></el-tab-pane>
+                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
+                <el-tab-pane name="0" label="审核中"></el-tab-pane>
                 <el-tab-pane name="-2" label="审核未通过"></el-tab-pane>
                 <el-tab-pane name="1" label="待付款"></el-tab-pane>
-                <el-tab-pane name="-1" label="待上传资料"></el-tab-pane>
-                <!-- <el-tab-pane name="7" label="已培训待考试"></el-tab-pane> -->
-                <el-tab-pane name="4" label="考试完成"></el-tab-pane>
-                <!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
+                <el-tab-pane name="2" label="已付款,待培训"></el-tab-pane>                
+                <el-tab-pane name="7" label="已培训待考试"></el-tab-pane>
+                <el-tab-pane name="3" label="考试完成"></el-tab-pane>
+                <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
         <div class="divider">
-                <el-button @click="setStatus(1,'审核通过')" size="small" type="success" >审核通过</el-button>
+                <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>
                 
                 
                 
                 &nbsp;
                 <el-button style="float:right" @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
                 &nbsp;&nbsp;
-                <el-dropdown  trigger="click" style="float:right;margin-right:10px">
+                <el-dropdown  trigger="click" style="float:right;margin-right:5px">
                     <el-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -112,10 +109,13 @@
                     </el-dropdown-menu>
                 </el-dropdown>
                 &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
+                <el-button style="float:right;margin-right:5px" @click="download('apply')"  size="small" type="info" >导出学员申报资料</el-button>
                &nbsp;&nbsp;
-                <el-button style="float:right;margin-right:10px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
-
+                <el-button style="float:right;margin-right:5px" @click="download('exam')" size="small" type="success" >导出考勤表与申报考试表</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
+                <el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>
+              
         </div>
         <el-table
                 class="table" :fit='true'
@@ -138,16 +138,13 @@
                         <el-button size="mini" v-if='scope.row.order_status==2' type="primary">{{scope.row.order_status_1}}</el-button> 
                         <el-button size="mini" v-if='scope.row.order_status==3' type="warning">{{scope.row.order_status_1}}</el-button>
                         <el-button size="mini" v-if='scope.row.order_status==4' type="success">{{scope.row.order_status_1}}</el-button>         
+                        <template  v-if='scope.row.order_status<2'>
+                            <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
+                            <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
+                        </template>   
                     </template>
                     </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
-                    :prop="item.value"  :label="item.name" :class-name="item.value">
-                    <template  slot-scope="scope">
-                        <el-button size="mini" v-if='scope.row.pay_status==0' type="danger">{{scope.row.pay_status_1}}</el-button> 
-                        <el-button size="mini" v-if='scope.row.pay_status==1' type="success">{{scope.row.pay_status_1}}</el-button> 
-                    </template>
-                    </el-table-column>
-                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             

+ 3 - 3
src/views/user/Detail.vue

@@ -57,11 +57,11 @@
 <template>
     <section class="edit">
         <p>实名认证列表  >  认证详情 </p>
-        <div class="detail" v-if='form.id'>   
+        <div class="detail" v-if='form.user_id'>   
            <ul>
                <li class="title">认证信息 <el-tag size="mini" effect="dark">证</el-tag></li>   
                <li>
-                   姓名  <span>{{form.realname}}</span>
+                   姓名  <span>{{form.name}}</span>
                </li>
                <li>
                    性别  <span>{{form.sex}}</span>
@@ -117,7 +117,7 @@ export default {
   methods:{
       getData(){
           this.$api.getUser({id:this.id}).then(res=>{
-              this.form=res.data.data
+              this.form=JSON.parse(res.data.data.userinfo);
           })
       },
     

+ 28 - 11
src/views/user/Index.vue

@@ -50,13 +50,9 @@
         <el-table
                 class="table"
                 :data="list"
-                border 
+                border  height="65vh"
                 style="width: 100%">
                 <el-table-column
-                prop="nickname"
-                label="昵称">
-                </el-table-column>
-                <el-table-column
                 prop="avatar"
                 label="头像">
                 <template slot-scope="scope">
@@ -64,21 +60,37 @@
                 </template>
                 </el-table-column>
                 <el-table-column
-                prop="openid"
+                prop="nickname" width="150px"
+                label="昵称">
+                </el-table-column>
+                 <el-table-column
+                prop="openid" width="200px"
                 label="openid">
                 </el-table-column>
                 <el-table-column
-                prop="verify"
+                prop="verify" width="150px"
                 label="实名认证">
                 <template slot-scope="scope">
-                  <el-tag size="mini" v-if='scope.row.verify' type="success">已认证</el-tag>
+                  <el-tag size="mini" v-if='scope.row.userinfo' type="success">已认证</el-tag>
                   <el-tag size="mini" v-else type="info">未认证</el-tag>
                   &nbsp;&nbsp;
-                  <el-tag @click="$router.push({path:'/user/detail',query:{id:scope.row.id}})"  size="mini" effect="dark" v-if='scope.verify'>查看</el-tag>
+                  <el-tag @click="$router.push({path:'/user/detail',query:{id:scope.row.id}})"  size="mini" effect="dark" v-if='scope.row.userinfo'>查看</el-tag>
                 </template>
                 </el-table-column>
                 <el-table-column
-                prop="ctime"
+                prop="userinfo.name"
+                label="姓名">
+                </el-table-column>
+                <el-table-column
+                prop="userinfo.phone" width="130px"
+                label="手机号">
+                </el-table-column>
+                <el-table-column width="180px"
+                prop="userinfo.idno"
+                label="身份证号">
+                </el-table-column>            
+                <el-table-column
+                prop="ctime" width="200px"
                 label="注册时间">
                 </el-table-column>
         </el-table>
@@ -111,8 +123,13 @@ export default {
       getData(){
          var parm=this.form;
           this.$api.getUserList(parm).then(res=>{
-              this.list=res.data.data.list
+              let list=res.data.data.list
               this.total=res.data.data.total
+              for(let i=0;i<list.length;i++){
+                list[i].userinfo=JSON.parse(list[i].userinfo)
+              }
+              this.list=list;
+              console.log(list)
           })
       }
   },