update

src/views/apply/Change.vue

@@ -135,7 +135,7 @@
                 class="table"
                 :data="list"
                  @selection-change="handleSelectionChange"
-                border 
+                border  v-loading="loading"
                 style="width: 100%">
                 <el-table-column
                 type="selection" fixed="left"
@@ -238,7 +238,8 @@ export default {
       order_status:'-3',
       ids:[],
       dialogVisible:false,
-      url:''
+      url:'',
+      loading:false
     }
   },
   methods:{
@@ -247,11 +248,13 @@ export default {
             this.getData()
         },
       getData(){
+          this.loading=true
           var parm=this.form;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       },
       subChange(data){

src/views/apply/New.vue

@@ -130,10 +130,12 @@
                 <el-divider  direction="vertical"></el-divider>
                 <el-button @click="download('exam')" size="small" type="warning" >导出考勤表与申报考试表</el-button>
                 <el-button @click="download('apply')"  size="small" type="warning" >导出学员申报资料</el-button>
+                <el-divider  direction="vertical"></el-divider>
+                <el-button type="primary" size="mini" plain icon="el-icon-printer"></el-button>
         </div>
         <el-table
                 class="table"
-                :data="list"
+                :data="list" v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
                 style="width: 100%">
@@ -197,7 +199,7 @@
         <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
 
         <el-dialog
-            :title="text"
+            :title="text" 
             :visible.sync="dialogVisible"
             width="30%">
             <el-date-picker
@@ -238,7 +240,8 @@ export default {
       order_status:'-3',
       ids:[],
       dialogVisible:false,
-      url:''
+      url:'',
+      loading:false
     }
   },
   methods:{
@@ -248,10 +251,12 @@ export default {
         },
       getData(){
           var parm=this.form;
+          this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       },
       subChange(data){

src/views/apply/Update.vue

@@ -133,7 +133,7 @@
         </div>
         <el-table
                 class="table"
-                :data="list"
+                :data="list"   v-loading="loading"
                  @selection-change="handleSelectionChange"
                 border 
                 style="width: 100%">
@@ -238,7 +238,8 @@ export default {
       order_status:'-3',
       ids:[],
       dialogVisible:false,
-      url:''
+      url:'',
+      loading:false
     }
   },
   methods:{
@@ -248,10 +249,12 @@ export default {
         },
       getData(){
           var parm=this.form;
+          this.loading=true;
           if(this.order_status != '-3'){parm.order_status=this.order_status}
           this.$api.getSignList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       },
       subChange(data){

src/views/classes/Add.vue

@@ -10,7 +10,7 @@
         <p>培训计划  >  班级管理  >  新增班级</p>
         <div class="content">
             <el-form label-width="80px">
-                <el-form-item label="培训项目" v-if="id">
+                <el-form-item label="培训项目" v-if="id!=''">
                     <Subject v-if='form.signup_limit' :subvalue='form.subject_item' @subChange='subChange'/>
                 </el-form-item>
                 <el-form-item label="培训项目" v-else>
@@ -40,7 +40,8 @@ export default {
     },
   data(){
     return{
-      form:{name:''}
+      form:{name:''},
+      id:''
     }
   },
   methods:{

src/views/classes/Index.vue

@@ -45,7 +45,7 @@
         <el-table
                 class="table"
                 :data="list"
-                border 
+                border  v-loading="loading"
                 style="width: 100%">
                 <!-- <el-table-column
                 type="selection" fixed="left"
@@ -99,7 +99,8 @@ export default {
       form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[]
+      list:[],
+      loading:false
     }
   },
   methods:{
@@ -109,9 +110,11 @@ export default {
       },
       getData(){
           var parm=this.form;
+          this.loading=true
           this.$api.getClass(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       },
       subChange(data){

src/views/paper/Index.vue

@@ -45,7 +45,7 @@
         <el-table
                 class="table"
                 :data="list"
-                border 
+                border  v-loading="loading"
                 style="width: 100%">
                 <el-table-column
                 prop="title"
@@ -92,7 +92,8 @@ export default {
       form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[]
+      list:[],
+      loading:false
     }
   },
   methods:{
@@ -105,9 +106,11 @@ export default {
       },
       getData(){
          var parm=this.form;
+         this.loading=true
           this.$api.getPaperList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       }
   },

src/views/project/Index.vue

@@ -55,18 +55,18 @@
         <p>项目管理 >  培训科目</p>
         <div class="content">
             <div class="div_left">
-                 <el-tree
+                 <el-tree  v-loading="loading"
                     :data="data"
                     node-key="id" :props='props'
                     default-expand-all
                     :expand-on-click-node="false">
-                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                    <span class="custom-tree-node" slot-scope="{ node, data }" @click.stop="() => edit(data)" >
                         <span class="label_name">{{ node.label }}</span>
                         <span class="edit">
                         <el-button
                             type="text"
                             size="mini"
-                            @click="() => append(data)">
+                            @click.stop="() => append(data)">
                             <i class="el-icon-plus"></i>
                         </el-button>
                         <el-button
@@ -125,13 +125,16 @@ export default {
       props:{
           label:'name'
       },
-      add:0
+      add:0,
+      loading:false
     }
   },
   methods:{
       getData(){
+          this.loading=true
           this.$api.getSubList().then(res=>{
               this.data=res.data.data
+              this.loading=false
           })
       },
       edit(data){

src/views/videos/Index.vue

@@ -28,71 +28,50 @@
         <div class="filter">
             <el-form label-width="80px" :inline="true" size="small">
                 <el-form-item label="视频名称">
-                        <el-input placeholder="视频名称" v-model="form.name"></el-input>
+                        <el-input placeholder="视频名称" v-model="form.title"></el-input>
                 </el-form-item>
-                <el-form-item label="培训项目">
-                    <el-select v-model="form.a1" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="作业类别">
-                    <el-select v-model="form.a1" placeholder="请选择">
-                        <el-option  label="邮寄"  :value="0"></el-option>
-                        <el-option  label="自取"  :value="0"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="准操项目">
-                    <el-select v-model="form.a1" placeholder="请选择">
-                        <el-option  label="不需要发票"  :value="0"></el-option>
-                        <el-option  label="纸质发票"  :value="0"></el-option>
-                    </el-select>
+                <el-form-item label="类别">
+                    <Subject @subChange='subChange'/>
                 </el-form-item>
              
                 <el-form-item>
-                       <el-button type="primary" icon="el-icon-search">搜索</el-button>
-                       <el-button type="primary">新增视频</el-button>
+                       <el-button @click="getData" type="primary" icon="el-icon-search">搜索</el-button>
+                       <el-button type="primary">新增</el-button>
                 </el-form-item>
             </el-form>
         </div>
 
 
         <el-table
+                class="table"
                 :data="list"
-                border 
+                border  v-loading="loading"
                 style="width: 100%">
                 <el-table-column
-                type="selection" fixed="left"
-                width="55">
-                </el-table-column>
-                <el-table-column
-                prop="name"
+                prop="title"
                 label="视频名称">
                 </el-table-column>
                 <el-table-column
-                prop="province"
+                prop="subject_item"
                 label="培训项目">
                 </el-table-column>
                 <el-table-column
-                prop="city"
-                label="试题">
-                </el-table-column>
-                <el-table-column
-                prop="zip"
+                prop="exam_time"
                 label="考试时间">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="total_score"
                 label="满分">
                 </el-table-column>
                 <el-table-column
-                prop="zip"
+                prop="ctime"
                 label="创建时间">
                 </el-table-column>
                 <el-table-column
                 prop="zip" width="250"
                 label="操作">
-                <template>
+                <template slot-scope="scope">
+                    <el-button @click="$router.push({path:'/papers/detail',query:{id:scope.row.id}})"  size="mini" type="success">查看</el-button>
                     <el-button size="mini" type="warning">编辑</el-button>
                     <el-button size="mini"  type="danger">删除</el-button>
                 </template>
@@ -103,17 +82,18 @@
 </template>
 <script>
 import Page from '../../components/Page';
-// import { Base64 } from 'js-base64';
+import Subject from '../../components/Subject';
 export default {
   components:{
-        Page
+        Page,Subject
     },
   data(){
     return{
       form:{name:'',page:1},
       activeName:"1",
       total:1,
-      list:[]
+      list:[],
+      loading:false
     }
   },
   methods:{
@@ -121,16 +101,21 @@ export default {
           this.form.page=this.$refs.pageButton.page
           this.getData()
       },
+      subChange(data){
+          this.form.subject_item=data.join('|')
+      },
       getData(){
          var parm=this.form;
+         this.loading=true
           this.$api.getPaperList(parm).then(res=>{
               this.list=res.data.data.list
               this.total=res.data.data.total
+              this.loading=false
           })
       }
   },
   created(){
-  
+      this.getData()
   }
 }
 </script>