up

src/views/Home.vue

@@ -23,7 +23,7 @@
 		</el-header>
 		<el-container class="main">
 			<!-- 左侧菜单 -->
-			<el-aside class="left-aside" width="210px" v-if='info.id'>
+			<el-aside class="left-aside" width="295px" v-if='info.id'>
 				<el-menu :unique-opened='true'  :default-active="$route.path" router class="left-menue" active-text-color="#ffffff">
 					<template v-for="(item, index) in $router.options.routes">
 						<template v-if="index != 3">

src/views/apply/Change.vue

@@ -16,7 +16,7 @@
     
        }
        .el-button--small, .el-button--small.is-round {
-            padding: 9px 9px;
+            padding: 9px 5px;
         }
        .el-divider--horizontal{
            margin: 10px 0 20px;
@@ -138,7 +138,7 @@
                 <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="3" label="考试完成"></el-tab-pane>
+                <el-tab-pane name="4" label="考试完成"></el-tab-pane>
                 <!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
             </el-tabs>
         </div>
@@ -146,7 +146,7 @@
                 <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-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
                 <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
@@ -194,7 +194,8 @@
                         <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>         
+                        <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>
                     </el-table-column>
                     <el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
@@ -319,8 +320,9 @@ export default {
                     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 == 3)status='已完成';
+                    if(item.order_status == 2)status='已支付,学习中';
+                    if(item.order_status == 3)status='已培训,待考试';
+                    if(item.order_status == 4)status='考试完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify

src/views/apply/New.vue

@@ -16,7 +16,7 @@
     
        }
        .el-button--small, .el-button--small.is-round {
-            padding: 9px 9px;
+            padding: 9px 5px;
         }
        .el-divider--horizontal{
            margin: 10px 0 20px;
@@ -273,7 +273,7 @@ export default {
           {name:'更新时间', value:'ctime',checked:false,width:'170px'},
           {name:'发票类型', value:'bill_type_1',checked:false,width:'120px'},
           {name:'领证方式', value:'receive_card',checked:false},
-          {name:'实名认证', value:'verify_1',checked:true},
+          {name:'实名认证', value:'verify1',checked:true},
           {name:'ID', value:'id',checked:false},
       ],
       text:'批量设置培训时间',

src/views/apply/Update.vue

@@ -16,7 +16,7 @@
     
        }
        .el-button--small, .el-button--small.is-round {
-            padding: 9px 9px;
+            padding: 9px 5px;
         }
        .el-divider--horizontal{
            margin: 10px 0 20px;
@@ -138,7 +138,7 @@
                 <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="3" label="考试完成"></el-tab-pane>
+                <el-tab-pane name="4" label="考试完成"></el-tab-pane>
                 <!-- <el-tab-pane name="9" label="已取消"></el-tab-pane> -->
             </el-tabs>
         </div>
@@ -146,7 +146,7 @@
                 <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-button @click="setTime(1)" size="small" type="primary" >设置培训时间</el-button>
                 <el-button @click="setTime(2)" size="small" type="primary" >设置考试时间</el-button>
@@ -194,7 +194,8 @@
                         <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>         
+                        <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>
                     </el-table-column>
                     <el-table-column :key='index' v-if='item.checked&&item.name=="支付状态"' :width='item.width'
@@ -319,8 +320,9 @@ export default {
                     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 == 3)status='已完成';
+                    if(item.order_status == 2)status='已支付,学习中';
+                    if(item.order_status == 3)status='已培训,待考试';
+                    if(item.order_status == 4)status='考试完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify