up

src/api.js

@@ -97,7 +97,7 @@ export default {
 		return axios.put(`${baseURL}/api/admin/signup/upstate`, params);
 	},
 	deleteSign: params => {
-		return axios.delete(`${baseURL}/api/admin/signup/upstate`, {params:params});
+		return axios.delete(`${baseURL}/api/admin/signup`, {params:params});
 	},
 	downloadzip: params => {
 		return axios.get(`${baseURL}/api/admin/signup/downloadzip`, {

src/style/_base.scss

@@ -22,4 +22,4 @@
    border-radius: 10px;
    // box-shadow: inset 0 0 6px rgba(0,0,0,.3);
    background-color: #999;
-}
+}

src/views/apply/Change.vue

@@ -27,7 +27,17 @@
            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;
@@ -51,7 +61,7 @@
             <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="培训项目">
-                    <Subject v-if='subject_id' @subChange='subChange' :subject_id='subject_id' />
+                    <Subject v-if='subject_id' @subChange='subChange' :key="key" :subject_id='subject_id' />
                 </el-form-item>
                 <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -133,15 +143,17 @@
                 <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="danger" >已培训</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>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
-                <el-divider  direction="vertical"></el-divider>
-                <el-dropdown  trigger="click">
+                
+                
+                &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-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -153,8 +165,11 @@
                         </div>
                     </el-dropdown-menu>
                 </el-dropdown>
-                &nbsp;
-                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
+                &nbsp;&nbsp;
+                <el-button style="float:right;margin-right:10px" @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>
+
         </div>
         <el-table
                 class="table"
@@ -167,7 +182,25 @@
                 width="40">
                 </el-table-column>
                 <template v-for="(item,index) in itemList" >
-                    <el-table-column :key='index' v-if='item.checked' :width='item.width'
+                    <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.order_status==-2' type="warning">{{scope.row.order_status_1}}</el-button>     
+                        <el-button size="mini" v-if='scope.row.order_status==-1' type="warning">{{scope.row.order_status_1}}</el-button> 
+                        <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> 
+                    </template>
+                    </el-table-column>
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             
@@ -216,11 +249,12 @@ export default {
     },
   data(){
     return{
+      key:1,
       checkList:[],
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
-          {name:'状态', value:'order_status_1',checked:true},
+          {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
           {name:'作业类别', value:'subject_item1',checked:true},
@@ -275,7 +309,7 @@ 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 == 1)status='审核通过待付款';
                     if(item.order_status == 2)status='学习中';
                     if(item.order_status == 3)status='已完成';
                     item.order_status_1=status
@@ -460,12 +494,11 @@ export default {
       }
   },
   watch:{
-    $route(to){
+    $route(to){      
         this.subject_id=false;
         this.$nextTick(()=>{
             this.subject_id=to.path.split('/')[2];
         })
-        this.subject_id=to.path.split('/')[2]
         this.$api.getSubList().then(res=>{
           let data=res.data.data;
             for(let i=0;i<data.length;i++){
@@ -475,7 +508,7 @@ export default {
                 }
             }
             this.getData()
-      })
+        })
     },
   },
   created(){

src/views/apply/New.vue

@@ -27,7 +27,17 @@
            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;
@@ -133,15 +143,17 @@
                 <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="danger" >已培训</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>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
-                <el-divider  direction="vertical"></el-divider>
-                <el-dropdown  trigger="click">
+                
+                
+                &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-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -153,8 +165,11 @@
                         </div>
                     </el-dropdown-menu>
                 </el-dropdown>
-                &nbsp;
-                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
+                &nbsp;&nbsp;
+                <el-button style="float:right;margin-right:10px" @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>
+
         </div>
         <el-table
                 class="table"
@@ -167,7 +182,25 @@
                 width="40">
                 </el-table-column>
                 <template v-for="(item,index) in itemList" >
-                    <el-table-column :key='index' v-if='item.checked' :width='item.width'
+                    <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.order_status==-2' type="warning">{{scope.row.order_status_1}}</el-button>     
+                        <el-button size="mini" v-if='scope.row.order_status==-1' type="warning">{{scope.row.order_status_1}}</el-button> 
+                        <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> 
+                    </template>
+                    </el-table-column>
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             
@@ -221,7 +254,7 @@ export default {
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
-          {name:'状态', value:'order_status_1',checked:true},
+          {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
           {name:'作业类别', value:'subject_item1',checked:true},
@@ -276,7 +309,7 @@ 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 == 1)status='审核通过待付款';
                     if(item.order_status == 2)status='学习中';
                     if(item.order_status == 3)status='已完成';
                     item.order_status_1=status

src/views/apply/Update.vue

@@ -27,7 +27,17 @@
            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;
@@ -51,7 +61,7 @@
             <el-form label-width="75px" :inline="true" size="small">
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="培训项目">
-                    <Subject v-if='subject_id' @subChange='subChange' :subject_id='subject_id' />
+                    <Subject v-if='subject_id' @subChange='subChange' :key="key" :subject_id='subject_id' />
                 </el-form-item>
                 <el-form-item label="姓名" label-width="40px">
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
@@ -133,15 +143,17 @@
                 <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="danger" >已培训</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>
                 <el-divider  direction="vertical"></el-divider>
-                <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
-                <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
-                <el-divider  direction="vertical"></el-divider>
-                <el-dropdown  trigger="click">
+                
+                
+                &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-button type="primary" size="mini"  plain icon="el-icon-finished">
                     </el-button>
                     <el-dropdown-menu slot="dropdown">
@@ -153,8 +165,11 @@
                         </div>
                     </el-dropdown-menu>
                 </el-dropdown>
-                &nbsp;
-                <el-button @click="print" type="primary" size="mini" plain icon="el-icon-printer"></el-button>
+                &nbsp;&nbsp;
+                <el-button style="float:right;margin-right:10px" @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>
+
         </div>
         <el-table
                 class="table"
@@ -167,7 +182,25 @@
                 width="40">
                 </el-table-column>
                 <template v-for="(item,index) in itemList" >
-                    <el-table-column :key='index' v-if='item.checked' :width='item.width'
+                    <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.order_status==-2' type="warning">{{scope.row.order_status_1}}</el-button>     
+                        <el-button size="mini" v-if='scope.row.order_status==-1' type="warning">{{scope.row.order_status_1}}</el-button> 
+                        <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> 
+                    </template>
+                    </el-table-column>
+                    <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="支付状态"' :width='item.width'
                     :prop="item.value"  :label="item.name">
                     </el-table-column>
                 </template>             
@@ -216,11 +249,12 @@ export default {
     },
   data(){
     return{
+      key:1,
       checkList:[],
       itemList:[
           {name:'姓名', value:'name',checked:true},
           {name:'联系电话', value:'phone',checked:true,width:'120px'},
-          {name:'状态', value:'order_status_1',checked:true},
+          {name:'状态', value:'order_status_1',checked:true,width:'120px'},
           {name:'管理员备注', value:'remark',checked:true,width:'150px'},
           {name:'报名类型', value:'subject_item0',checked:true,width:'120px'},
           {name:'作业类别', value:'subject_item1',checked:true},
@@ -275,7 +309,7 @@ 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 == 1)status='审核通过待付款';
                     if(item.order_status == 2)status='学习中';
                     if(item.order_status == 3)status='已完成';
                     item.order_status_1=status
@@ -460,12 +494,11 @@ export default {
       }
   },
   watch:{
-    $route(to){
+    $route(to){      
         this.subject_id=false;
         this.$nextTick(()=>{
             this.subject_id=to.path.split('/')[2];
         })
-        this.subject_id=to.path.split('/')[2]
         this.$api.getSubList().then(res=>{
           let data=res.data.data;
             for(let i=0;i<data.length;i++){
@@ -475,7 +508,7 @@ export default {
                 }
             }
             this.getData()
-      })
+        })
     },
   },
   created(){

src/views/project/Index.vue

@@ -104,15 +104,15 @@
                         <el-input v-model="form.name"></el-input>
                         <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="新办价格">
+                    <el-form-item label="新办价格" v-if='form.isleaf'>
                           <el-input-number v-model="form.price_new" controls-position="right"  :min="0"></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="复审价格">
+                    <el-form-item label="复审价格" v-if='form.isleaf'>
                           <el-input-number v-model="form.price_re" controls-position="right" :min="0" ></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>
-                    <el-form-item label="换证价格">
+                    <el-form-item label="换证价格" v-if='form.isleaf'>
                           <el-input-number v-model="form.price_change" controls-position="right" :min="0" ></el-input-number>
                           <span class="req">*</span>
                     </el-form-item>
@@ -162,6 +162,11 @@ export default {
                 intro:data.intro,
                 order:0,
           }
+          if(!data.children || data.children.length<=0){
+              parm.isleaf=1
+          }else{
+              parm.isleaf=0
+          }
           this.form=parm
       },
       append(data){
@@ -175,6 +180,11 @@ export default {
                 intro:'',
                 order:0,
           }
+          if(!data.children || data.children.length<=0){
+              parm.isleaf=1
+          }else{
+              parm.isleaf=0
+          }
           this.form=parm
       },
       remove(data){

src/views/user/Index.vue

@@ -67,7 +67,7 @@
                 prop="verify"
                 label="实名认证">
                 <template slot-scope="scope">
-                  <el-tag size="mini" v-if='scope.verify' type="success">已认证</el-tag>
+                  <el-tag size="mini" v-if='scope.row.verify' 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>