htc hai 1 día
pai
achega
442c9dd860

+ 4 - 3
pagesHome/components/createList.vue

@@ -376,12 +376,10 @@ export default {
 .qbox {
 	width: 100%;
 	height: 100%;
-	flex: 1;
 
 	.list {
 		flex: 1;
 		margin-top: 20rpx;
-		overflow: hidden;
 		&-item {
 			width: 100%;
 			background: #ffffff;
@@ -390,7 +388,10 @@ export default {
 			padding: 36rpx 24rpx 19rpx;
 			box-sizing: border-box;
 			position: relative;
-			display: block;
+			display: block;
+			&:first-child{
+				margin-top: 0;
+			}
 
 			.expand {
 				width: 32rpx;

+ 4 - 3
pagesHome/components/receiveList.vue

@@ -14,7 +14,7 @@
 						<view class="name">团队名称:{{item.teamName||''}}</view>
 						<view class="bottom adfacjb">
 							<view class="bottom-left">截止时间:{{item.endTime}}</view>
-							<view class="bottom-right" @click.stop="showNotice(item)">立即作答</view>
+							<view class="bottom-right" v-if="item.status===0" @click.stop="showNotice(item)">立即作答</view>
 							<!-- <view class="bottom-right" v-else-if="item.status===1" @click.stop="reviewReport(item)">查看报告</view> -->
 						</view>
 					</view>
@@ -211,12 +211,10 @@
 	.qbox{
 		width: 100%;
 		height: 100%;
-		flex: 1;
 		
 		.list{
 			flex: 1;
 			margin-top: 20rpx;
-			overflow: hidden;
 			&-item{
 				width: 100%;	
 				background: #FFFFFF;
@@ -226,6 +224,9 @@
 				box-sizing: border-box;
 				position: relative;
 				display: block;
+				&:first-child{
+					margin-top: 0;
+				}
 				
 				.status{
 					width: 164rpx;

+ 2 - 2
pagesHome/components/report/generateList.vue

@@ -22,9 +22,9 @@
 					<view class="gbox-item-bottom adfacjb">
 						<view class="gbox-item-bottom-left adfac"></view>
 						<div class="gbox-item-bottom-rightbox adfac" v-if="item.type==1">
-							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="reviewPdf(item)" v-if="item.state==1&&!item.fileUrl">预览</view>
+							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="reviewPdf(item)" v-if="item.state==1">预览</view>
 							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="askReport(item)" v-if="item.state==1&&item.fileUrl">提问</view>
-							<view class="gbox-item-bottom-right" @click="reviewReport(item)" v-if="item.state==1">查看报告</view>
+							<view class="gbox-item-bottom-right" @click="reviewReport(item)" v-if="item.state==1&&item.fileUrl">查看报告</view>
 							<view class="gbox-item-bottom-right" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
 						</div>
 						<div class="gbox-item-bottom-rightbox adfac" v-else-if="item.type==2">

+ 2 - 0
pagesHome/questionnaire.vue

@@ -136,6 +136,8 @@
 	
 		.box{
 			flex: 1;
+			overflow-y: auto;
+			margin-top: 20rpx;
 		}
 	
 		.tab{

+ 2 - 2
pagesHome/questionnaireEdit.vue

@@ -35,7 +35,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="box" style="padding: 32rpx 24rpx 18rpx;">
+		<!-- <view class="box" style="padding: 32rpx 24rpx 18rpx;">
 			<view class="box-title adfacjb">
 				<text>限制每位用户提交次数</text>
 				<u-switch v-model="limit" activeColor="#199C9C" size="38"></u-switch>
@@ -46,7 +46,7 @@
 					<cus-number-box ref="cnbRef" :min="1" :number="dto.answerSetting" @valChange="valChange"></cus-number-box>
 				</view>
 			</view>
-		</view>
+		</view> -->
 		<view class="box" style="padding: 30rpx 24rpx 0;" v-if="type==2&&!isEdit">
 			<view class="box-title adfacjb" style="margin-bottom: 21rpx;">
 				<text>团队人员</text>

+ 27 - 18
pagesPublish/questionnaireFill.vue

@@ -258,25 +258,34 @@
 					};
 				});
 				
-				this.isSubmitting = true;
-				this.$api
-					.post('/core/team/member/answer/submit', submitList)
-					.then((res) => {
-						if (res.data.code !== 0) {
-							this.isSubmitting = false;
-							return this.$showToast(res.data.msg);
+				let that = this;
+				uni.showModal({
+					title:'温馨提示',
+					content:'是否确认提交问卷?提交后不可修改。',
+					success: (res) => {
+						if(res.confirm){
+							that.isSubmitting = true;
+							that.$api
+								.post('/core/team/member/answer/submit', submitList)
+								.then((res) => {
+									if (res.data.code !== 0) {
+										that.isSubmitting = false;
+										return that.$showToast(res.data.msg);
+									}
+									uni.removeStorageSync('questionnaire');
+									let url = '/pagesPublish/questionnaireResult'
+									if(that.type == 2) url = '/pagesPublish/submitResult'
+									uni.navigateTo({ url })
+								})
+								.catch((err) => {
+									that.$showToast('网络异常,请稍后重试');
+								})
+								.finally(() => {
+									that.isSubmitting = false;
+								});
 						}
-						uni.removeStorageSync('questionnaire');
-						let url = '/pagesPublish/questionnaireResult'
-						if(this.type == 2) url = '/pagesPublish/submitResult'
-						uni.navigateTo({ url })
-					})
-					.catch((err) => {
-						this.$showToast('网络异常,请稍后重试');
-					})
-					.finally(() => {
-						this.isSubmitting = false;
-					});
+					}
+				})
 			},
 			setQuestionnaireCache() {
 				const answeredList = this.list.filter((l) => l.answer.filter(a => a?.value).length>0).map((l) => ({ id: l.id, answer: l.answer }));