Explorar o código

内部会议电话会编辑时 研究员可重选

Karsa %!s(int64=3) %!d(string=hai) anos
pai
achega
c364e1c7a2

+ 3 - 3
pages-approve/activity/detail.vue

@@ -66,7 +66,7 @@
 				<view class="info-item flex">
 					<view class="label">审批时间:</view>
 					<view>
-						{{info.RsCalendarResearcherItem.Status==2?info.RsCalendarResearcherItem.ApproveTime:info.RsCalendarResearcherItem.RefuseTime}}
+						{{info.RsCalendarResearcherItem.Status==2?info.RsCalendarResearcherItem.ApproveTime:info.RsCalendarResearcherItem.RefuseTime | formatTime}}
 					</view>
 				</view>
 				<view class="info-item flex" v-if="info.RsCalendarResearcherItem.Status==3">
@@ -134,7 +134,7 @@
 				<view class="info-item flex">
 					<view class="label">审批时间:</view>
 					<view>
-						{{info.RsCalendarResearcherItem.Status==2?info.RsCalendarResearcherItem.ApproveTime:info.RsCalendarResearcherItem.RefuseTime}}
+						{{info.RsCalendarResearcherItem.Status==2?info.RsCalendarResearcherItem.ApproveTime:info.RsCalendarResearcherItem.RefuseTime | formatTime}}
 					</view>
 				</view>
 				<view class="info-item flex" v-if="info.RsCalendarResearcherItem.Status==3">
@@ -343,7 +343,7 @@
 
 			handleRefuse() {
 				uni.navigateTo({
-					url: `./reason?RsCalendarId=${this.RsCalendarId}&RsCalendarResearcherId=${this.RsCalendarResearcherId}type=refuse`
+					url: `./reason?RsCalendarId=${this.RsCalendarId}&RsCalendarResearcherId=${this.RsCalendarResearcherId}&type=refuse`
 				})
 			}
 		}

+ 2 - 1
pages-roadshow/addActivity/index.vue

@@ -91,6 +91,7 @@
 				:value="formData.activityClass" 
 				v-if="['报告电话会'].includes(formData.activityType)" 
 				is-link
+				readonly
 				clickable 
 				label="活动类别" 
 				placeholder="请选择活动类别" 
@@ -109,7 +110,7 @@
 				autosize
 				placeholder="选择研究员"
 				@click.native="clickRsChoose(0)"
-				:disabled="edit_id"
+				:disabled="edit_id && ['路演','公开会议'].includes(formData.activityType)"
 			/>
 			<van-field 
 				:value="formatterLabelTime(formData.selectResearchers[0].startTime)"

+ 1 - 1
pages-roadshow/addActivity/mixin.js

@@ -326,7 +326,7 @@ export default {
 		
 		/* 选择研究员弹窗展开 */
 		clickRsChoose(index,type='') {
-			if(this.edit_id || type) return;
+			if((this.edit_id && ['路演','公开会议'].includes(this.formData.activityType)) || type) return;
 			
 			this.isResearcherPicker = true;
 			this.rs_picker= {