任务开发

pages/checkMainPoints/checkMainPoints.vue

@@ -47,6 +47,7 @@
 					<view class="top-box-left">
 						<view class="index-icon">{{n + 1}}</view>
 						<text>{{child.checkItemName}}</text>
+						<!-- <text>ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)ICU病房查看危重病人的抢救全过程(访谈)的抢救全过程(访谈)</text> -->
 					</view>
 					<image src="../../static/tuli.png" 
 						@click="goLegendDetails($event ,child.checkItemId)"></image>
@@ -284,7 +285,7 @@
 			.item {
 				margin-top: 15rpx;
 				padding: 25rpx 0;
-				height: 167.5rpx;
+				min-height: 167.5rpx;
 				background-color: #fff;
 				&:nth-child(2) {
 					margin-top: 0;
@@ -298,6 +299,7 @@
 					.top-box-left {
 						display: flex;
 						flex-direction: row;
+						width: calc(100% - 55rpx);
 						.index-icon {
 							margin-right: 15rpx;
 							border-radius: 0 62.5rpx 62.5rpx 0;
@@ -308,6 +310,15 @@
 							color: #fff;
 							background-color: #66B2FE;
 						}
+						>text {
+							display: -webkit-box;
+							overflow: hidden;
+							width: calc(100% - 65rpx);
+							text-overflow: ellipsis;
+							-webkit-line-clamp: 2;
+							/*! autoprefixer: off */
+							-webkit-box-orient: vertical;
+						}
 					}
 					image {
 						margin-right: 15rpx;

pages/creatingSituations/components/checkPlan.vue

@@ -176,7 +176,7 @@
 				dateObj.end = date.f1;
 				this.end = date.f1;
 				this.myCommit('dateObj', dateObj);
-				this.changeList(this.checkPlan.checkList);
+				this.changeList([...this.checkPlan.checkList]);
 			},
 			/**
 			 * 构造计划列表

pages/creatingSituations/components/situationPreview.vue

@@ -26,12 +26,19 @@
 			</view>
 		</view>
 		<view class="box2">
-			<view>情景名称</view>
 			<view class="input-wrap">
+				<view>情景名称</view>
 				<input maxlength="16" 
 					v-model="situationPreview.sitName" 
 					placeholder="限2~16个中文、英文或数字" />
 			</view>
+			<view class="input-wrap">
+				<view>情景描述</view>
+				<textarea  maxlength="300"
+					rows=""
+					v-model="situationPreview.description" 
+					placeholder="限300字" />
+			</view>
 		</view>
 		<view class="box2">
 			<view>
@@ -209,12 +216,28 @@
 					border-bottom: 0;
 				}
 				&.input-wrap {
-					>input {
+					display: flex;
+					flex-direction: row;
+					&:last-child {
+						align-items: flex-start;
+						padding: 20rpx 0;
+						height: 200rpx;
+					}
+					view {
+						margin-right: 40rpx;
+						white-space: nowrap;
+					}
+					input, textarea {
 						padding: 0;
 						padding-right: 25rpx;
 						width: 100%;
+						font-size: 22.5rpx;
+						line-height: 33.75rpx;
 						text-align: left;
 					}
+					textarea {
+						height: 100%;
+					}
 				}
 			}
 		}

pages/creatingSituations/creatingSituations.vue

@@ -79,6 +79,10 @@
 				} else {
 					return normalBtnGroup;
 				}
+			},
+			dataIsNull() {
+				let data = this.checkMap.list.filter((item)=> item.status !== 'disable');
+				return data.length === 0;
 			}
 		},
 		onLoad:function({id,type}){
@@ -123,7 +127,7 @@
 		},
 		methods: {
 			save: function() {
-				const {sitName,preDay,preH,startDay} = this.situationPreview;
+				const {sitName,preDay,preH,startDay, description} = this.situationPreview;
 				const {dateObj,checkedItem,checkList} = this.checkPlan;
 				const {depType, options, conditionIds} = this.condition;
 				if(!sitName || sitName.length < 2) {
@@ -135,6 +139,7 @@
 					return;
 				}
 				let data = {
+					description,
 					name: sitName,
 					topic: this.theme.id,
 					checkPlanStartDate: dateObj.start,
@@ -219,6 +224,8 @@
 						let condition = this.checkRent.checkedItem.id !== null && points;
 						flage = this.errorHandle(condition, 2);
 						break;
+					case 3: flage = this.errorHandle(!this.dataIsNull, 3);
+						break;
 					case 4: 
 						const {checkList} = this.checkPlan;
 						flage = this.errorHandle(checkList.length > 0, 4);
@@ -243,7 +250,7 @@
 				} else {
 					uni.showModal({
 						title: '温馨提示',
-						content: `请先选择${this.options[index].hint}！`,
+						content: index === 3 ? '查核地图不能为空' :`请先选择${this.options[index].hint}！`,
 						showCancel: false
 					});
 					return false;

pages/creatingSituations/model.js

@@ -36,6 +36,7 @@ export default {
 		},
 		situationPreview: { // 预览
 			sitName: null,
+			description: null,
 			preDay: null,
 			preH: null,
 			startDay: null

pages/mainPointsDetail/mainPointsDetail.vue

@@ -42,7 +42,7 @@
           </view>
           <view class="checked">
             <view
-              class="checkItem"
+              class="checked-checkItem"
               @click="checkedOne(1)"
               :style="
                 Index == 1
@@ -60,7 +60,7 @@
               >
             </view>
             <view
-              class="checkItem"
+              class="checked-checkItem"
               @click="checkedOne(2)"
               :style="
                 Index == 2
@@ -78,7 +78,7 @@
               >
             </view>
             <view
-              class="checkItem"
+              class="checked-checkItem"
               @click="checkedOne(3)"
               :style="
                 Index == 3
@@ -96,7 +96,7 @@
               >
             </view>
             <view
-              class="checkItem"
+              class="checked-checkItem"
               @click="checkedOne(4)"
               :style="
                 Index == 4
@@ -114,7 +114,7 @@
               >
             </view>
             <view
-              class="checkItem"
+              class="checked-checkItem"
               @click="checkedOne(5)"
               :style="
                 Index == 5
@@ -456,7 +456,7 @@ export default {
   .checkItem {
     padding-top: 47.5rpx;
     width: 100%;
-    height: 450rpx;
+    min-height: 450rpx;
     background-color: #fff;
     position: relative;
     .chBg {
@@ -535,7 +535,7 @@ export default {
         margin-bottom: 40rpx;
         padding: 0rpx 15.62rpx;
         height: 75rpx;
-        .checkItem {
+        .checked-checkItem {
           margin: 0rpx 9.37rpx;
           padding: 0;
           width: 125rpx;

pages/situationDetail/situationDetail.vue

@@ -34,7 +34,7 @@
 			</view>
 			<view class="info-box">
 				<view class="text-box">
-					<text class="info-text">评价医院对医院评审标准与要点的遵从程度，即评价医院对规章、制度、流程、诊疗常规与操作规程的执行力。评价病人在接受诊疗的服务过程品质、环境设施，注重病人的安全、权益及隐私的保护、医院感染的控制。</text>
+					<text class="info-text">{{description}}</text>
 				</view>
 			</view>
 		</view>
@@ -70,6 +70,7 @@
 				checkGroupName:'',//查核组名
 				checkStatus:'',//查核状态
 				name:'',//查核名
+				description:'',//描述
 				startDate:'',//查核开始时间
 				endDate:'',//查核结束时间
 				nextCheckTime:'',//下次查核时间
@@ -116,6 +117,7 @@
 			}).then((data) => {
 				if (data) {
 					this.name=data.name;
+					this.description=data.description;
 					this.startDate=data.startDate;
 					this.endDate=data.endDate;
 					this.nextCheckTime=data.nextCheckTime;