Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/yfadmin_web

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,12 +144,12 @@
                         <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>
                     <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="学时证明"' :width='item.width'
-                    :prop="item.value"  :label="item.name">
+                    :prop="item.value"  :label="item.name" show-overflow-tooltip=true>
                     </el-table-column>
                 </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

@@ -6,7 +6,7 @@
     <section class="apply" v-loading="download_loading">
         <p>报名列表 > {{subject_item}} > 新办</p>
         <div class="filter">
-            <el-form label-width="75px" :inline="true" size="small">
+            <el-form label-width="75px" :inline="true" size="small" style="position:relative;">
                 <!-- <el-divider></el-divider> -->
                 <el-form-item label="培训项目">
                     <Subject v-if='subject_id' @subChange='subChange' :key="key" :subject_id='subject_id' />
@@ -17,6 +17,9 @@
                 <el-form-item label="联系电话">
                         <el-input placeholder="联系电话" v-model="form.phone"></el-input>
                 </el-form-item>
+                <el-form-item label="公司名称">
+                        <el-input placeholder="公司名称" v-model="form.company"></el-input>
+                </el-form-item>
                 <el-form-item label="报名时间">
                     <el-date-picker clearable
                     v-model="form.signup_time"
@@ -24,42 +27,38 @@
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                
-                <el-form-item label="发票类型">
+                <el-form-item label="发票类型" v-if="more_search">
                     <el-select v-model="form.bill_type" placeholder="请选择" clearable>
                         <el-option  label="不需要发票"  :value="0"></el-option>
                         <el-option  label="个人发票"  :value="1"></el-option>
                         <el-option  label="公司发票"  :value="2"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="领证方式" clearable>
+                <el-form-item label="领证方式" clearable v-if="more_search">
                     <el-select v-model="form.receive_card" placeholder="请选择">
                         <el-option  label="邮寄"  :value="1"></el-option>
                         <el-option  label="自取"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="考试设置">
+                <el-form-item label="考试设置" v-if="more_search">
                     <el-select v-model="form.set_exam_time" placeholder="请选择" clearable>
                         <el-option  label="已设置考试时间"  :value="1"></el-option>
                         <el-option  label="未设置考试时间"  :value="0"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="考试时间" >
+                <el-form-item label="考试时间" v-if="more_search">
                     <el-date-picker clearable
                     v-model="form.exam_time" value-format="yyyy-MM-dd"
                     type="date"
                     placeholder="选择日期">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="培训班级">
+                <el-form-item label="培训班级" v-if="more_search">
                     <el-select v-model="form.class_id" placeholder="请选择">
                         <el-option v-for="(item,index) in class_list" :key='index' :label="item.name"  :value="item.cid"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="公司名称">
-                        <el-input placeholder="公司名称" v-model="form.company"></el-input>
-                </el-form-item>
-                <el-form-item label="培训时间">
+                <el-form-item label="培训时间" v-if="more_search">
                     <el-date-picker clearable
                     v-model="form.train_time1"
                     type="daterange" value-format="yyyy-MM-dd"
@@ -69,6 +68,11 @@
                     </el-date-picker>
                 </el-form-item>
                 <el-form-item>
+                    <span @click="more_search=!more_search" style="font-size:12px;color:#999;cursor:pointer;">   高级搜索</span>
+                    <i v-if="!more_search" @click="more_search=!more_search" class="el-icon-arrow-down"></i>
+                    <i v-else="more_search" @click="more_search=!more_search" class="el-icon-arrow-up"></i>
+                </el-form-item>
+                <el-form-item style="">
                        <el-button  @click="list=[],getData()" type="primary" icon="el-icon-search">搜索</el-button>
                 </el-form-item>
                 
@@ -81,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>
@@ -90,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>
                 
@@ -118,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
@@ -146,13 +150,13 @@
                             <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>
                     <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="学时证明"' :width='item.width'
-                    :prop="item.value"  :label="item.name">
+                    :prop="item.value"  :label="item.name" show-overflow-tooltip=true>
                     </el-table-column>
                 </template>             
                 <el-table-column
@@ -240,7 +244,8 @@ export default {
       loading:false,
       subject_id:'',
       subject_item:'',
-      download_loading:false
+      download_loading:false,
+      more_search:false
     }
   },
   methods:{
@@ -270,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,14 +143,13 @@
                         <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>
                     <el-table-column :key='index' v-if='item.checked&&item.name!="状态"&&item.name!="学时证明"' :width='item.width'
-                    :prop="item.value"  :label="item.name">
+                    :prop="item.value"  :label="item.name" show-overflow-tooltip=true>
                     </el-table-column>
                 </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

src/views/project/Index.vue

@@ -120,7 +120,14 @@
                           <el-input v-model="form.class_hour"></el-input>
                           <span class="req">*</span>
                     </el-form-item>
-                    
+                    <el-form-item label="复审学时" v-if='form.isleaf'>
+                          <el-input v-model="form.update_class_hour"></el-input>
+                          <span class="req">*</span>
+                    </el-form-item>
+                    <el-form-item label="换证学时" v-if='form.isleaf'>
+                          <el-input v-model="form.change_class_hour"></el-input>
+                          <span class="req">*</span>
+                    </el-form-item>
                     <el-form-item label="排序">
                           <el-input-number v-model="form.order" controls-position="right" :min="0" ></el-input-number>
                     </el-form-item>
@@ -166,7 +173,9 @@ export default {
                 price_re:data.price_re,
                 intro:data.intro,
                 order:0,
-                class_hour:data.class_hour
+                class_hour:data.class_hour,
+                update_class_hour:data.update_class_hour,
+                change_class_hour:data.change_class_hour
           }
           if(!data.children || data.children.length<=0){
               parm.isleaf=1