zouling 1 жил өмнө
parent
commit
eed65d3489

+ 1 - 0
work/pages/case/mine.vue

@@ -611,6 +611,7 @@
 				this.year='';
 				if(tab=='qb'){
 					this.tajd='';
+					this.tabtype=''
 				}
 				this.title='';
 				this.getrefreshData()

+ 24 - 3
work/pages/meeting/list.vue

@@ -30,7 +30,7 @@
 			<view class="lbtab flexc">
 				<image :src="lbicoimg" class="limg"></image>
 				<view class="lbtabs flexc">
-					<block v-if="tabidx!='hdtz'&&tabidx!='zxhd'">
+					<block v-if="tabidx!='hdtz'&&tabidx!='zxhd'&&tabidx!='zsyz'&&tabidx!='wdzs'">
 						<view class="lbtabp">
 							<picker mode="date" :value="time"   @change='bindDateChangeb'>
 								<view :class="time?'':'f16 co80'">{{time || "会议日期"}}</view>
@@ -58,7 +58,14 @@
 							<image :src="upimg" class="upimg"></image>
 						</view>
 					</block>
-					
+					<block v-if="tabidx=='zsyz'||tabidx=='wdzs'">
+						<view class="lbtabp" >
+							<picker  range-key='label' :range="xsztlist"  @change='bindDateChangee'>
+								<view :class="xszttxt?'':'f16 co80'">{{xszttxt || "状态"}}</view>
+							</picker>
+							<image :src="upimg" class="upimg"></image>
+						</view>
+					</block>
 				</view>
 				<view class="czbtns" @click='getResetFn'>重置</view>
 			</view>
@@ -130,7 +137,9 @@
 				id:'',
 				title:'',//关键词
 				time:"",
-				codeQr:""
+				codeQr:"",
+				xsztid:'',
+				xszttxt:''
 			}
 		},
 		onUnload(){
@@ -239,6 +248,12 @@
 				this.hdlxid=this.hdlxlist[val].value;
 				this.getConfirm()
 			},
+			bindDateChangee(e){
+				var val=e.detail.value;
+				this.xszttxt=this.xsztlist[val].label;
+				this.xsztid=this.xsztlist[val].value;
+				this.getConfirm()
+			},
 			getConfirm(){
 				this.pageNum=1;
 				this.list=[];
@@ -258,6 +273,9 @@
 					this.time=''
 					this.hdlxtxt=''
 				}
+				if(tabidx=='zsyz'||tabidx=='wdzs'){
+					this.xszttxt=''
+				}
 				this.title='';
 				this.getConfirm()
 			},
@@ -525,6 +543,9 @@
 					if(this.tabidx=='wdzs'){
 						params.userId=this.userId
 					}
+					if(this.xszttxt){
+						params.type=this.xsztid;
+					}
 					params.clueName=this.title
 					getinvestmentListFn(params).then(res=>{
 						if(res.code==200){

+ 1 - 1
work/pages/report/info.vue

@@ -59,7 +59,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="mbox">
-			<view v-if="checkPermi(['member:info:alllist'])||tabidx=='jfju'" style="height: 112rpx;"></view>
+			<view v-if="checkPermi(['member:info:alllist'])||tabidx=='jfju'" style="height: 56rpx;"></view>
 			<report-list :type="tabidx" :datalist="list" :wtdt="wtdt" :khlxList='khlxList' :jflxList="jflxList"  :wybgslist="wybgslist" :jblist='jblist'  @getDetail="getDetail" @getTuiFn="getTuiFn"></report-list>
 		</view>
 		<view style="height: 100rpx;" v-if="checkPermi(['member:info:add','zxBonus:bonus:add'])"></view>