进度修改

components/notice/list.vue

@@ -32,11 +32,11 @@
 				<view class="txt flexcj mb10">
 					<view class="flex0 label">编号</view>
 					<view class="txts">{{ite.sqmyNumber}}</view>
-					<view class="btns">{{kaType(ite.sqmyProgress,tajdlist)}}</view>
+					<view class="btns">{{kaType(ite.sqmyProgress,sqtajdlist)}}</view>
 				</view>
 				<view class="txt flexcj">
 					<view class="flex0 label">主题类型</view>
-					<view class="txts">{{kaType(ite.topicType,tajdlist)}}</view>
+					<view class="txts">{{kaType(ite.topicType,ztlxlist)}}</view>
 					<view class="flex0 ml6">{{ite.time}}</view>
 				</view>
 			</view>
@@ -78,6 +78,12 @@
 				return []
 			}
 		},
+		sqtajdlist:{
+			type: Array,
+			default () {
+				return []
+			}
+		},
 		ztlxlist:{
 			type: Array,
 			default () {

config.js

@@ -3,6 +3,7 @@ module.exports = {
   // baseUrl: 'https://vue.ruoyi.vip/prod-api',
   baseUrl: 'https://qszx.qs163.cn/prod-api',
   // baseUrl: 'http://192.168.3.86:8055',
+  // baseUrl: 'http://192.168.101.168:8055',
   // baseUrl: 'http://192.168.101.245:8055',
   baseUrls: 'https://qszx.qs163.cn',
   Clientid:'428a8310cd442757ae699df5d894f051',//

manifest.json

@@ -2,8 +2,8 @@
     "name" : "政协",
     "appid" : "__UNI__FF95F38",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.4",
+    "versionCode" : 114,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/index/index.vue

@@ -157,7 +157,7 @@
 			<view style="height:114rpx;" v-if="fixedflag"></view>
 			<!-- 列表 -->
 			<view class="mt2 plr12" :style="'min-height: ' + minheight + 'px;'">
-				<notice-list :datalist="list" :wtdt="wtdt" :tajdlist="tajdlist" :ztlxlist="ztlxlist" :type='tabval' @getDetail="getDetail"></notice-list>
+				<notice-list :datalist="list" :wtdt="wtdt" :tajdlist="tajdlist" :sqtajdlist="sqtajdlist" :ztlxlist="ztlxlist" :type='tabval' @getDetail="getDetail"></notice-list>
 				<view class="upmore flexccc" @click="getMoreFn" v-if="reachflag">
 					<image :src="upimg"></image>
 					<view>加载更多</view>
@@ -230,7 +230,8 @@
 			minheight:0,
 			noticelist:[],
 			autoplay:true,
-			isMember:'0'
+			isMember:'0',
+			sqtajdlist:[]
 		}
 	},
 	onPageScroll(e) {
@@ -407,6 +408,17 @@
 					})
 				}
 			})
+			// 社情进度
+			getDictionaryFn('sqmy_jd').then(res=>{
+				if(res.code==200){
+					this.sqtajdlist = res.data.map(v => {
+						return {
+							label: v.dictLabel,
+							value: v.dictValue
+						}
+					})
+				}
+			})
 			//主题类型
 			getDictionaryFn('sqmy_topic_type').then(res=>{
 				if(res.code==200){

work/components/single/list.vue

@@ -30,7 +30,7 @@
 				</view>
 				<view class="ftxt">
 					<text>提案状态</text>
-					<view class="co0b">{{kaType(ite.proposalProgress)}}</view>
+					<view class="co0b">{{kaType(ite.proposalProgress,tajdlist)}}</view>
 				</view>
 				
 				<!-- 提案办理  回复单位-->
@@ -74,7 +74,7 @@
 				</view>
 				<view class="ftxt">
 					<text>进度情况</text>
-					<view class="co0b">{{kaType(ite.sqmyProgress)}}</view>
+					<view class="co0b">{{kaType(ite.sqmyProgress,sqtajdlist)}}</view>
 				</view>
 				
 				<!-- 委员反馈 提案办理 -->
@@ -175,6 +175,12 @@
 				return []
 			}
 		},
+		sqtajdlist:{
+			type: Array,
+			default () {
+				return []
+			}
+		},
 		type:{
 			type: [String,Number],
 			default () {
@@ -199,8 +205,8 @@
 	},
 	methods:{
 		checkPermi, checkRole,
-		kaType(ite){
-			return selectValue(this.tajdlist, ite);
+		kaType(ite,list){
+			return selectValue(list, ite);
 		},
 		getDetail(e){
 			this.$emit('getDetail',e)

work/pages/single/unitList.vue

@@ -40,7 +40,7 @@
 		</view>
 		<!-- 列表 -->
 		<view class="mbox">
-			<single-list :datalist="list" :wtdt="wtdt" :ztlxlist="ztlxlist" :tajdlist='tajdlist' :type='tabidx' @getDetail="getDetail" @getTuiFn="getTuiFn"></single-list>
+			<single-list :datalist="list" :wtdt="wtdt" :sqtajdlist="sqtajdlist" :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>
@@ -102,6 +102,7 @@
 				blcdlist:[],
 				mycdlist:[],
 				ztlxlist:[],
+				sqtajdlist:[],
 				id:'',
 				userId:this.$store.state.user.userId,
 				deptId:this.$store.state.user.deptId,
@@ -145,6 +146,17 @@
 						})
 					}
 				})
+				// 社情
+				getDictionaryFn('sqmy_jd').then(res=>{
+					if(res.code==200){
+						this.sqtajdlist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 				// 办理方式
 				getDictionaryFn('negotiation_mode').then(res=>{
 					if(res.code==200&&res.data.length){

work/pages/single/urge.vue

@@ -111,7 +111,7 @@
 		},
 		onLoad(e) {
 			this.getDataFn()
-			this.init()
+			// this.init()
 			uni.$on('refreshlist', (e) => {
 				this.pageNum=1;
 				this.list=[];