测试修改

manifest.json

@@ -2,8 +2,8 @@
     "name" : "政协",
     "appid" : "__UNI__FF95F38",
     "description" : "",
-    "versionName" : "1.1.0",
-    "versionCode" : 110,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,

pages/report/index.vue

@@ -52,7 +52,7 @@
 				</view>
 				<view class="flex mb11">
 					<view class="imgs"><image :src="infod" class="imgd"></image></view>
-					<view class="txt">乡镇(经开区)委员工作室 | {{memberInfo.studio}}</view>
+					<view class="txt">乡镇(经开区)委员工作室 | {{kaType(memberInfo.studio,wybgslist)}}</view>
 				</view>
 			</view>
 			<!-- 分 -->
@@ -262,6 +262,7 @@
 				ztlxlist:[],
 				hylxlist:[],
 				hdlxlist:[],
+				wybgslist:[],
 				mapcount:{},
 				scorecount:{},
 				tabval:0,
@@ -451,6 +452,17 @@
 						})
 					}
 				})
+				// 办公室
+				getDictionaryFn('member_studio').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.wybgslist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getDetail(){
 				var params={

work/components/popup/popup.vue

@@ -546,7 +546,7 @@
 				</view>
 				<view class="mb16" v-if="isJoin!='Y'">
 					<view class="ttxt mb18"><text class="cof0"></text>理由</view>
-					<textarea class="textar " style="height: 186rpx;" @blur="getBlur" v-model="content" placeholder="请输入请假事由" maxlength="1000" ></textarea>
+					<textarea class="textar " style="height: 186rpx;" @blur="getBlur" v-model="content" placeholder="请输入理由" maxlength="1000" ></textarea>
 				</view>
 			</view>
 			<view class="fixedbtn flexcj">

work/pages/meeting/readdetail.vue

@@ -74,7 +74,8 @@
 						    func:"detail"
 						  },
 					]},
-					{ name: 'leaveReason', label: '请假事由',align:'center'},
+					{ name: 'leaveReason', label: '请假事由',align:'center',},
+					{ name: 'approval',type:'operation', label: '批示状态',align:'center',type:"format",key:"pslist"},
 					{ name: 'operation', type:'operation',label: '批示',renders:[
 					    {
 					      name:'同意',
@@ -98,7 +99,8 @@
 				id:'',
 				title:'',
 				parameter:{
-					qjlist:[]
+					qjlist:[],
+					pslist:[{label:'待批示',value:'1'},{label:'已同意',value:'2'},{label:'未同意',value:'3'}],
 				},
 				tabidx:"",
 				qjsh:'',

work/pages/report/report.vue

@@ -52,7 +52,7 @@
 				</view>
 				<view class="flex mb11">
 					<view class="imgs"><image :src="infod" class="imgd"></image></view>
-					<view class="txt">乡镇(经开区)委员工作室 | {{memberInfo.studio}}</view>
+					<view class="txt">乡镇(经开区)委员工作室 | {{kaType(memberInfo.studio,wybgslist)}}</view>
 				</view>
 			</view>
 			<!-- 分 -->
@@ -249,6 +249,7 @@
 				ztlxlist:[],
 				hylxlist:[],
 				hdlxlist:[],
+				wybgslist:[],
 				mapcount:{},
 				scorecount:{},
 				tabval:0,
@@ -438,6 +439,17 @@
 						})
 					}
 				})
+				// 办公室
+				getDictionaryFn('member_studio').then(res=>{
+					if(res.code==200&&res.data.length){
+						this.wybgslist = res.data.map(v => {
+							return {
+								label: v.dictLabel,
+								value: v.dictValue
+							}
+						})
+					}
+				})
 			},
 			getDetail(){
 				var params={