update

src/api.js

@@ -67,13 +67,27 @@ export default{
 	deleteSub: params => {
 		return axios.delete(`${baseURL}/api/admin/subject`, params);
 	},
-	//科目
+	//报名信息
 	getSignList: params => {
 		return axios.get(`${baseURL}/api/admin/signup/list`, {
 			params: params
 		})
 	},
-	
+	getSign: params => {
+		return axios.get(`${baseURL}/api/admin/signup`, {
+			params: params
+		})
+	},
+	updateSign: params => {
+		return axios.put(`${baseURL}/api/admin/signup`, params);
+	},
+	updateSignStu: params => {
+		return axios.put(`${baseURL}/api/admin/signup/upstate`, params);
+	},
+	deleteSign: params => {
+		return axios.delete(`${baseURL}/api/admin/signup/upstate`, params);
+	},
+
 	
 }
 

src/components/Subject.vue

@@ -9,7 +9,7 @@
 <template>
     <el-cascader  class="sub" :props='props'
     placeholder="请选择培训科目 / 作业类别 / 准操项目"
-    v-model="value" @change="handleChange"
+    v-model="value1" @change="handleChange"
     :options="data"></el-cascader>
 </template>
 <script>
@@ -17,7 +17,7 @@ export default {
     data(){
         return{
             data:[],
-            value:[],
+            value1:[],
             props:{
                 label:'name',
                 checkStrictly:true,
@@ -26,7 +26,7 @@ export default {
         }
     },
     props: {
-        total:'',
+        value:'',
     },
     methods:{
         getData(type){
@@ -41,6 +41,10 @@ export default {
     },
     created(){
         this.getData()
+        if(this.value){
+            this.value1=this.value.split('|')
+            console.log(this.value1)
+        }
     }
 }
 </script>

src/router.js

@@ -64,7 +64,8 @@ export default new Router({
       isLeaf:0,
       children:[
         { path: '/new', component: () => import('./views/apply/New.vue'), name: '新办' },
-        { path: '/edit', component: () => import('./views/apply/Edit.vue'), name: '修改' },
+        { path: '/sign/detail',hide:0, component: () => import('./views/apply/Detail.vue'), name: '修改' },
+        { path: '/sign/edit',hide:1, component: () => import('./views/apply/Edit.vue'), name: '修改' },
       ]
     },
     {

src/views/Home.vue

@@ -33,7 +33,7 @@
                   <span>{{item.name}}</span>
                 </template>
                 <el-menu-item-group >
-                  	<el-menu-item v-for="(child,idx) in item.children" :key="index+'_'+idx" :index="child.path">
+                  	<el-menu-item v-for="(child,idx) in item.children" :key="index+'_'+idx" :index="child.path" v-show='!child.hide'>
 					  {{child.name}}
 					</el-menu-item>
                 </el-menu-item-group>

src/views/apply/Detail.vue

@@ -0,0 +1,76 @@
+<style lang="scss">
+    .detail{
+        display: flex;
+        justify-content: space-between;
+        margin-top: 20px;
+        ul{
+            width: 32%;
+            background: #fff;
+            padding: 15px;
+            li{
+                list-style: none;
+                color: #666;
+                margin: 10px 0;
+                span{
+                    float: right;
+                }
+            }
+        }
+    }
+</style>
+<template>
+    <section class="edit">
+        <p>报名信息  >  报名详情 </p>
+        <div class="detail">
+           <ul>
+               <li class="title">报名信息</li>
+               <li>
+                   报名状态  <span>待上传资料</span>
+               </li>
+           </ul>
+           <ul>
+               <li class="title">报名信息</li>
+               <li>
+                   报名状态  <span>待上传资料</span>
+               </li>
+           </ul>
+           <ul>
+               <li class="title">报名信息</li>
+               <li>
+                   报名状态  <span>待上传资料</span>
+               </li>
+           </ul>
+        </div>
+    </section>
+</template>
+<script>
+export default {
+
+  data(){
+    return{
+      form:{},
+      radios:1,
+      edu:["小学", "初中", "高中", "大专", "本科","硕士","博士"]
+    }
+  },
+  methods:{
+      getData(){
+          this.$api.getSign({id:this.form.id}).then(res=>{
+              this.form=res.data.data
+          })
+      },
+    
+  },
+  created(){
+      if(this.$route.query.id){
+            this.form.id=this.$route.query.id
+            this.getData()
+        }
+  }
+}
+</script>
+
+
+
+
+

src/views/apply/Edit.vue

@@ -1,11 +1,19 @@
 <style lang="scss">
     .edit{
-        .el-input,button{
+        .el-input{
             width: 300px;
+            position: relative;
         }
-        label{
+        .gou{
+                font-size: 20px;
+                position: absolute;
+                color: red;
+                left: -30px;
+        }
+        .el-form-item__label{
             font-size: 16px;
             font-weight: 600;
+            padding-right: 40px;
         }
     }
 </style>
@@ -13,36 +21,39 @@
     <section class="edit">
         <p>报名信息  >  修改信息 </p>
         <div class="content">
-            <el-form label-width="90px" label-position="left">
-                <el-form-item label="报名身份">
-                    <el-radio-group v-model="form.radio">
-                            <el-radio :label="3">备选项</el-radio>
-                            <el-radio :label="6">备选项</el-radio>
-                            <el-radio :label="9">备选项</el-radio>
-                    </el-radio-group>
+            <el-form label-width="110px">
+                <el-form-item label="报名身份" v-if="form.name">
+                    <span v-show="form.subject_item" class="gou">✓</span>
+                    <Subject :value='form.subject_item' @subChange='subChange'/>
                 </el-form-item>
                 <el-form-item label="姓名">
+                         <span v-show="form.name" class="gou">✓</span>
                         <el-input placeholder="姓名" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="性别">
-                    <el-radio-group v-model="radio">
-                            <el-radio :label="1">男</el-radio>
-                            <el-radio :label="2">女</el-radio>
+                    <span v-show="form.sex" class="gou">✓</span>
+                    <el-radio-group v-model="form.sex">
+                            <el-radio label="男">男</el-radio>
+                            <el-radio label="女">女</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="身份证">
-                        <el-input placeholder="身份证" v-model="form.name"></el-input>
+                        <span v-show="form.idno" class="gou">✓</span>
+                        <el-input placeholder="身份证" v-model="form.idno"></el-input>
                 </el-form-item>
                 <el-form-item label="手机号">
+                        <span v-show="form.phone" class="gou">✓</span>
                         <el-input  v-model="form.phone"></el-input>
                 </el-form-item>
                 <el-form-item label="文化程度">
-                    <el-select v-model="form.a" placeholder="请选择">
+                    <span v-show="form.education" class="gou">✓</span>
+                    <el-select v-model="form.education" placeholder="请选择">
                         <el-option v-for="(item,index) in edu" :key='index' :label="item"  :value="item"></el-option>
                     </el-select>
                 </el-form-item>
                 
                 <el-form-item label="单位全称">
+                    <span v-show="form.company" class="gou">✓</span>
                         <el-input  v-model="form.company"></el-input>
                 </el-form-item>
                 <el-form-item label="发票类型">
@@ -53,27 +64,39 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="发票方式">
-                          <el-radio v-model="form.bill_type" label="1">备选项</el-radio>
+                          <el-radio v-model="form.bill_type" label="1">纸质发票</el-radio>
                 </el-form-item>
                 <el-form-item label="领证方式">
-                    <el-radio-group v-model="form.radio">
-                            <el-radio :label="1">自取</el-radio>
-                            <el-radio :label="2">邮寄(将产生邮寄费用)</el-radio>
+                    <el-radio-group v-model="form.receive_card">
+                            <el-radio label="自取">自取</el-radio>
+                            <el-radio label="邮寄">邮寄(将产生邮寄费用)</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="地区">
-                    <el-select v-model="form.bill_type" placeholder="请选择" clearable>
-                        <el-option  label="不需要发票"  :value="0"></el-option>
+                <el-form-item label="地区" v-if='form.receive_card=="邮寄"'>
+                    <span v-show="form.area" class="gou">✓</span>
+                    <el-select v-model="form.area" placeholder="请选择" clearable>
+                        <el-option  label="重庆"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="详细地址">
+                <el-form-item label="详细地址" v-if='form.receive_card=="邮寄"'>
+                    <span v-show="form.address" class="gou">✓</span>
                         <el-input  v-model="form.address"></el-input>
                 </el-form-item>
-                <el-form-item label="作业类别">
-                    <Subject @subChange='subChange'/>
+                
+                <el-form-item label="正面照">
+                        <el-button type="warning">上传</el-button>
                 </el-form-item>
-                <el-form-item label=" ">
-                        <el-button type="primary">保存</el-button>
+                <el-form-item label="反面照">
+                        <el-button type="warning">上传</el-button>
+                </el-form-item>
+                <el-form-item label="上半身照">
+                        <el-button type="warning">上传</el-button>
+                </el-form-item>
+                <el-form-item label="学历照">
+                        <el-button type="warning">上传</el-button>
+                </el-form-item>
+                <el-form-item label=" " >
+                        <el-button @click="save" style="width:300px" type="primary">保存</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -87,15 +110,37 @@ export default {
     },
   data(){
     return{
-      form:{name:1},
+      form:{},
+      radios:1,
       edu:["小学", "初中", "高中", "大专", "本科","硕士","博士"]
     }
   },
   methods:{
-      gopage(){}
+      getData(){
+          this.$api.getSign({id:this.form.id}).then(res=>{
+              this.form=res.data.data
+          })
+      },
+      subChange(data){
+          this.form.subject_item=data.join('|')
+      },
+      save(){
+          var parm=this.form
+          this.$api.updateSign(parm).then(res=>{
+                if(res.data.code==0){
+                      this.$message({message: '修改成功！',type: 'success'});
+                      this.$router.push({path:'/new'})
+                  }else{
+                      this.$message.error(res.data.message);
+                  }
+          })
+      }
   },
   created(){
-  
+      if(this.$route.query.id){
+            this.form.id=this.$route.query.id
+            this.getData()
+        }
   }
 }
 </script>

src/views/apply/New.vue

@@ -29,6 +29,11 @@
            }
        }
     }
+    .table{
+        button{
+            padding:6px;
+        }
+    }
 </style>
 <template>
     <section class="apply">
@@ -113,9 +118,12 @@
             </el-tabs>
         </div>
         <div class="divider">
-                <el-button size="small" type="success" >审核通过</el-button><el-button size="small" type="info" >审核不通过</el-button>
-                <el-button size="small" type="primary" >已付款</el-button><el-button size="small" type="danger" >已培训</el-button>
-                <el-button size="small" type="success" >考试完成</el-button><el-button size="small" type="primary" >设置培训时间</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="danger" >已培训</el-button>
+                <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-button size="small" type="primary" >设置培训时间</el-button>
                 <el-button size="small" type="primary" >设置考试时间</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 <el-button size="small" type="warning" >导出考勤表与申报考试表</el-button>
@@ -125,14 +133,15 @@
         <el-table
                 class="table"
                 :data="list"
+                 @selection-change="handleSelectionChange"
                 border 
                 style="width: 100%">
                 <el-table-column
                 type="selection" fixed="left"
-                width="55">
+                width="40">
                 </el-table-column>
                 <el-table-column
-                prop="name"
+                prop="name" width="100"
                 label="姓名">
                 </el-table-column>
                 <el-table-column
@@ -148,7 +157,8 @@
                     <el-tag v-if='scope.row.order_status == 0' type="warning">待审核</el-tag>
                     <el-tag v-if='scope.row.order_status == 1' >已审核立即支付</el-tag>
                     <el-tag v-if='scope.row.order_status == 2' type="warning">学习中</el-tag>
-                    <el-tag v-if='scope.row.order_status == 3' type="success">已完成</el-tag>
+                    <el-tag v-if='scope.row.order_status == 3' type="success">已培训</el-tag>
+                    <el-tag v-if='scope.row.order_status == 4' type="success">已完成</el-tag>
                     <!-- -2:审核未通过,-1:待提交资料，0：待审核，1：已审核立即支付，2：学习中，3：已完成 -->
                 </template>
                 </el-table-column>
@@ -173,12 +183,13 @@
                 label="培训类型">
                 </el-table-column>
                 <el-table-column
-                prop="zip" width="230"
+                prop="zip" width="220" fixed="right"
                 label="操作">
-                <template>
-                    <el-button size="mini" type="success">查看</el-button>
-                    <el-button size="mini" type="warning">编辑</el-button>
-                    <el-button size="mini"  type="danger">删除</el-button>
+                <template slot-scope="scope">
+                    <el-button @click="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
+                    <el-button  size="mini" type="success">查看</el-button>
+                    <el-button @click="$router.push({path:'/sign/edit',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>
                 </el-table-column>
         </el-table>
@@ -199,7 +210,8 @@ export default {
       activeName:"1",
       total:1,
       list:[],
-      order_status:'-3'
+      order_status:'-3',
+      ids:[]
     }
   },
   methods:{
@@ -220,6 +232,73 @@ export default {
           this.form.order_status=tab.name
           this.list=[]
           this.getData()
+      },
+      del(id){
+            this.$confirm('确定删除吗', '提示', {
+                    type: 'warning'
+                }).then(() => {
+                   this.$api.deleteSign({id:id}).then((res)=>{
+                        this.$message({
+                            message: '删除成功',
+                            type: 'success'
+                        })
+                        this.getData()
+                })
+            })
+      },
+      mark(id,val){
+          this.$prompt('', '管理员备注', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            inputValue:val,
+            }).then(({ value }) => {
+                this.$api.updateSign({id:id,remark:value}).then(res=>{
+                        if(res.data.code==0){
+                            this.$message({message: '备注成功！',type: 'success'});
+                            this.getData()
+                        }else{
+                            this.$message.error(res.data.message);
+                        }
+                })
+            })
+      },
+      handleSelectionChange(val) {
+          this.ids=val      
+          console.log(val)
+      },
+      setStatus(type,text){
+          var ids=[],val=this.ids;
+          for(let i=0;i<val.length;i++){
+              ids.push(val[i].id)
+          }
+          var id = ids.join(',');
+        if(val.length>0){
+            this.$confirm('确定修改状态为'+text, '提示', {
+                    type: 'warning'
+                }).then(() => {
+                   this.$api.updateSignStu({id:id,order_status:type}).then((res)=>{
+                        this.$message({
+                            message: '修改成功',
+                            type: 'success'
+                        })
+                        this.getData()
+                })
+            })
+        }else{
+            this.$message.error('请选择数据');
+        }
+      },
+      setTime(text){
+          var ids=[],val=this.ids;
+          for(let i=0;i<val.length;i++){
+              ids.push(val[i].id)
+          }
+          var id = ids.join(',');
+        if(val.length>0){
+            
+        }else{
+            this.$message.error('请选择数据');
+        }
       }
   },
   created(){