Merge branches 'master' and 'master' of 172.18.101.172:dedema/school-center-ui

src/views/school-center/hhr-report/hhrReport.vue

@@ -5,7 +5,7 @@
             <!-- 搜索区域 -->
             <a-form layout="inline">
                 <a-row :gutter="24">
-                    <a-col :md="12" :sm="12">
+                    <a-col :md="6" :sm="12">
                         <a-form-item  label="时间选择：">
                             <a-range-picker @change="onChange" />
                         </a-form-item>
@@ -17,7 +17,6 @@
                     <a-button v-show="callback" style="margin-left: 10px">导出中<a-spin  style="margin-left: 5px" size="small"/></a-button>
                         </a-col>
                     </span>
-
                 </a-row>
             </a-form>
            </div>
@@ -48,10 +47,14 @@
                     endTime  :''
                 },
                 columns: [
+                    {title: '县分',
+                        dataIndex: 'subName',
+                        width: 80,
+                        fixed : 'left'
+                        },
                     {title:'时间',
                     children: [
                         {title:'业务类型',children: [
-                            {dataIndex: 'subName', width: 80, title: '县分'},
                             {dataIndex: 'schoolNum', width: 80, title: '学校数'},
                             {dataIndex: 'studentNum', width: 80, title: '学生数'}
                         ]}
@@ -149,6 +152,9 @@
             },
             handleSubmit() {
                 this.callback=true;
+                var today = new Date();
+                today.setTime(today.getTime());
+                var s2 = today.getFullYear()+"-" + (today.getMonth()+1) + "-" + today.getDate();
                 exportFile(reportDownload(), "一人一码统计报表" + nowdate + ".xlsx",this.downloadstatu);
             },
             downloadstatu(){

src/views/school-center/order/order.vue

@@ -79,10 +79,17 @@
                     <a-col :md="6" :sm="12">
                         <a-button @click="search()" type="primary">查询</a-button>
                         <a-button  v-show="!callback" @click="handleSubmit" style="margin-left: 10px">导出</a-button>
-                        <a-button v-show="callback" style="margin-left: 10px">导出中<a-spin  style="margin-left: 5px" size="small"/></a-button>
-                        <a-button @click="handleSubmit1" type="primary" style="margin-left: 5px">批量处理</a-button>
-                        <a-button   @click="handleSubmit2" type="primary" style="margin-left: 5px">快递</a-button>
+                        <a-button v-show="callback"  @click="handleSubmit" style="margin-left: 10px">导出中<a-spin  style="margin-left: 5px" size="small"/></a-button>
+                        <a-dropdown>
+                            <a-menu slot="overlay" @click="handleMenuClick">
+                                <a-menu-item key="1"><a-icon type="arrow-up" /> 批量处理</a-menu-item>
+                                <a-menu-item key="2"><a-icon type="arrow-up" /> 快递</a-menu-item>
+                            </a-menu>
+                            <a-button style="margin-left: 8px">导入<a-icon type="down" /> </a-button>
+                        </a-dropdown>
                     </a-col>
+
+
                 </a-row>
             </a-form>
            </div>
@@ -468,6 +475,14 @@
         },
         methods:{
             moment,
+            handleMenuClick(e){
+              if (e.key == '1'){
+                  this.handleSubmit1()
+              }
+                if (e.key == '2'){
+                    this.handleSubmit2()
+                }
+            },
             reviewStudentIdCard(res){
                 this.reviewStudentImg=res.studenCard
                 /*this.reviewStudentImg =this.baseUrl+'abstract0'+1+'.jpg'*/
@@ -679,6 +694,9 @@
                 }
             },
             handleSubmit() {
+                if (this.callback==true){
+                    this.$message.warn("正在导出中...", 5);
+                }
                 let downqueryParam=this.queryParam
                 let nowdate = moment().format('YYYY-MM-DD');
                 this.callback=true;