1

api/mine/case.js

@@ -159,7 +159,7 @@ export function getInfourgeFn(data) {
 	'data':data
   })
 }
-//政府催办-列表zxUrge:urge:list
+//政府催办-列表zxUrge:urge:list查看我接收，发出的催办
 export function geturgeListFn(data) {
   return request({
     'url': '/zxUrge/urge/list',
@@ -174,7 +174,7 @@ export function geturgeDetailFn(data) {
     'method': 'get',
   })
 }
-//催办列表proposalInfo:info:tacbList
+//可催办列表proposalInfo:info:tacbList
 export function gettacbListFn(data) {
   return request({
     'url': '/proposalInfo/info/tacbList',

api/mine/sqmyInfo.js

@@ -144,7 +144,7 @@ export function getsqmyInfooutstandingFn(data) {
 //   })
 // }
 //社情民意-承办单位信息列表proposalInfo:info:unitList
-export function getInfounitListFn(data) {
+export function getsqmyInfounitListFn(data) {
   return request({
     'url': '/sqmyInfo/info/unitList',
     'method': 'get',

pages.json

@@ -165,8 +165,24 @@
 					"h5":{"titleNView":false}
 				}
 			},
-			
-			
+			{
+				"path": "pages/single/urge",
+				"style": {
+					"navigationBarTitleText": "催办列表",
+					"navigationBarBackgroundColor": "#1D64E2",
+					"navigationBarTextStyle": "white",
+					"h5":{"titleNView":false}
+				}
+			},
+			{
+				"path": "pages/single/unitList",
+				"style": {
+					"navigationBarTitleText": "提案办理",
+					"navigationBarBackgroundColor": "#1D64E2",
+					"navigationBarTextStyle": "white",
+					"h5":{"titleNView":false}
+				}
+			},
 			{
 				"path": "pages/sqmyInfo/add",
 				"style": {

pages/index/index.vue

@@ -62,7 +62,7 @@
 									<image :src="hrimga" class="flex0 imga"></image>
 								</view>
 							</view>
-							<view class="htbox" @click="getsqmyInfoFn">
+							<view class="htbox" @click="getsqmyInfoFn" v-if="checkPermi(['sqmyInfo:info:list'])">
 								<image :src="hrbgb" class="hrbg"></image>
 								<view class="htboxa flexc">
 									<view class="flex1 mr10">

pages/mine/index.vue

@@ -68,7 +68,7 @@
 					<view class="tit flex1">政协提案</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
-				<view class="flexc mine_list" @click="handleToAdd" v-if="checkPermi(['sqmyInfo:info:list'])">
+				<view class="flexc mine_list" @click="handleToAddsqmy" v-if="checkPermi(['sqmyInfo:info:list'])">
 					<view class="limg">
 						<image :src="listimgd" class="imgc"></image>
 					</view>
@@ -89,6 +89,20 @@
 					<view class="tit flex1">会议活动</view>
 					<image :src="rimg" class="rimg"></image>
 				</view>
+				<view class="flexc mine_list" @click="handleTotabl" v-if="checkPermi(['proposalInfo:info:unitList','sqmyInfo:info:unitList'])">
+					<view class="limg">
+						<image :src="listimgf" class="imgc"></image>
+					</view>
+					<view class="tit flex1">提案办理</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
+				<view class="flexc mine_list" @click="handleTocu" v-if="checkPermi(['zxConference:conference:list'])">
+					<view class="limg">
+						<image :src="listimgf" class="imgc"></image>
+					</view>
+					<view class="tit flex1">催办列表</view>
+					<image :src="rimg" class="rimg"></image>
+				</view>
 			</view>
 			<view class="mbgbox">
 				<view class="flexc mine_list" @click="handleUpassword">
@@ -301,12 +315,21 @@
 			handleToAddzx(){
 				this.$tab.navigateTo('/work/pages/case/mine')
 			},
+			handleToAddsqmy(){
+				this.$tab.navigateTo('/work/pages/sqmyInfo/mine')
+			},
 			handleToAddlz(){
 				this.$tab.navigateTo('/work/pages/report/info')
 			},
 			handleTohy(){
 				this.$tab.navigateTo('/work/pages/meeting/list')
 			},
+			handleTotabl(){
+				this.$tab.navigateTo('/work/pages/single/unitList')
+			},
+			handleTocu(){
+				this.$tab.navigateTo('/work/pages/single/urge')
+			},
 			handleToLogin() {
 				this.$tab.reLaunch('/pages/login')
 			},

work/components/case/list.vue

@@ -108,23 +108,23 @@
 				<!-- 推荐优秀 -->
 				<view class="casebtn flexc" v-if="type=='tjyx'">
 					<block v-if="ite.isOutstanding==0">
-						<view class="lftit" >该提案已推荐为优秀，查看<text class="lfdet">推荐理由</text></view>
-						<view class="btn btn2"><image :src="zanimg" class="zanimg"></image>推荐优秀</view>
+						<view class="lftit" >该提案已推荐为优秀，查看<text class="lfdet" @click.stop="getDfFn(ite)">推荐理由</text></view>
+						<view class="btn btn3"><image :src="nzanimg" class="zanimg"></image>推荐优秀</view>
 					</block>
 					<block v-else>
 						<view class="lftit">该提案暂未推荐为优秀</view>
-						<view class="btn btn3"  @click.stop="getTuiFn(ite,'tjyx')"><image :src="nzanimg" class="zanimg"></image>推荐优秀</view>
+						<view class="btn btn2"  @click.stop="getTuiFn(ite,'tjyx')"><image :src="zanimg" class="zanimg"></image>推荐优秀</view>
 					</block>
 				</view>
 				<!-- 推荐重点 -->
 				<view class="casebtn flexc" v-if="type=='tjzd'">
 					<block v-if="ite.isKeyPoint==0">
-						<view class="lftit" >该提案已推荐为重点，查看<text class="lfdet">推荐理由</text></view>
-						<view class="btn btn2"  @click.stop="getTuiFn(ite,'tjzd')"><image :src="start" class="staimg"></image>推荐重点</view>
+						<view class="lftit">该提案已推荐为重点，查看<text class="lfdet" @click.stop="getDfFn(ite)">推荐理由</text></view>
+						<view class="btn btn3"><image :src="nstart" class="staimg"></image>推荐重点</view>
 					</block>
 					<block v-else>
-						<view class="lftit" >该提案暂未推荐为重点</view>
-						<view class="btn btn3"><image :src="nstart" class="staimg"></image>推荐重点</view>
+						<view class="lftit">该提案暂未推荐为重点</view>
+						<view class="btn btn2" @click.stop="getTuiFn(ite,'tjzd')"><image :src="start" class="staimg"></image>推荐重点</view>
 					</block>
 				</view>
 				<!-- 质量评议 -->
@@ -141,6 +141,21 @@
 	<block v-else>
 		<no-data></no-data>
 	</block>
+	
+	<view class="bgbox" @click="getClose" v-if="dfflag"></view>
+	<view class="fixedbox" v-if="dfflag">
+		<view class="ttit">推荐原因</view>
+		<view  class="boxs">
+			<view class="ftxt">
+				<text>推荐事由</text>
+				<view>{{info}}</view>
+			</view>
+			
+		</view>
+		<view class="fixedbtn flexcj">
+			<view class="btns btn1" @click.stop="getClose">取消</view>
+		</view>
+	</view>
   </view>
 </template>
 
@@ -192,6 +207,8 @@
 			nzanimg:require("@/work/static/images/nzanico.png"),
 			flower:require("@/work/static/images/flower.png"),
 			nflower:require("@/work/static/images/nflower.png"),
+			dfflag:false,
+			info:''
 		}
 	},
 	onLoad: function() {
@@ -201,6 +218,17 @@
 		kaType(ite){
 			return selectValue(this.tajdlist, ite);
 		},
+		getClose(){
+			this.dfflag=false
+		},
+		getDfFn(ite){
+			if(this.type=='tjyx'){
+				this.info=ite.outstandingArgument;
+			}else{
+				this.info=ite.keyPointArgument;	
+			}
+			this.dfflag=true	
+		},
 		getDetail(e){
 			this.$emit('getDetail',e)
 		},
@@ -303,5 +331,20 @@ font-size: 26rpx;margin-left: 26rpx;line-height: 52rpx;text-align: center;paddin
 		}
 	}
 }
-
+.fixedbox{position: fixed;left: 48rpx;right: 48rpx;background: #fff;border-radius: 10rpx;top: 50%;transform: translateY(-50%);z-index: 10;padding: 32rpx 40rpx 50rpx;max-height: calc(100vh - 300rpx);overflow: auto;box-sizing: border-box;
+	.ftxt{display: flex;align-items: flex-start;margin-bottom: 32rpx;flex:0 1 auto;min-width: 50%;
+		text{font-weight: bold;font-size: 26rpx;color: #CACACA;flex: 0 0 auto;min-width: 104rpx;text-align-last: justify;}
+		view{flex: 1;color: #343434;font-size: 26rpx;margin-left: 20rpx;line-height: 34rpx;}
+	}
+	.boxs{min-height: 180rpx;}
+	.ttit{position: relative;text-align: center;font-weight: bold;font-size: 36rpx;color: #222327;margin-bottom: 34rpx;}
+	.fixedbtn{padding-top: 18rpx;
+			.btns{width: 254rpx;height: 80rpx;border-radius: 40rpx;font-weight: bold;flex: 1;
+	font-size: 30rpx;display: flex;align-items: center;justify-content: center;box-sizing: border-box;
+				&.btn1{color: #1D64E2;border: 2rpx solid #1D64E2;}
+				&.btn2{color: #ffffff;background: #1D64E2;}
+				.down{width: 26rpx;height: 26rpx;margin-right: 6rpx;flex: 0 0 auto;}
+			}	
+		}
+}
 </style>

work/components/popup/popup.vue

@@ -9,10 +9,10 @@
 			<view  class="boxs">
 				<view class="flexcj mb14">
 					<view class="ttxt"><text class="cof0">*</text>推荐意见</view>
-					<view class="flexcc speech" @click="getSeep">
+					<!-- <view class="flexcc speech" @click="getSeep">
 						<image :src="speechimgs"></image>
 						<view>语音输入</view>
-					</view>
+					</view> -->
 				</view>
 				<textarea class="textar mb25" @blur="getBlur" v-model="content" placeholder="请输入推荐意见，也可点击右上角进行 语音输入…" maxlength="1000" ></textarea>
 			</view>
@@ -37,10 +37,10 @@
 				</view>
 				<view class="flexcj mb14">
 					<view class="ttxt"><text class="cof0">*</text>推荐意见</view>
-					<view class="flexcc speech" @click="getSeep">
+					<!-- <view class="flexcc speech" @click="getSeep">
 						<image :src="speechimgs"></image>
 						<view>语音输入</view>
-					</view>
+					</view> -->
 				</view>
 				<textarea class="textar mb25" @blur="getBlur" v-model="yxly" placeholder="请对办理情况进行评价，也可点击右上 角进行语音输入…" maxlength="1000" ></textarea>
 			</view>
@@ -917,6 +917,7 @@
 					}
 					var obj={
 						proposalUnitReplyList:xbdwList,
+						sqmyUnitReplyList:xbdwList,
 						zbUnitReply:newArr
 					}
 					this.$emit('getupSubmit',obj)

work/components/single/list.vue

@@ -0,0 +1,265 @@
+<template>
+  <view>
+	<view v-if="datalist.length>0">
+		<!-- 我的提案 -->
+		<block v-if="type=='tabl'">
+			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.categoryId)">
+				<view class="tit overtwo">{{ite.title}}</view>
+				
+				<view class="flexcw" >
+					<view class="ftxt">
+						<text>提案者</text>
+						<view>{{ite.proposalName}}</view>
+					</view>
+					<view class="ftxt" v-if="ite.proposalNumber">
+						<text>案号</text>
+						<view>{{ite.proposalNumber}}</view>
+					</view>
+					<view class="ftxt">
+						<text>提案类型</text>
+						<view>{{ite.proposalType==0?'大会提案':'平时提案'}}</view>
+					</view>
+				</view>
+				<view class="ftxt">
+					<text>提案类别</text>
+					<view>{{ite.categoryName}}</view>
+				</view>
+				<view class="ftxt">
+					<text>提交时间</text>
+					<view>{{ite.createTime}}</view>
+				</view>
+				<view class="ftxt">
+					<text>提案状态</text>
+					<view class="co0b">{{kaType(ite.proposalProgress)}}</view>
+				</view>
+				
+				<!-- 提案办理  回复单位-->
+				<view class="casebtn flexc">
+					<view class="ftit">办理状态<text>{{ite.isReply==0&&ite.proposalProgress!=6&&ite.proposalProgress!=7?'已反馈':'待反馈'}}</text></view>
+					<view class="btn btn3" v-if="ite.isReply==0&&ite.proposalProgress!=6&&ite.proposalProgress!=7">已反馈</view>
+					<view class="btn btn2" v-if="checkPermi(['proposal:unit:reply'])&&(ite.isReply!=0||ite.proposalProgress==6)&&ite.proposalProgress!=3&&ite.proposalProgress!=7" @click.stop="getTuiFn(ite,'dffk')">反馈意见</view>
+					<view class="btn btn2" v-if="checkPermi(['proposal:unit:reply'])&&(ite.isReply!=0||ite.proposalProgress==7)&&(ite.proposalProgress==3||ite.proposalProgress==7)" @click.stop="getTuiFn(ite,'dwdf')">反馈意见</view>
+				</view>
+				<!--催办  4(不包含4) 之后 可以催办-->
+				<view class="casebtn flexc" v-if="type=='tacb'">
+					<!-- <block v-if="ite.isRecord=='0'">
+						<view class="lftit">该提案已被催办 <text class="co1d">1次</text></view>
+						<view class="btn btn3">再次催办</view>
+					</block> -->
+					<!-- <block v-if="ite.isRecord==1">
+						<view class="lftit">该提案暂未被催办</view>
+						<view class="btn btn2" @click.stop="getTuiFn(ite,'tacb')">催办</view>
+					</block> -->
+					<view class="lftit"></view>
+					<view class="btn btn2" @click.stop="getTuiFn(ite,'tacb')">催办</view>
+				</view>
+
+			</view>
+		</block>
+		<!-- 社情议案 -->
+		<block v-if="type=='sqtabl'">
+			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.sqmyId)">
+				<view class="tit overtwo">{{ite.title}}</view>
+				<view class="ftxt">
+					<text>上报者</text>
+					<view>{{ite.sqmyName}}</view>
+				</view>
+				<view class="ftxt">
+					<text>主题类型</text>
+					<view>{{kaType(ite.topicType,ztlxlist)}}</view>
+				</view>
+				<view class="ftxt">
+					<text>提交时间</text>
+					<view>{{ite.createTime}}</view>
+				</view>
+				<view class="ftxt">
+					<text>进度情况</text>
+					<view class="co0b">{{kaType(ite.sqmyProgress)}}</view>
+				</view>
+				
+				<!-- 委员反馈 提案办理 -->
+				<view class="casebtn flexc">
+					<view class="ftit">办理状态<text>{{ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7?'已反馈':'待反馈'}}</text></view>
+					<view class="btn btn3" v-if="ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7">已反馈</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==6)&&ite.sqmyProgress!=3&&ite.sqmyProgress!=7" @click.stop="getTuiFn(ite,'dffk')">反馈意见</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==7)&&(ite.sqmyProgress==3||ite.sqmyProgress==7)" @click.stop="getTuiFn(ite,'dwdf')">反馈意见</view>
+				</view>
+			</view>
+		</block>
+		<!-- 提案催办 -->
+		<block v-if="type=='tncb'">
+			<view class="caselist" v-for="(ite,idx) in datalist" :key='idx' @click="getDetail(ite.sqmyId)">
+				<view class="tit overtwo">{{ite.title}}</view>
+				<view class="ftxt">
+					<text>催办标题</text>
+					<view>{{ite.urgeTitle}}</view>
+				</view>
+				<view class="ftxt">
+					<text>催办类型</text>
+					<view>{{ite.urgeType==1?'提案催办':'社情名义催办'}}</view>
+				</view>
+				<view class="ftxt">
+					<text>催办内容</text>
+					<view>{{ite.urgeContent}}</view>
+				</view>
+				<view class="ftxt">
+					<text>发布人</text>
+					<view>{{ite.issuer}}</view>
+				</view>
+				<view class="ftxt">
+					<text>发布单位</text>
+					<view>{{ite.issuerDept}}</view>
+				</view>
+				<view class="ftxt">
+					<text>接收人</text>
+					<view>{{ite.acceptUser}}</view>
+				</view>
+				<view class="ftxt">
+					<text>接收单位</text>
+					<view class="co0b">{{ite.acceptDept}}</view>
+				</view>
+				<view class="ftxt">
+					<text>接收单位</text>
+					<view class="co0b">{{ite.urgeTime}}</view>
+				</view>
+				<!-- <view class="ftxt">
+					<text>催办状态</text>
+					<view class="co0b">{{kaType(ite.sqmyProgress)}}</view>
+				</view> -->
+				<!-- 委员反馈 提案办理 -->
+				<!-- <view class="casebtn flexc" v-if="type=='xxsb'||type=='xxbl'">
+					<view class="ftit">办理状态<text>{{ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7?'已反馈':'待反馈'}}</text></view>
+					<view class="btn btn3" v-if="ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7">已反馈</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==6)&&ite.sqmyProgress!=3&&ite.sqmyProgress!=7" @click.stop="getTuiFn(ite,'dffk')">反馈意见</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==7)&&(ite.sqmyProgress==3||ite.sqmyProgress==7)" @click.stop="getTuiFn(ite,'dwdf')">反馈意见</view>
+				</view> -->
+			</view>
+		</block>
+		<view class="shax" v-if="wtdt">{{wtdt}}</view>
+	</view>
+	<block v-else>
+		<no-data></no-data>
+	</block>
+  </view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import { selectValue } from '@/utils/common.js';
+	import noData from "@/components/nodata/nodata.vue"
+  export default {
+	props:{
+		datalist: {
+			type: Array,
+			default () {
+				return []
+			}
+		},
+		tajdlist: {
+			type: Array,
+			default () {
+				return []
+			}
+		},
+		wtdt:{
+			type: String,
+			default () {
+				return ''
+			}
+		},
+		ztlxlist:{
+			type: Array,
+			default () {
+				return []
+			}
+		},
+		type:{
+			type: [String,Number],
+			default () {
+				return ''
+			}
+		},
+	},
+	components:{
+		noData
+	},
+	data(){
+		return{
+			start:require("@/work/static/images/start.png"),
+			nstart:require("@/work/static/images/nstart.png"),
+			zanimg:require("@/work/static/images/zanico.png"),
+			nzanimg:require("@/work/static/images/nzanico.png"),
+			flower:require("@/work/static/images/flower.png"),
+			nflower:require("@/work/static/images/nflower.png"),
+		}
+	},
+	onLoad: function() {
+	},
+	methods:{
+		checkPermi, checkRole,
+		kaType(ite){
+			return selectValue(this.tajdlist, ite);
+		},
+		getDetail(e){
+			this.$emit('getDetail',e)
+		},
+		getTuiFn(ite,txt,sh){
+			var that=this;
+			var obj={
+				type:txt,
+				sh:sh,
+				ite:ite
+			}
+			if(that.type=='sqtabl'){
+				obj.id=ite.sqmyId
+			}else if(that.type=='tabl'){
+				obj.id=ite.proposalId
+			}
+			this.$emit('getTuiFn',obj)
+			
+		},
+		typeFn(data){
+			if(data){
+				var newArr=[]
+				var astr=data.split('-')
+				astr.forEach(ite=>{
+					var a=ite.substring(0,5);
+					newArr.push(a)
+				})
+				return newArr.join('-')
+			}else{
+				return ''
+			}
+		},
+	},
+	
+  }
+</script>
+
+<style lang="scss" scoped>
+.caselist{background: #FFFFFF;border-radius: 30rpx;margin-top: 24rpx;padding: 38rpx 24rpx 8rpx;
+	.tit{font-weight: bold;font-size: 32rpx;color: #222327;margin-bottom: 42rpx;}
+	.ftxt{display: flex;align-items: flex-start;margin-bottom: 32rpx;flex:0 1 auto;min-width: 50%;
+		text{font-weight: bold;font-size: 26rpx;color: #CACACA;flex: 0 0 auto;min-width: 104rpx;text-align-last: justify;}
+		view{flex: 1;color: #343434;font-size: 26rpx;margin-left: 20rpx;line-height: 34rpx;}
+	}
+	.casebtn{padding: 24rpx 0;border-top: 2rpx solid #E6E6E6;
+		.ftit{font-weight: bold;font-size: 26rpx;color: #CACACA;flex: 1;
+			text{color: $com-cd3;margin-left: 20rpx;font-weight:500;min-width: 104rpx;text-align-last: justify;}
+		}
+		.lftit{font-weight: 500;font-size: 26rpx;color: #666666;flex:1;
+			.lfdet{color: $com-cd3;text-decoration: underline;}
+		}
+		.zanimg{width: 22rpx;height: 20rpx;margin-right: 14rpx;}
+		.staimg{width: 24rpx;height: 24rpx;margin-right: 14rpx;}
+		.btn{min-width: 118rpx;height: 52rpx;border-radius: 26rpx;font-weight: bold;flex: 0 0 auto;display: flex;align-items: center;
+font-size: 26rpx;margin-left: 26rpx;line-height: 52rpx;text-align: center;padding: 0 32rpx;box-sizing: border-box;
+		&.btn1{background: #FFEDED;color: #FF4141;}
+		&.btn2{background: #E4EEFF;color: #1D64E2;}
+		&.btn3{background: #ECECEC;color: #666666;}
+		
+		}
+	}
+}
+
+</style>

work/components/sqmyInfo/list.vue

@@ -37,16 +37,21 @@
 					<view>{{ite.categoryName}}</view>
 				</view>
 				<view class="ftxt" v-if="type=='swsqmy'">
-					<text>批示情况 </text>
+					<text>批示情况</text>
 					<view class="co0b">已批示</view>
 					<view class="cof0">未批示</view>
 				</view>
+				<view class="ftxt">
+					<text>进度情况</text>
+					<view class="co0b">{{kaType(ite.sqmyProgress,tajdlist)}}</view>
+				</view>
 				
 				<!-- 委员反馈 提案办理 -->
 				<view class="casebtn flexc" v-if="type=='xxsb'||type=='xxbl'">
-					<view class="ftit">办理状态<text>待反馈</text></view>
-					<view class="btn btn3" v-if="ite.satisfaction">已反馈</view>
-					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&!ite.satisfaction&&ite.proposalProgress==5" @click.stop="getTuiFn(ite,'dffk')">反馈意见</view>
+					<view class="ftit">办理状态<text>{{ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7?'已反馈':'待反馈'}}</text></view>
+					<view class="btn btn3" v-if="ite.isReply==0&&ite.sqmyProgress!=6&&ite.sqmyProgress!=7">已反馈</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==6)&&ite.sqmyProgress!=3&&ite.sqmyProgress!=7" @click.stop="getTuiFn(ite,'dffk')">反馈意见</view>
+					<view class="btn btn2" v-if="checkPermi(['sqmy:unit:reply'])&&(ite.isReply!=0||ite.sqmyProgress==7)&&(ite.sqmyProgress==3||ite.sqmyProgress==7)" @click.stop="getTuiFn(ite,'dwdf')">反馈意见</view>
 				</view>
 				<!-- 提案审查 -->
 				<!-- <view class="casebtn flexc" v-if="type=='xxsh'">
@@ -58,13 +63,13 @@
 				</view> -->
 				<!--提案交办  -->
 				<view class="casebtn flexc" v-if="type=='xxjb'">
-					<block v-if="ite.sqmyProgress>4">
+					<block v-if="ite.sqmyProgress==3">
 						<view class="lftit">该提案已进行交办，查看<text class="lfdet">交办详情</text></view>
 						<view class="btn btn3">已交办</view>
 					</block>
-					<block v-if="ite.sqmyProgress==4">
+					<block v-if="ite.sqmyProgress==2">
 						<view class="lftit">该提案暂未进行交办</view>
-						<view class="btn btn2" @click.stop="getTuiFn(ite,'xxjb')">交办</view>
+						<view class="btn btn2" @click.stop="getTuiFn(ite,'tajb')">交办</view>
 					</block>
 				</view>
 				<!-- 办结审核 -->
@@ -103,23 +108,23 @@
 				<!-- 推荐优秀 -->
 				<view class="casebtn flexc" v-if="type=='tjyx'">
 					<block v-if="ite.isOutstanding==0">
-						<view class="lftit" >该提案已推荐为优秀，查看<text class="lfdet">推荐理由</text></view>
-						<view class="btn btn2"><image :src="zanimg" class="zanimg"></image>推荐优秀</view>
+						<view class="lftit" >该提案已推荐为优秀，查看<text class="lfdet" @click.stop="getDfFn(ite)">推荐理由</text></view>
+						<view class="btn btn3"><image :src="nzanimg" class="zanimg"></image>推荐优秀</view>
 					</block>
 					<block v-else>
 						<view class="lftit">该提案暂未推荐为优秀</view>
-						<view class="btn btn3"  @click.stop="getTuiFn(ite,'tjyx')"><image :src="nzanimg" class="zanimg"></image>推荐优秀</view>
+						<view class="btn btn2"  @click.stop="getTuiFn(ite,'tjyx')"><image :src="zanimg" class="zanimg"></image>推荐优秀</view>
 					</block>
 				</view>
 				<!-- 推荐重点 -->
 				<view class="casebtn flexc" v-if="type=='tjzd'">
 					<block v-if="ite.isKeyPoint==0">
-						<view class="lftit" >该提案已推荐为重点，查看<text class="lfdet">推荐理由</text></view>
-						<view class="btn btn2"  @click.stop="getTuiFn(ite,'tjzd')"><image :src="start" class="staimg"></image>推荐重点</view>
+						<view class="lftit">该提案已推荐为重点，查看<text class="lfdet" @click.stop="getDfFn(ite)">推荐理由</text></view>
+						<view class="btn btn3"><image :src="nstart" class="staimg"></image>推荐重点</view>
 					</block>
 					<block v-else>
-						<view class="lftit" >该提案暂未推荐为重点</view>
-						<view class="btn btn3" @click.stop="getTuiFn(ite,'tjzd')"><image :src="nstart" class="staimg"></image>推荐重点</view>
+						<view class="lftit">该提案暂未推荐为重点</view>
+						<view class="btn btn2" @click.stop="getTuiFn(ite,'tjzd')"><image :src="start" class="staimg"></image>推荐重点</view>
 					</block>
 				</view>
 				<!-- 质量评议 -->
@@ -136,6 +141,20 @@
 	<block v-else>
 		<no-data></no-data>
 	</block>
+	<view class="bgbox" @click="getClose" v-if="dfflag"></view>
+	<view class="fixedbox" v-if="dfflag">
+		<view class="ttit">推荐原因</view>
+		<view  class="boxs">
+			<view class="ftxt">
+				<text>推荐事由</text>
+				<view>{{info}}</view>
+			</view>
+			
+		</view>
+		<view class="fixedbtn flexcj">
+			<view class="btns btn1" @click.stop="getClose">取消</view>
+		</view>
+	</view>
   </view>
 </template>
 
@@ -193,6 +212,8 @@
 			nzanimg:require("@/work/static/images/nzanico.png"),
 			flower:require("@/work/static/images/flower.png"),
 			nflower:require("@/work/static/images/nflower.png"),
+			dfflag:false,
+			info:''
 		}
 	},
 	onLoad: function() {
@@ -202,6 +223,17 @@
 		kaType(ite,list){
 			return selectValue(list, ite);
 		},
+		getClose(){
+			this.dfflag=false
+		},
+		getDfFn(ite){
+			if(this.type=='tjyx'){
+				this.info=ite.outstandingArgument;
+			}else{
+				this.info=ite.keyPointArgument;	
+			}
+			this.dfflag=true	
+		},
 		getDetail(e){
 			this.$emit('getDetail',e)
 		},
@@ -299,5 +331,20 @@ font-size: 26rpx;margin-left: 26rpx;line-height: 52rpx;text-align: center;paddin
 		}
 	}
 }
-
+.fixedbox{position: fixed;left: 48rpx;right: 48rpx;background: #fff;border-radius: 10rpx;top: 50%;transform: translateY(-50%);z-index: 10;padding: 32rpx 40rpx 50rpx;max-height: calc(100vh - 300rpx);overflow: auto;box-sizing: border-box;
+	.ftxt{display: flex;align-items: flex-start;margin-bottom: 32rpx;flex:0 1 auto;min-width: 50%;
+		text{font-weight: bold;font-size: 26rpx;color: #CACACA;flex: 0 0 auto;min-width: 104rpx;text-align-last: justify;}
+		view{flex: 1;color: #343434;font-size: 26rpx;margin-left: 20rpx;line-height: 34rpx;}
+	}
+	.boxs{min-height: 180rpx;}
+	.ttit{position: relative;text-align: center;font-weight: bold;font-size: 36rpx;color: #222327;margin-bottom: 34rpx;}
+	.fixedbtn{padding-top: 18rpx;
+			.btns{width: 254rpx;height: 80rpx;border-radius: 40rpx;font-weight: bold;flex: 1;
+	font-size: 30rpx;display: flex;align-items: center;justify-content: center;box-sizing: border-box;
+				&.btn1{color: #1D64E2;border: 2rpx solid #1D64E2;}
+				&.btn2{color: #ffffff;background: #1D64E2;}
+				.down{width: 26rpx;height: 26rpx;margin-right: 6rpx;flex: 0 0 auto;}
+			}	
+		}
+}
 </style>

work/pages/case/details.vue

@@ -90,7 +90,7 @@
 					<view class="ftit mb10">{{ite.deptName}}</view>
 					<view class="txt wb100"><text class="w65">回复内容</text>{{ite.content}}</view>
 					<block v-if="ite.zxFjList.length">
-						<view class="txt">
+						<view class="txt fjbox">
 							<text class="w65">附件</text>
 							<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fidx' @click="getDown(fite.url)">
 								<view class="imgl"><image :src="fjimg" ></image></view>
@@ -149,7 +149,7 @@
 				</block>
 				
 			</view>
-			<view class="dbox" v-if="progress>5">
+			<view class="dbox" v-if="progress>7">
 				<view class="titbox mb16">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -642,7 +642,10 @@
 				text{color: #AAAAAA;min-width: 104rpx;text-align-last: justify;flex: 0 0 auto;margin-right: 20rpx;
 					&.w65{width: 130rpx;}
 				}
-				view{text-indent: 2rem;}
+				&.fjbox{flex: 1 !important;display: flex;
+					.fjlists{flex: 1;}
+				}
+				// view{text-indent: 2rem;}
 			}
 		}
 		.txtbox{text-indent: 2rem;line-height: 36rpx;font-weight: 500;font-size: 26rpx;color: #222327;

work/pages/case/mine.vue

@@ -78,8 +78,8 @@
 <script>
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {getCaseListFn,getInfoisRecordFn,getInfoAssignFn,getInfoReplyFn,getInfoShFn,getInfoIdeaFn,getInfozxIdeaFn,
-	getInfourgeFn,getInfokeyPointFn,getInfooutstandingFn,getUserverifyFn,getInfojointlyListFn,geturgeListFn,getInfounitListFn,getInfoReplywyFn
-	} from "@/api/mine/case.js"
+	getInfourgeFn,getInfokeyPointFn,getInfooutstandingFn,getUserverifyFn,getInfojointlyListFn,geturgeListFn,getInfounitListFn,
+	getInfoReplywyFn,gettacbListFn} from "@/api/mine/case.js"
 	import popUp from "@/work/components/popup/popup.vue"
 	import caseList from "@/work/components/case/list.vue"
 	import {getDictionaryFn} from "@/api/mine/register.js"
@@ -98,12 +98,19 @@
 				tabtype:'',//进度查询
 				// {tit:'征集通知',val:0}, 提案催办 目前看所有
 				tabList:[
-					{tit:'全部',val:'qb',limit:'proposalInfo:info:list'},{tit:'提案审查',jd:1,val:'tasc',limit:'proposalInfo:info:isRecord'},
-					{tit:'提案交办',jd:2,val:'tajb',limit:"proposalInfo:info:assign"},{tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},
+					{tit:'全部',val:'qb',limit:'proposalInfo:info:list'},
+					{tit:'提案审查',jd:1,val:'tasc',limit:'proposalInfo:info:isRecord'},
+					{tit:'提案交办',jd:2,val:'tajb',limit:"proposalInfo:info:assign"},
+					{tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},
 					// {tit:'办结审核',jd:6,val:'jbsh',},
-				{tit:'提案催办',val:'tacb',limit:'zxUrge:urge:add'},{tit:'接收催办',val:'jstacb',limit:'zxUrge:urge:list'},
-				{tit:'我的提案',val:'wdta',},{tit:'联名提案',val:'lmta',limit:"proposalInfo:info:jointlyList"},{tit:'推荐优秀',val:'tjyx'},
-				{tit:'推荐重点',val:'tjzd'},{tit:'公开提案',val:'gkta'},
+				{tit:'提案催办',val:'tacb',limit:'proposalInfo:info:tacbList'},
+				// {tit:'接收催办',val:'jstacb',limit:'zxUrge:urge:list'},
+				// {tit:'发出催办',val:'fctacb',limit:'zxUrge:urge:list'},
+				{tit:'我的提案',val:'wdta',limit:'proposalInfo:info:list'},
+				{tit:'联名提案',val:'lmta',limit:"proposalInfo:info:jointlyList"},
+				{tit:'推荐优秀',val:'tjyx',limit:'proposalInfo:info:outstanding'},
+				{tit:'推荐重点',val:'tjzd',limit:'proposalInfo:info:keyPoint'},
+				{tit:'公开提案',val:'gkta',limit:'proposalInfo:info:list'},
 				],
 				litablist:[{tit:'提案类别',val:0},{tit:'提案类型',val:1},{tit:'单位类型',val:2},{tit:'选择年份',val:3},],
 				// {tit:'开始日期',val:1},{tit:'结束日期',val:2},
@@ -424,7 +431,7 @@
 					params.urgeType=1
 					getInfourgeFn(params).then(res=>{
 						if(res.code==200){
-							this.$toast("提案办结成功");
+							this.$toast("催办成功");
 							setTimeout(function(){
 								that.ptype='';
 								that.pageNum=1;
@@ -609,8 +616,37 @@
 							this.$toast(res.msg)
 						}
 					}) 
-				}else if(this.tabidx=='jstacb'){
-					params.acceptDeptId=this.deptId
+				}else if(this.tabidx=='tacb'){
+					gettacbListFn(params).then(res=>{
+						if(res.code==200){
+							if (res.rows.length < this.pageSize) {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							} else {
+								var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+								if (num < res.total) {
+									this.reachflag = true
+									this.wtdt = '上拉加载更多'
+								} else {
+									this.reachflag = false
+									this.wtdt = '到底了~';
+								}
+							}
+							if (this.pageNum == 1) {
+								this.list = res.rows;
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+						}else{
+							this.$toast(res.msg)
+						}
+					})
+				}else if(this.tabidx=='jstacb'||this.tabidx=='fctacb'){
+					if(tab=='jstacb'){
+						params.acceptDeptId=this.deptId
+					}else{
+						params.issuerDeptId=this.deptId
+					}
 					geturgeListFn(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {

work/pages/single/unitList.vue

@@ -0,0 +1,447 @@
+<template>
+	<view :style="'padding-top:'+nvaHeight+'px;'">
+		<view class="navbox">
+			<view class="plr12 mt18">
+				<view class="search flex0 mb10">
+					<image :src="searchimg"></image>
+					<input placeholder="输入关键字进行查询" v-model="title" @confirm="getConfirm"/>
+				</view>
+			</view>
+			<view class="tablists flexc mb20">
+				<block v-for="(ite,idx) in tabList" >
+					<view  v-if="!ite.limit||ite.limit&&checkPermi([ite.limit])" @click="getTabFn(ite)" :class="{act:tabidx==ite.val}" :key="idx">{{ite.tit}}</view>
+				</block>
+			</view>
+			<view style="height: 56rpx;"></view>
+			<view class="lbtab flexc">
+				<image :src="lbicoimg" class="limg"></image>
+				<view class="lbtabs flexc">
+					<view class="lbtabp">
+						<picker  range-key='label' :value="tajdidx" :range="tajdlist"  @change='bindDateChanged'>
+							<view :class="tajd?'':'f16 co80'">{{tajd || "办理进度"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view>
+					<view class="lbtabp" v-if="tabidx=='tabl'">
+						<picker  range-key='label' :value="talbidx" :range="talxList"  @change='bindDateChangea'>
+							<view :class="talx?'':'f16 co80'">{{talx || "提案类型"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view>
+					<view class="lbtabp">
+						<picker mode="date" fields="year"  range-key='label' :value="talbidx"   @change='bindDateChangeb'>
+							<view :class="year?'':'f16 co80'">{{year || "选择年份"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<view class="mbox">
+			<single-list :datalist="list" :wtdt="wtdt" :ztlxlist="ztlxlist" :tajdlist='tajdlist' :type='tabidx' @getDetail="getDetail" @getTuiFn="getTuiFn"></single-list>
+		</view>
+		<!-- 弹窗 -->
+		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist"  @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+	</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import {getInfounitListFn,getInfoReplywyFn,getInfoReplyFn} from "@/api/mine/case.js"
+	import {getsqmyInfounitListFn,getsqmyReplyFn,getsqmyInfoReplywyFn} from "@/api/mine/sqmyInfo.js"
+	import popUp from "@/work/components/popup/popup.vue"
+	import singleList from "@/work/components/single/list.vue"
+	import {getDictionaryFn} from "@/api/mine/register.js"
+	export default{
+		components:{singleList,popUp},
+		data(){
+			return{
+				searchimg: require("@/work/static/images/search.png"),
+				ccicoimg:require("@/work/static/images/ccico.png"),
+				lbicoimg:require("@/work/static/images/lbico.png"),
+				backimg:require("@/work/static/images/back.png"),
+				upimg:require("@/work/static/images/up.png"),
+				backgroundColor:"#1D64E2",
+				tabidx:'tabl',
+				tabtype:'',//进度查询
+				// {tit:'征集通知',val:0}, 提案催办 目前看所有
+				tabList:[
+					{tit:'提案办理',val:'tabl',limit:'proposalInfo:info:unitList'},
+					{tit:'社情办理',val:'sqtabl',limit:'sqmyInfo:info:unitList'},
+				],
+				litablist:[{tit:'提案类别',val:0},{tit:'提案类型',val:1},{tit:'单位类型',val:2},{tit:'选择年份',val:3},],
+				// {tit:'开始日期',val:1},{tit:'结束日期',val:2},
+				// "proposalProgress":"提案进度(0：提交提案，1：提案审查，2：提案立案，3：提案交办，4：办理提案，5：提案反馈，6：办结审核，7：已办结） ",
+				nvaHeight:44,
+				talbList:[{},],
+				taztList:[{label:'是',value:'0'},{label:'否',value:'1'}],
+				talxList:[{label:'大会提案',value:'0'},{label:'平时提案',value:'1'}],
+				dwlxList:[{label:'答复单位',value:'1'},{label:'主办单位',value:'2'},{label:'协办单位',value:'3'}],
+				talbidx:'',
+				tajd:'',
+				tajdidx:'',
+				tajdid:'',
+				datainfo:{
+					talb:'',
+				},
+				ptype:'',//弹窗类型
+				list:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				tajdlist:[],
+				talbid:'',//提案类别id
+				talx:'',//提案类型
+				talxid:'',
+				year:'',//提案时间
+				title:'',
+				matterList:[],
+				blcdlist:[],
+				mycdlist:[],
+				ztlxlist:[],
+				id:'',
+				userId:this.$store.state.user.userId,
+				deptId:this.$store.state.user.deptId,
+				iteinfo:'',//选择 的数据
+			}
+		},
+		onUnload(){
+			uni.$off('refreshlist')
+		},
+		onLoad(e) {
+			this.getDataFn()
+			this.init()
+			uni.$on('refreshlist', (e) => {
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			})
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
+		mounted() {
+			this.getHeightFn()
+		},
+		methods:{
+			checkPermi, checkRole,
+			// 提案状态
+			init(){
+				getDictionaryFn('proposal_progress').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.tajdlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 办理方式
+				getDictionaryFn('negotiation_mode').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.matterList = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 办理程度degree
+				getDictionaryFn('degree').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.blcdlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 满意程度
+				getDictionaryFn('member_satisfaction').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.mycdlist = res.data.map(v => {
+							return {
+								text: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+				// 主题类型
+				getDictionaryFn('sqmy_topic_type').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.ztlxlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getConfirm(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getTuiFn(data){
+				var sh=data.sh;
+				this.id=data.id;
+				this.iteinfo=data.ite;
+				var type=data.type;
+				this.ptype=type	
+			},
+			getupSubmit(e){
+				var that=this;
+				var type=this.ptype;
+				 if(type=='dffk'||type=='dwdf'){
+					var params=JSON.parse(JSON.stringify(e))
+					if(that.tabidx=='tabl'){
+						params.proposalId=this.id
+						if(this.iteinfo.proposalProgress==7){
+							params.cbdwdfwy=params.content;
+							getInfoReplywyFn(params).then(res=>{
+								if(res.code==200){
+									this.$toast("答复反馈成功");
+									setTimeout(function(){
+										that.ptype='';
+										that.pageNum=1;
+										that.list=[];
+										that.reachflag=true;
+										that.getDataFn()
+									},1200)	
+								}
+							})
+						}else{
+							getInfoReplyFn(params).then(res=>{
+								if(res.code==200){
+									this.$toast("答复反馈成功");
+									setTimeout(function(){
+										that.ptype='';
+										that.pageNum=1;
+										that.list=[];
+										that.reachflag=true;
+										that.getDataFn()
+									},1200)	
+								}
+							})
+						}
+					}else{
+						params.sqmyId=this.id
+						if(this.iteinfo.sqmyProgress==7){
+							params.cbdwdfwy=params.content;
+							getsqmyInfoReplywyFn(params).then(res=>{
+								if(res.code==200){
+									this.$toast("答复反馈成功");
+									setTimeout(function(){
+										that.ptype='';
+										that.pageNum=1;
+										that.list=[];
+										that.reachflag=true;
+										that.getDataFn()
+									},1200)	
+								}
+							})
+						}else{
+							getsqmyReplyFn(params).then(res=>{
+								if(res.code==200){
+									this.$toast("答复反馈成功");
+									setTimeout(function(){
+										that.ptype='';
+										that.pageNum=1;
+										that.list=[];
+										that.reachflag=true;
+										that.getDataFn()
+									},1200)	
+								}
+							})
+						}
+					}
+					
+				}else if(type=='tacb'){
+					var params=JSON.parse(JSON.stringify(e))
+					params.scoreId=this.id
+					params.urgeType=1
+					getInfourgeFn(params).then(res=>{
+						if(res.code==200){
+							this.$toast("催办成功");
+							setTimeout(function(){
+								that.ptype='';
+								that.pageNum=1;
+								that.list=[];
+								that.reachflag=true;
+								that.getDataFn()
+							},1200)	
+						}
+					})
+				}
+			},
+			getHeightFn(){
+				var s=uni.getSystemInfoSync().statusBarHeight;
+				let query = uni.createSelectorQuery().in(this);
+					//需要给黄色区域设置一个id标识，在这里是demo
+				query.select('.navbox').boundingClientRect(data => {
+					this.nvaHeight =Number(data.height)//赋值，待会要用
+				}).exec();
+			},
+			getClose(){
+				this.ptype=""
+			},
+			getTabFn(ite){
+				this.tabidx=ite.val;
+				this.pageNum=1;
+				this.list=[],
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getBack(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.talx=this.talxList[val].label;
+				this.talxid=this.talxList[val].value;
+				this.getrefreshData()
+			},
+			bindDateChangeb(e){
+				var val=e.detail.value;
+				this.year=val;
+				this.getrefreshData()
+			},
+			bindDateChanged(e){
+				var val=e.detail.value;
+				this.tajd=this.tajdlist[val].label;
+				this.tajdid=this.tajdlist[val].value;
+				this.getrefreshData()
+			},
+			
+			getDetail(data){
+				if(this.tabidx=='tabl'){
+					this.$tab.navigateTo('/work/pages/case/details?id='+data+'&f=tabl')	
+				}else{
+					this.$tab.navigateTo('/work/pages/sqmyInfo/details?id='+data+'&f=tabl')	
+				}
+				
+			},
+			getDataFn(){
+				var tab=this.tabidx;
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+				}
+				if(this.title){
+					params.title=this.title
+				}
+				if(this.year){
+					params.year=this.year
+				}	
+				if(this.tabidx=='sqtabl'){
+					params.sqmyProgress=this.tajdid;
+					getsqmyInfounitListFn(params).then(res=>{
+						if(res.code==200){
+							if (res.rows.length < this.pageSize) {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							} else {
+								var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+								if (num < res.total) {
+									this.reachflag = true
+									this.wtdt = '上拉加载更多'
+								} else {
+									this.reachflag = false
+									this.wtdt = '到底了~';
+								}
+							}
+							if (this.pageNum == 1) {
+								this.list = res.rows;
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+						}else{
+							this.$toast(res.msg)
+						}
+					}) 
+				}else if(this.tabidx=='tabl'){
+					params.proposalProgress=this.tajdid;
+					if(this.talx){
+						params.proposalType=this.talxid
+					}
+					getInfounitListFn(params).then(res=>{
+						if(res.code==200){
+							if (res.rows.length < this.pageSize) {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							} else {
+								var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+								if (num < res.total) {
+									this.reachflag = true
+									this.wtdt = '上拉加载更多'
+								} else {
+									this.reachflag = false
+									this.wtdt = '到底了~';
+								}
+							}
+							if (this.pageNum == 1) {
+								this.list = res.rows;
+							} else {
+								this.list = this.list.concat(res.rows)
+							}
+						}else{
+							this.$toast(res.msg)
+						}
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;background-color: $com-cd3;
+	.topl{width: 60rpx;height: 60rpx;display: flex;align-items: center;justify-content: center;
+		image{width: 40rpx;height: 30rpx;}
+	}
+	.topr{display: flex;align-items: center;
+		image{width: 26rpx;height: 26rpx;margin-right: 12rpx;}
+		view{font-weight: 500;font-size: 26rpx;color: #FFFFFF;}
+	}
+	.tablists{
+		overflow: auto;flex-wrap: nowrap;
+		view{font-weight: bold;font-size: 26rpx;color: #FFFFFF;position: relative;flex: 1 0 auto;padding: 22rpx 24rpx;margin-right: 6rpx;box-sizing: border-box;text-align: center;
+			&:last-child{margin-right: 0;}
+			&.act{font-size: 30rpx;
+				&::after{content: '';width: 62rpx;height: 10rpx;background: #FFFFFF;border-radius: 4rpx;left: 50%;margin-left: -31rpx;bottom: 0rpx;position: absolute;}
+			}
+		}
+	}
+	.lbtab{height: 114rpx;background: #FFFFFF;border-radius: 30rpx;padding-left: 24rpx;position: absolute;left:24rpx;right: 24rpx;bottom: -58rpx;
+		.limg{width: 40rpx;height: 34rpx;margin-right: 10rpx;flex:0 0 auto;}
+		.lbtabs{overflow: auto;flex-wrap: nowrap;flex: 1;
+			.lbtabp{display: flex;align-items: center;flex: 1 0 auto;margin-right: 24rpx;}
+			.upimg{width: 18rpx;height: 10rpx;}
+			
+		}
+	}
+}
+.mbox{padding:58rpx 24rpx 28rpx;}
+.lbtabs /deep/ picker{padding: 0 18rpx;}
+</style>

work/pages/single/urge.vue

@@ -0,0 +1,335 @@
+<template>
+	<view :style="'padding-top:'+nvaHeight+'px;'">
+		<view class="navbox">
+			<view class="plr12 mt18">
+				<view class="search flex0 mb10">
+					<image :src="searchimg"></image>
+					<input placeholder="输入关键字进行查询" v-model="title" @confirm="getConfirm"/>
+				</view>
+			</view>
+			<view class="tablists flexc mb20">
+				<block v-for="(ite,idx) in tabList" >
+					<view  v-if="!ite.limit||ite.limit&&checkPermi([ite.limit])" @click="getTabFn(ite)" :class="{act:tabidx==ite.val}" :key="idx">{{ite.tit}}</view>
+				</block>
+			</view>
+			<view style="height: 56rpx;"></view>
+			<view class="lbtab flexc">
+				<image :src="lbicoimg" class="limg"></image>
+				<view class="lbtabs flexc">
+					<!-- <view class="lbtabp">
+						<picker  range-key='label' :value="tajdidx" :range="tajdlist"  @change='bindDateChanged'>
+							<view :class="tajd?'':'f16 co80'">{{tajd || "办理进度"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view>
+					<view class="lbtabp" v-if="tabidx=='tabl'">
+						<picker  range-key='label' :value="talbidx" :range="talxList"  @change='bindDateChangea'>
+							<view :class="talx?'':'f16 co80'">{{talx || "提案类型"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view> -->
+					<view class="lbtabp">
+						<picker mode="date" fields="year"  range-key='label' :value="talbidx"   @change='bindDateChangeb'>
+							<view :class="year?'':'f16 co80'">{{year || "选择年份"}}</view>
+						</picker>
+						<image :src="upimg" class="upimg"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 列表 -->
+		<view class="mbox">
+			<single-list :datalist="list" :wtdt="wtdt" :tajdlist='tajdlist' :type='tabidx' @getDetail="getDetail" @getTuiFn="getTuiFn"></single-list>
+		</view>
+		<!-- 弹窗 -->
+		<pop-up :type='ptype' :blfsList="matterList" :blcdlist="blcdlist" :mycdlist="mycdlist"  @getClose="getClose" @getupSubmit="getupSubmit"></pop-up>
+	</view>
+</template>
+
+<script>
+	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
+	import {geturgeListFn} from "@/api/mine/case.js"
+	import popUp from "@/work/components/popup/popup.vue"
+	import singleList from "@/work/components/single/list.vue"
+	import {getDictionaryFn} from "@/api/mine/register.js"
+	export default{
+		components:{singleList,popUp},
+		data(){
+			return{
+				searchimg: require("@/work/static/images/search.png"),
+				ccicoimg:require("@/work/static/images/ccico.png"),
+				lbicoimg:require("@/work/static/images/lbico.png"),
+				backimg:require("@/work/static/images/back.png"),
+				upimg:require("@/work/static/images/up.png"),
+				backgroundColor:"#1D64E2",
+				tabidx:'jscb',
+				tabtype:'',//进度查询
+				// {tit:'征集通知',val:0}, 提案催办 目前看所有
+				tabList:[
+					{tit:'接收催办',val:'jscb',limit:'zxUrge:urge:list'},
+					{tit:'发出催办',val:'fccb',limit:'zxUrge:urge:list'},
+				],
+				// litablist:[{tit:'提案类别',val:0},{tit:'提案类型',val:1},{tit:'单位类型',val:2},{tit:'选择年份',val:3},],
+				// {tit:'开始日期',val:1},{tit:'结束日期',val:2},
+				// "proposalProgress":"提案进度(0：提交提案，1：提案审查，2：提案立案，3：提案交办，4：办理提案，5：提案反馈，6：办结审核，7：已办结） ",
+				nvaHeight:44,
+				talbList:[{},],
+				taztList:[{label:'是',value:'0'},{label:'否',value:'1'}],
+				talxList:[{label:'大会提案',value:'0'},{label:'平时提案',value:'1'}],
+				talbidx:'',
+				tajd:'',
+				tajdidx:'',
+				tajdid:'',
+				datainfo:{
+					talb:'',
+				},
+				ptype:'',//弹窗类型
+				list:[],
+				pageSize: 10,
+				pageNum: 1,
+				reachflag: true,
+				wtdt:'',
+				tajdlist:[],
+				talbid:'',//提案类别id
+				talx:'',//提案类型
+				talxid:'',
+				year:'',//提案时间
+				title:'',
+				deptTree:[],
+				matterList:[],
+				blcdlist:[],
+				mycdlist:[],
+				id:'',
+				userId:this.$store.state.user.userId,
+				deptId:this.$store.state.user.deptId,
+				iteinfo:'',//选择 的数据
+			}
+		},
+		onUnload(){
+			uni.$off('refreshlist')
+		},
+		onLoad(e) {
+			this.getDataFn()
+			this.init()
+			uni.$on('refreshlist', (e) => {
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			})
+		},
+		// 上拉触底加载更多触发事件
+		onReachBottom() {
+			if (this.reachflag) {
+				this.pageNum++
+				this.getDataFn()
+			}
+		},
+		mounted() {
+			this.getHeightFn()
+		},
+		methods:{
+			checkPermi, checkRole,
+			// 提案状态
+			init(){
+				getDictionaryFn('proposal_progress').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.tajdlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
+			},
+			getConfirm(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getupSubmit(e){
+				var that=this;
+				var type=this.ptype;
+				 if(type=='dffk'||type=='dwdf'){
+					var params=JSON.parse(JSON.stringify(e))
+					params.proposalId=this.id
+					if(this.iteinfo.proposalProgress==7){
+						params.cbdwdfwy=params.content;
+						getInfoReplywyFn(params).then(res=>{
+							if(res.code==200){
+								this.$toast("答复反馈成功");
+								setTimeout(function(){
+									that.ptype='';
+									that.pageNum=1;
+									that.list=[];
+									that.reachflag=true;
+									that.getDataFn()
+								},1200)	
+							}
+						})
+					}else{
+						getInfoReplyFn(params).then(res=>{
+							if(res.code==200){
+								this.$toast("答复反馈成功");
+								setTimeout(function(){
+									that.ptype='';
+									that.pageNum=1;
+									that.list=[];
+									that.reachflag=true;
+									that.getDataFn()
+								},1200)	
+							}
+						})
+					}
+				}else if(type=='tacb'){
+					var params=JSON.parse(JSON.stringify(e))
+					params.scoreId=this.id
+					params.urgeType=1
+					getInfourgeFn(params).then(res=>{
+						if(res.code==200){
+							this.$toast("催办成功");
+							setTimeout(function(){
+								that.ptype='';
+								that.pageNum=1;
+								that.list=[];
+								that.reachflag=true;
+								that.getDataFn()
+							},1200)	
+						}
+					})
+				}
+			},
+			getHeightFn(){
+				var s=uni.getSystemInfoSync().statusBarHeight;
+				let query = uni.createSelectorQuery().in(this);
+					//需要给黄色区域设置一个id标识，在这里是demo
+				query.select('.navbox').boundingClientRect(data => {
+					this.nvaHeight =Number(data.height)//赋值，待会要用
+				}).exec();
+			},
+			getClose(){
+				this.ptype=""
+			},
+			getTabFn(ite){
+				this.tabidx=ite.val;
+				this.pageNum=1;
+				this.list=[],
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			getBack(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			getrefreshData(){
+				this.pageNum=1;
+				this.list=[];
+				this.reachflag=true;
+				this.getDataFn()
+			},
+			bindDateChangea(e){
+				var val=e.detail.value;
+				this.talx=this.talxList[val].label;
+				this.talxid=this.talxList[val].value;
+				this.getrefreshData()
+			},
+			bindDateChangeb(e){
+				var val=e.detail.value;
+				this.year=val;
+				this.getrefreshData()
+			},
+			bindDateChanged(e){
+				var val=e.detail.value;
+				this.tajd=this.tajdlist[val].label;
+				this.tajdid=this.tajdlist[val].value;
+				this.getrefreshData()
+			},
+			getDetail(data){
+				// this.$tab.navigateTo('/work/pages/case/details?id='+data+'&f='+this.tabidx)	
+			},
+			getTuiFn(data){
+				var sh=data.sh;
+				this.id=data.id;
+				var type=data.type;
+				var that=this;
+				this.ptype=type
+			},
+			getDataFn(){
+				var tab=this.tabidx;
+				var params={
+					pageSize:this.pageSize,
+					pageNum: this.pageNum,
+				}
+				if(this.title){
+					params.title=this.title
+				}
+				if(this.year){
+					params.year=this.year
+				}
+				if(tab=='jscb'){
+					params.acceptDeptId=this.deptId
+				}else{
+					params.issuerDeptId=this.deptId
+				}	
+				geturgeListFn(params).then(res=>{
+					if(res.code==200){
+						if (res.rows.length < this.pageSize) {
+							this.reachflag = false
+							this.wtdt = '到底了~';
+						} else {
+							var num = parseInt(res.rows.length) + parseInt(this.pageSize) * parseInt(this.pageNum -	1)
+							if (num < res.total) {
+								this.reachflag = true
+								this.wtdt = '上拉加载更多'
+							} else {
+								this.reachflag = false
+								this.wtdt = '到底了~';
+							}
+						}
+						if (this.pageNum == 1) {
+							this.list = res.rows;
+						} else {
+							this.list = this.list.concat(res.rows)
+						}
+					}else{
+						this.$toast(res.msg)
+					}
+				}) 
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.navbox{position: fixed;left: 0;right: 0;top: 0;z-index: 4;background-color: $com-cd3;
+	.topl{width: 60rpx;height: 60rpx;display: flex;align-items: center;justify-content: center;
+		image{width: 40rpx;height: 30rpx;}
+	}
+	.topr{display: flex;align-items: center;
+		image{width: 26rpx;height: 26rpx;margin-right: 12rpx;}
+		view{font-weight: 500;font-size: 26rpx;color: #FFFFFF;}
+	}
+	.tablists{
+		overflow: auto;flex-wrap: nowrap;
+		view{font-weight: bold;font-size: 26rpx;color: #FFFFFF;position: relative;flex: 1 0 auto;padding: 22rpx 24rpx;margin-right: 6rpx;box-sizing: border-box;text-align: center;
+			&:last-child{margin-right: 0;}
+			&.act{font-size: 30rpx;
+				&::after{content: '';width: 62rpx;height: 10rpx;background: #FFFFFF;border-radius: 4rpx;left: 50%;margin-left: -31rpx;bottom: 0rpx;position: absolute;}
+			}
+		}
+	}
+	.lbtab{height: 114rpx;background: #FFFFFF;border-radius: 30rpx;padding-left: 24rpx;position: absolute;left:24rpx;right: 24rpx;bottom: -58rpx;
+		.limg{width: 40rpx;height: 34rpx;margin-right: 10rpx;flex:0 0 auto;}
+		.lbtabs{overflow: auto;flex-wrap: nowrap;flex: 1;
+			.lbtabp{display: flex;align-items: center;flex: 1 0 auto;margin-right: 24rpx;}
+			.upimg{width: 18rpx;height: 10rpx;}
+			
+		}
+	}
+}
+.mbox{padding:58rpx 24rpx 28rpx;}
+.lbtabs /deep/ picker{padding: 0 18rpx;}
+</style>

work/pages/sqmyInfo/details.vue

@@ -55,7 +55,7 @@
 					<view class="fjlook">查看</view>
 				</view>
 			</view>
-			<view class="dbox">
+			<!-- <view class="dbox">
 				<view class="titbox mb16">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -72,7 +72,7 @@
 								<rich-text :nodes="ite.content"></rich-text>
 							</view>
 						</view>
-						<!-- 折叠 -->
+						
 						<view class="zhebox" :class="zheList[2].zheflag?'':'act'" @click="getZheFn(2)">
 							<image :src="upsimg"></image>
 							<view>{{zheList[2].zheflag?'展开信息':'折叠信息'}}</view>
@@ -85,13 +85,9 @@
 							<view class="fjlook">查看</view>
 						</view>
 					</view>
-					<!-- 暂无反馈 -->
-					<!-- <block v-else>
-						<no-data></no-data>
-					</block> -->
 					
 				</block>	
-			</view>
+			</view> -->
 			<!-- 提案立案以下隐藏 -->
 			<view class="dbox" v-if="hflist.length||datainfo.cbdwdfwy">
 				<view class="titbox mb16">
@@ -106,7 +102,7 @@
 					<view class="ftit mb10">{{ite.deptName}}</view>
 					<view class="txt wb100"><text class="w65">回复内容</text>{{ite.content}}</view>
 					<block v-if="ite.zxFjList.length">
-						<view class="txt">
+						<view class="txt fjbox">
 							<text class="w65">附件</text>
 							<view class="fjlists flext"  v-for="(fite,fidx) in ite.zxFjList" :key='fidx' @click="getDown(fite.url)">
 								<view class="imgl"><image :src="fjimg" ></image></view>
@@ -141,7 +137,7 @@
 							<view class="txt"><text>签收时间</text>{{ite.startTime}}</view>
 							<view class="txt"> <text>办结时间</text>{{ite.endTime}}</view>
 							<view class="txt" :class="zheList[2].zheflag?'nact':'act'"><text>答复内容</text>
-								<rich-text :nodes="ite.content"></rich-text>
+								<rich-text :nodes="ite.content" v-if="ite.content"></rich-text>
 							</view>
 						</view>
 						<!-- 折叠 -->
@@ -165,7 +161,7 @@
 				</block>
 				
 			</view>
-			<view class="dbox" v-if="progress>5">
+			<view class="dbox" v-if="progress>7">
 				<view class="titbox mb16">
 					<view class="tit flexc">
 						<image :src="titimg"></image>
@@ -189,7 +185,7 @@
 			</view>
 			<view class="fbtns" style="flex-wrap: wrap;">
 				<!-- 按角色选择按钮 -->
-				<view class="btn btn1" @click="getDelFn" v-if="checkPermi(['sqmyInfo:info:query'])">删除</view>
+				<view class="btn btn1" @click="getDelFn" v-if="checkPermi(['sqmyInfo:info:remove'])">删除</view>
 				<view class="btn btn1" @click="getEditFn" v-if="checkPermi(['sqmyInfo:info:edit'])&&progress==1">修改</view>
 				<view class="btn btn2" @click="getScfkFn('scfk')" v-if="checkPermi(['sqmyInfo:info:isRecord'])&&progress==1">2审查反馈</view>
 				<view class="btn btn2" @click="getScfkFn('tajb')" v-if="checkPermi(['sqmyInfo:info:assign'])&&progress==2">3提案交办</view>
@@ -268,6 +264,7 @@
 				hflist:[],
 				zblist:[],
 				xblist:[],
+				from:""
 			}
 		},
 		onUnload(){
@@ -280,6 +277,9 @@
 			uni.$on('refreshdetail', (e) => {
 				this.getDetail()
 			})
+			if(e.f){
+				this.from=e.f
+			}
 			// this.deptTree=[{id:100,label:"若依科技",children:[{id:200,label:"吃完",},{id:201,label:"vf",}]}]
 		},
 		methods:{
@@ -382,7 +382,11 @@
 					params.sqmyId=this.id
 					getsqmyInfoisRecordFn(params).then(res=>{
 						if(res.code==200){
-							this.$toast("立案成功");
+							var str='立案';
+							if(params.isRecord==1){
+								str='不立案'
+							}
+							this.$toast(str+"成功");
 							setTimeout(function(){
 								that.ptype='';
 								that.getDetail()
@@ -606,8 +610,12 @@
 				text{color: #AAAAAA;min-width: 104rpx;text-align-last: justify;flex: 0 0 auto;margin-right: 20rpx;
 					&.w65{width: 130rpx;}
 				}
-				view{text-indent: 2rem;}
+				&.fjbox{flex: 1 !important;display: flex;
+					.fjlists{flex: 1;}
+				}
+				// view{text-indent: 2rem;}
 			}
+			
 		}
 		.txtbox{text-indent: 2rem;line-height: 36rpx;font-weight: 500;font-size: 26rpx;color: #222327;
 			&.nact{max-height: 432rpx;overflow: hidden;}

work/pages/sqmyInfo/mine.vue

@@ -88,8 +88,8 @@
 	import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数
 	import {getsqmyInfoListFn,getsqmyInfoisRecordFn,getsqmyInfoAssignFn,getsqmyReplyFn,
 	getsqmyInfoShFn,getsqmyInfoIdeaFn,getsqmyInfozxIdeaFn,
-	getInfourgeFn,getsqmyInfokeyPointFn,getsqmyInfooutstandingFn,getInfounitListFn
-	} from "@/api/mine/sqmyInfo.js"
+	getInfourgeFn,getsqmyInfokeyPointFn,getsqmyInfooutstandingFn,getsqmyInfounitListFn
+	,getsqmyInfoReplywyFn} from "@/api/mine/sqmyInfo.js"
 	import popUp from "@/work/components/popup/popup.vue"
 	import sqmyInfoList from "@/work/components/sqmyInfo/list.vue"
 	import {getDictionaryFn} from "@/api/mine/register.js"
@@ -107,11 +107,16 @@
 				tabidx:'qb',
 				tabtype:'',//进度查询
 				// {tit:'征集通知',val:0}, 提案催办 目前看所有{tit:'上网社情民意',val:'swsqmy',},
-				tabList:[{tit:'全部',val:'qb',},{tit:'信息审核',jd:1,val:'xxsh',limit:'proposalInfo:info:isRecord'},{tit:'信息交办',jd:2,val:'xxjb',},
-				{tit:'信息办理',val:'xxbl',limit:'sqmyInfo:info:unitList'},{tit:'办结审核',jd:6,val:'bjsh',},
-				{tit:'信息催办',val:'xxcb',limit:'sqmyInfo:info:sqmycbList'},{tit:'接收催办',val:'jssqcb',limit:'sqmyInfo:info:sqmycbList'},
-				{tit:'信息上报',val:'xxsb',},{tit:'推荐优秀',val:'tjyx'},
-				{tit:'推荐重点',val:'tjzd'}
+				tabList:[{tit:'全部',val:'qb',limit:'sqmyInfo:info:list'},
+				{tit:'信息审核',jd:1,val:'xxsh',limit:'sqmyInfo:info:isRecord'},
+				{tit:'信息交办',jd:2,val:'xxjb',limit:'sqmyInfo:info:assign'},
+				{tit:'信息办理',val:'xxbl',limit:'sqmyInfo:info:unitList'},
+				// {tit:'办结审核',jd:6,val:'bjsh',},
+				{tit:'信息催办',val:'xxcb',limit:'sqmyInfo:info:sqmycbList'},
+				// {tit:'接收催办',val:'jssqcb',limit:'zxUrge:urge:list'},
+				{tit:'信息上报',val:'xxsb',limit:'sqmyInfo:info:list'},
+				{tit:'推荐优秀',val:'tjyx',limit:'sqmyInfo:info:outstanding'},
+				{tit:'推荐重点',val:'tjzd',limit:'sqmyInfo:info:keyPoint'}
 				],
 				// {tit:'开始日期',val:1},{tit:'结束日期',val:2},
 				// "sqmyProgress":"提案进度(0：提交提案，1：提案审查，2：提案立案，3：提案交办，4：办理提案，5：提案反馈，6：办结审核，7：已办结） ",
@@ -256,8 +261,8 @@
 			getTuiFn(data){
 				var sh=data.sh;
 				this.id=data.id;
+				this.iteinfo=data.ite;
 				var type=data.type;
-				console.log(type,1)
 				var that=this;
 				if(type=='scfk'){
 					if(sh==1){
@@ -278,28 +283,6 @@
 									that.getDataFn()
 								},1200)
 								
-							}
-						})
-					}
-				}else if(type=='lmta'){
-					if(sh==2){
-						this.ptype=data.type;
-					}else{
-						var params={
-							proposalId:data.id,
-							isAgree:1,
-						}
-						getUserverifyFn(params).then(res=>{
-							if(res.code==200){
-								this.$toast("确认联名提案成功");
-								setTimeout(function(){
-									that.ptype='';
-									that.pageNum=1;
-									that.list=[];
-									that.reachflag=true;
-									that.getDataFn()
-								},1200)
-								
 							}
 						})
 					}
@@ -313,9 +296,13 @@
 				if(type=='scfk'){
 					var params=JSON.parse(JSON.stringify(e))
 					params.sqmyId=this.id
+					var str='立案';
+					if(params.isRecord=='1'){
+						str='不予立案'
+					}
 					getsqmyInfoisRecordFn(params).then(res=>{
 						if(res.code==200){
-							this.$toast("立案成功");
+							this.$toast(str+"成功");
 							setTimeout(function(){
 								that.getrefreshData()
 							},1200)	
@@ -326,7 +313,7 @@
 					params.sqmyId=this.id
 					getsqmyInfoAssignFn(params).then(res=>{
 						if(res.code==200){
-							this.$toast("提案办结成功");
+							this.$toast("提案交办成功");
 							setTimeout(function(){
 								that.getrefreshData()
 							},1200)
@@ -335,14 +322,27 @@
 				}else if(type=='dffk'||type=='dwdf'){
 					var params=JSON.parse(JSON.stringify(e))
 					params.sqmyId=this.id
-					getsqmyReplyFn(params).then(res=>{
-						if(res.code==200){
-							this.$toast("答复反馈成功");
-							setTimeout(function(){
-								that.getrefreshData()
-							},1200)	
-						}
-					})
+
+					if(this.iteinfo.proposalProgress==7){
+						params.cbdwdfwy=params.content;
+						getsqmyInfoReplywyFn(params).then(res=>{
+							if(res.code==200){
+								this.$toast("答复反馈成功");
+								setTimeout(function(){
+									that.getrefreshData()
+								},1200)	
+							}
+						})
+					}else{
+						getsqmyReplyFn(params).then(res=>{
+							if(res.code==200){
+								this.$toast("答复反馈成功");
+								setTimeout(function(){
+									that.getrefreshData()
+								},1200)	
+							}
+						})
+					}
 				}else if(type=='jbsh'){
 					var params=JSON.parse(JSON.stringify(e))
 					params.sqmyId=this.id
@@ -563,7 +563,7 @@
 					params.userId=this.userId
 				}
 				if(tab=='xxbl'){
-					getInfounitListFn(params).then(res=>{
+					getsqmyInfounitListFn(params).then(res=>{
 						if(res.code==200){
 							if (res.rows.length < this.pageSize) {
 								this.reachflag = false