Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/views/daily/performanceReport/index.vue

@@ -7,11 +7,17 @@
       <div class="search" v-condition>
         <SearchButton :app='app'></SearchButton>
         <el-row :gutter="20" class="search-row-1">
-          <el-col :span="6" class="search-col">
+          <!--<el-col :span="6" class="search-col">
             <div class="search-item">
               <span class="search-span">事务类型:</span>
               <el-select></el-select>
             </div>
+          </el-col>-->
+          <el-col :span="6" class="search-col">
+            <div class="search-item">
+              <span class="search-span">状态:</span>
+              <RelSelect src='aqgl/rcgl/lzbg/init/zt' clearable :match="{value:'id',label:'name'}" v-model='queryParams.zt'></RelSelect>
+            </div>
           </el-col>
           <el-col :span="6" class="search-col">
             <div class="search-item">
@@ -56,7 +62,7 @@
       <!-- tabs -->
       <el-tabs v-model="activeName" @tab-click="handleClick"  >
     <el-tab-pane label="履职报告" name="first" >
-             <Report :mapp="app" ref="report"  />
+             <Report  v-show="tabData.length>0" :mapp="app" ref="report"  />
     </el-tab-pane>
       </el-tabs>
   </div>
@@ -102,7 +108,8 @@
        queryParams: {
        	info: '',
         ksrq:new Date().getTime()-1000*60*60*24*30,
-        jsrq:new Date().getTime()
+        jsrq:new Date().getTime(),
+        zt:''
        },
         /* 表格标题对应参数*/
         tableTitle: [
@@ -120,6 +127,7 @@
       getRow: function(e) {
         this.rowItem = e
         this.$refs.report.queryParams.rwid=e.id
+        this.$refs.report.queryParams.zt=this.queryParams.zt
         this.$refs.report.$refs.TablePager.pageQuery()
 
       },

src/views/daily/performanceReport/report.vue

@@ -74,6 +74,7 @@
 
 		/* 初始额外赋值*/
 		async mounted() {
+		  this.queryParams.zt=this.mapp.queryParams.zt
 		this.$refs['TablePager'].pageQuery()
 	},
     props:['mapp'],
@@ -88,7 +89,9 @@
 			baseUrl: 'aqgl/rcgl/lzbg',
 			/* 查询参数*/
 			queryParams: {
-				rwid: ''
+				rwid: '',
+        zt:''
+
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [