update

src/views/Home.vue

@@ -12,7 +12,7 @@
 <template>
 	<el-container>
 		<el-header class="header">
-			<h1>巴中逸沣安全培训</h1>
+			<!--<h1>巴中逸沣安全培训</h1>-->
 			<!-- <img class="logo" src="../images/logo.png" alt=""> -->
 			<div class="settings">
 				<span>
@@ -23,18 +23,18 @@
 		</el-header>
 		<el-container class="main">
 			<!-- 左侧菜单 -->
-			<el-aside class="left-aside" width="295px" v-if='info.id'>
+			<el-aside class="left-aside" width="220px" v-if='info.id'>
 				<el-menu :unique-opened='true'  :default-active="$route.path" router class="left-menue" active-text-color="#ffffff">
 					<template v-for="(item, index) in $router.options.routes">
 						<template v-if="index != 3">
 							<el-menu-item v-if='item.show&&item.isLeaf' :index="item.path"  :key='index' v-show="permission(item.name)">
 								<i :class="item.icon"></i>
-								<span slot="title">{{item.name}}</span>
+								<span slot="title">{{item.name|ellipsis}}</span>
 							</el-menu-item>
 							<el-submenu v-if='item.show&&!item.isLeaf' v-show="permission(item.name)" :index="'index_'+index"  :key='index'>
 								<template slot="title">
 								<i :class="item.icon"></i>
-								<span>{{item.name}}</span>
+								<span>{{item.name|ellipsis}}</span>
 								</template>
 								<el-menu-item-group>
 									<el-menu-item class="child" v-for="(child,idx) in item.children" :key="index+'_'+idx" :index="child.path" v-show='!child.hide'>
@@ -47,7 +47,7 @@
 							<el-submenu v-for="(sub,id) in menu" v-show="permission(sub.name)" :index="'index_'+index+'_'+id"  :key='index+"_"+id'>
 								<template slot="title">
 								<i :class="sub.icon"></i>
-								<span>{{sub.name}}</span>
+								<span>{{sub.name|ellipsis}}</span>
 								</template>
 								<el-menu-item-group>
 									<el-menu-item class="child" v-for="(child,idx) in sub.children" :key="index+'_'+idx" :index="child.path">
@@ -72,6 +72,15 @@
 
 <script>
 export default {
+	filters: {
+    	ellipsis (value) {
+		if (!value) return ''
+		if (value.length > 8) {
+			return value.slice(0,8) + '...'
+		}
+		return value
+		}
+	},
 	name: 'home',
 	data() {
 		return {

src/views/apply/Change.vue

@@ -138,10 +138,6 @@
                         <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>         
-                        <template  v-if='scope.row.order_status<2'>
-                            <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>   
                     </template>
                     </el-table-column>
                     <el-table-column :key='index' v-if='item.checked&&item.name!="状态"' :width='item.width'
@@ -152,9 +148,9 @@
                 prop="zip" width="220" fixed="right"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button @click="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
-                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  size="mini" type="success">查看</el-button>
+                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  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="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
                     <el-button @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>
                 </el-table-column>
@@ -207,8 +203,8 @@ export default {
           {name:'培训类型', value:'train_type',checked:true},
           {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-        //   {name:'支付状态', value:'pay_status_1',checked:true},
-          {name:'培训费用', value:'price',checked:true},
+          {name:'支付状态', value:'pay_status_1',checked:true},
+          {name:'支付金额', value:'price',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
           {name:'更新时间', value:'ctime',checked:false,width:'170px'},
@@ -259,10 +255,10 @@ 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 == 2)status='已支付,学习中';
-                    if(item.order_status == 3)status='已培训,待考试';
-                    if(item.order_status == 4)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='已完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify

src/views/apply/Detail.vue

@@ -112,7 +112,7 @@
                    税号  <span>{{form.bill_no}}</span>
                </li>
                <li>
-                   单位名称  <span>{{form.company}}</span>
+                   单位名称  <span>{{form.bill_name}}</span>
                </li>
            </ul>
            <div>

src/views/apply/New.vue

@@ -83,15 +83,15 @@
                 <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">
                 <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="warning" >已培训,待考试</el-button>
-                <el-button @click="setStatus(4,'考试完成')" size="small" type="success" >考试完成</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-divider  direction="vertical"></el-divider>
                 
                 
@@ -131,22 +131,26 @@
                 width="40">
                 </el-table-column>
                 <template v-for="(item,index) in itemList" >
+                    <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">
+                            <a v-if="scope.row.classhour_cert_url" target="_blank" :href="scope.row.classhour_cert_url"><img width=100 height=80 :src="scope.row.classhour_cert_url" /></a>       
+                            <span v-else>未生成</span>
+                        </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.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  v-if='scope.row.order_status<2'>
-                            <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>       
-                    </template>
+                        <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>
+                            <el-button size="mini" v-if='scope.row.order_status==7' type="warning">{{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'
+                    <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>             
@@ -154,9 +158,9 @@
                 prop="zip" width="220" fixed="right"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button @click="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
-                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  size="mini" type="success">查看</el-button>
+                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  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="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
                     <el-button @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>
                 </el-table-column>
@@ -206,10 +210,11 @@ export default {
           {name:'作业类别', value:'subject_item1',checked:true,width:'150px'},
           {name:'准操项目', value:'subject_item2',checked:true,width:'200px'},
           {name:'培训类型', value:'train_type',checked:true},
+          {name:'学时证明', value:'classhour_cert_url',checked:true,width:'150px'},
           {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
-        //   {name:'支付状态', value:'pay_status_1',checked:true},
-          {name:'培训费用', value:'price',checked:true},
+          {name:'支付状态', value:'pay_status_1',checked:true},
+          {name:'支付金额', value:'price',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
           {name:'更新时间', value:'ctime',checked:false,width:'170px'},
@@ -262,7 +267,8 @@ export default {
                     if(item.order_status == -1)status='待提交资料';
                     if(item.order_status == 0)status='待审核';
                     if(item.order_status == 1)status='已审核，待付款';
-                    if(item.order_status == 2)status='已支付，学习中';
+                    if(item.order_status == 2)status='已付款,待培训';
+                    if(item.order_status == 7)status='已培训,待考试';
                     if(item.order_status == 3)status='已完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status

src/views/apply/Update.vue

@@ -138,10 +138,6 @@
                         <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>         
-                        <template  v-if='scope.row.order_status<2'>
-                            <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>   
                     </template>
                     </el-table-column>
                     <el-table-column :key='index' v-if='item.checked&&item.name!="状态"' :width='item.width'
@@ -152,9 +148,9 @@
                 prop="zip" width="220" fixed="right"
                 label="操作">
                 <template slot-scope="scope">
-                    <el-button @click="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
-                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  size="mini" type="success">查看</el-button>
+                    <el-button @click="$router.push({path:'/sign/detail',query:{id:scope.row.id}})"  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="mark(scope.row.id,scope.row.remark)" size="mini" type="primary">备注</el-button>
                     <el-button @click="del(scope.row.id)" size="mini"  type="danger">删除</el-button>
                 </template>
                 </el-table-column>
@@ -208,7 +204,7 @@ export default {
           {name:'培训时间', value:'train_time',checked:true,width:'200px'},
           {name:'考试时间', value:'exam_time',checked:true,width:'150px'},
           {name:'支付状态', value:'pay_status_1',checked:true},
-          {name:'培训费用', value:'price',checked:true},
+          {name:'支付金额', value:'price',checked:true},
           {name:'报名时间', value:'signup_time',checked:true,width:'150px'},
           {name:'公司名称', value:'company',checked:true,width:'200px'},
           {name:'更新时间', value:'ctime',checked:false,width:'170px'},
@@ -259,10 +255,10 @@ 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 == 2)status='已支付,学习中';
-                    if(item.order_status == 3)status='已培训,待考试';
-                    if(item.order_status == 4)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='已完成';
                     item.order_status_1=status
                     item.pay_status_1=pay_status
                     item.verify_1=verify

src/views/project/Index.vue

@@ -166,6 +166,7 @@ export default {
                 price_re:data.price_re,
                 intro:data.intro,
                 order:0,
+                class_hour:data.class_hour
           }
           if(!data.children || data.children.length<=0){
               parm.isleaf=1