update

src/views/apply/Change.vue

@@ -78,8 +78,8 @@
                 <el-tab-pane name="-2" label="审核未通过"></el-tab-pane>
                 <el-tab-pane name="1" 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="3" label="已培训，待考试"></el-tab-pane>
+                <el-tab-pane name="7" label="考试完成"></el-tab-pane>
                 <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
@@ -87,8 +87,8 @@
                 <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(7,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
-                <el-button @click="setStatus(3,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-button @click="setStatus(3,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
+                <el-button @click="setStatus(7,'考试完成')" size="small" type="success" >考试完成</el-button>
                 <el-button @click="setStatus(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
@@ -115,7 +115,7 @@
                 <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>
+                <!--<el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>-->
               
         </div>
         <el-table
@@ -144,7 +144,7 @@
                         <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="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>
+                        <el-button size="mini" v-if='scope.row.order_status==7' type="success">{{scope.row.order_status_1}}</el-button>
                         <el-button size="mini" v-if='scope.row.order_status==9' type="danger">{{scope.row.order_status_1}}</el-button>         
                     </template>
                     </el-table-column>
@@ -267,8 +267,8 @@ export default {
                     if(item.order_status == 0)status='待审核';
                     if(item.order_status == 1)status='已审核，待付款';
                     if(item.order_status == 2)status='已付款,待培训';
-                    if(item.order_status == 7)status='已培训,待考试';
-                    if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 3)status='已培训,待考试';
+                    if(item.order_status == 7)status='考试完成';
                     if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status

src/views/apply/Detail.vue

@@ -162,7 +162,7 @@
                 </ul>
                 <ul>
                     <li class="title">身份证正面照  <i @click="rotate(form.idnoimg_face,'idnoimg_face')" class="el-icon-refresh-right"></i></li>
-                    <img width="100%" :src="idnoimg_face" alt="">
+                    <img width="100%" :src="form.idnoimg_face" alt="">
                 </ul>
                 <ul>
                     <li class="title">身份证反面照 <i @click="rotate(form.idnoimg_back,'idnoimg_back')" class="el-icon-refresh-right"></i></li>
@@ -205,12 +205,12 @@ export default {
           })
       },
       rotate(url,key){
-          this.$api.rotateImg({url:url,id:this.form.id}).then(res=>{
+          this.$api.rotateImg({url:url.split("?")[0],id:this.form.id}).then(res=>{
               if(res.data.code==0){
-                    // let form=this.form;
-                    this.$set(this.form,key,res.data.data.url);
-                    // this.form=form;
-                    ths.idnoimg_face = res.data.data.url;
+                    let form=this.form;
+                    this.$set(this.form,key,res.data.data.url+"?v="+Date.parse(new Date()));
+                    this.form=form;
+                    this.idnoimg_face = res.data.data.url+"?v="+Date.parse(new Date());
                     this.$message({message: '旋转成功！',type: 'success'});
               }else{
                   this.$message.error(res.data.message);

src/views/apply/New.vue

@@ -85,8 +85,8 @@
                 <el-tab-pane name="-2" label="审核未通过"></el-tab-pane>
                 <el-tab-pane name="1" 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="3" label="已培训，待考试"></el-tab-pane>
+                <el-tab-pane name="7" label="考试完成"></el-tab-pane>
                 <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
@@ -94,8 +94,8 @@
                 <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(7,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
-                <el-button @click="setStatus(3,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-button @click="setStatus(3,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
+                <el-button @click="setStatus(7,'考试完成')" size="small" type="success" >考试完成</el-button>
                 <el-button @click="setStatus(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
@@ -122,7 +122,7 @@
                 <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>
+                <!--<el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>-->
               
         </div>
         <el-table
@@ -150,8 +150,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==7' type="warning">{{scope.row.order_status_1}}</el-button>   
+                            <el-button size="mini" v-if='scope.row.order_status==7' 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==9' type="danger">{{scope.row.order_status_1}}</el-button>    
                         </template>
                     </el-table-column>
@@ -275,8 +275,8 @@ export default {
                     if(item.order_status == 0)status='待审核';
                     if(item.order_status == 1)status='已审核，待付款';
                     if(item.order_status == 2)status='已付款,待培训';
-                    if(item.order_status == 7)status='已培训,待考试';
-                    if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 3)status='已培训,待考试';
+                    if(item.order_status == 7)status='考试完成';
                     if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status

src/views/apply/Update.vue

@@ -87,8 +87,8 @@
                 <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(7,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
-                <el-button @click="setStatus(3,'考试完成')" size="small" type="success" >考试完成</el-button>
+                <el-button @click="setStatus(3,'已培训,待考试')"  size="small" type="warning" >已培训,待考试</el-button>
+                <el-button @click="setStatus(7,'考试完成')" size="small" type="success" >考试完成</el-button>
                 <el-button @click="setStatus(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
@@ -115,7 +115,7 @@
                 <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>
+                <!--<el-button style="float:right;margin-right:5px" @click="setTime(3)" size="small" type="primary" >生成学时证明</el-button>-->
               
         </div>
         <el-table
@@ -143,9 +143,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==7' 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>
-                        <el-button size="mini" v-if='scope.row.order_status==7' type="warning">{{scope.row.order_status_1}}</el-button>
                         <el-button size="mini" v-if='scope.row.order_status==9' type="danger">{{scope.row.order_status_1}}</el-button>            
                     </template>
                     </el-table-column>
@@ -268,8 +267,8 @@ export default {
                     if(item.order_status == 0)status='待审核';
                     if(item.order_status == 1)status='已审核，待付款';
                     if(item.order_status == 2)status='已付款,待培训';
-                    if(item.order_status == 7)status='已培训,待考试';
-                    if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 3)status='已培训,待考试';
+                    if(item.order_status == 7)status='考试完成';
                     if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status