xiaojincai 5 anos atrás
pai
commit
2bc8a87a5e
3 arquivos alterados com 13 adições e 4 exclusões
  1. 4 1
      src/views/apply/Change.vue
  2. 5 2
      src/views/apply/New.vue
  3. 4 1
      src/views/apply/Update.vue

+ 4 - 1
src/views/apply/Change.vue

@@ -89,6 +89,7 @@
                 <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(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
                 
@@ -143,7 +144,8 @@
                         <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==4' 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'
@@ -267,6 +269,7 @@ export default {
                     if(item.order_status == 2)status='已付款,待培训';
                     if(item.order_status == 7)status='已培训,待考试';
                     if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify

+ 5 - 2
src/views/apply/New.vue

@@ -83,7 +83,7 @@
                 <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="9" label="已取消"></el-tab-pane>-->
+                <el-tab-pane name="9" label="已取消"></el-tab-pane>
             </el-tabs>
         </div>
         <div class="divider">
@@ -92,6 +92,7 @@
                 <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(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
                 
@@ -146,7 +147,8 @@
                             <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="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'
@@ -270,6 +272,7 @@ export default {
                     if(item.order_status == 2)status='已付款,待培训';
                     if(item.order_status == 7)status='已培训,待考试';
                     if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify

+ 4 - 1
src/views/apply/Update.vue

@@ -89,6 +89,7 @@
                 <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(9,'已取消')" size="small" type="danger" >已取消</el-button>
                 <el-divider  direction="vertical"></el-divider>
                 
                 
@@ -144,7 +145,8 @@
                         <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="warning">{{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'
@@ -268,6 +270,7 @@ export default {
                     if(item.order_status == 2)status='已付款,待培训';
                     if(item.order_status == 7)status='已培训,待考试';
                     if(item.order_status == 3)status='已完成';
+                    if(item.order_status == 9)status='已取消';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify