修改身份证号校验、增加空列表状态

components/inputBox.vue

@@ -85,9 +85,33 @@ export default {
 			this.errormsg = this.label+'格式不正确'
 			return false
 		}
-
+		if(this.rule == 'idcard' && !this.validateChineseIDCard(noEmptyVal)){
+			this.errormsg = this.label+'格式不正确'
+			return false
+		}
 		this.errormsg = ''
 		return true
+	},
+	validateChineseIDCard(idCard) {
+		const pattern = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}(\d|X)$/;
+
+		if (!pattern.test(idCard)) {
+			return false;
+		}
+
+		const modWeight = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
+		const modCheckDigit = [1, 0, 'X', 9, 8, 7, 6, 5, 4, 3, 2];
+
+		const idArray = idCard.split('');
+		let sum = 0;
+		for (let i = 0; i < 17; i++) {
+			sum += parseInt(idArray[i]) * modWeight[i];
+		}
+
+		const mod = sum % 11;
+		const checkDigit = modCheckDigit[mod];
+
+		return idArray[17] === checkDigit.toString();
 	}
   }
 };

components/preBookList.vue

@@ -16,6 +16,7 @@
 				</view>
 			</view>
 		</view>
+		<img class="emptyImg" v-else :src="cssUrl + 'list_empty.svg'" alt="">
 	</view>
 </template>
 <script>
@@ -56,6 +57,7 @@ export default {
 	width: 100%;
 	height: auto;
 	overflow: hidden;
+	background: #FFFFFF;
 	.list{
 		width: 100%;
 		height: auto;
@@ -174,6 +176,12 @@ export default {
 			}
 		}
 	}
+	.emptyImg{
+		width: 440rpx;
+		opacity: .6;
+		margin-left: 50%;
+		transform: translateX(-50%);
+	}
 }
 
 </style>

pages/index/index.vue

@@ -25,7 +25,6 @@
 			<view class="con">
 			<!-- <view class="con over2 over4"> -->
 				{{doctorInfo.doctor_info.doctor_detail}} 
-				北京中医药大学硕士研究生，中国针灸学会会员，中国中医药信息学会专科专病诊疗分会理事，学会专科专病诊疗分会理事，擅长针药并用治疗内科疾病
 			</view>
 		</view>
 		
@@ -40,7 +39,10 @@
 								</text>
 							<img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)">
 						</view>
-						<view class="date over2 over4">
+						<view class="date over2 over4" v-if="item.plan==0">
+							停诊
+						</view>
+						<view class="date over2 over4"  v-else>
 							出诊：{{ item.visit_time }}
 						</view>
 					</view>
@@ -255,6 +257,11 @@
 							let indexofNum = workDatKeyArr.indexOf(item.depart_id);
 							if(indexofNum > -1){
 								let departCurItem = workDateValArr[indexofNum];
+								let flag = Array.isArray(departCurItem)
+								if(flag){
+									item.visit_time = data.workdate_desc[item.depart_id]
+									item.plan =0
+								}else{
 									for(let key in departCurItem){
 										let dateItem = departCurItem[key];
 										if(Number(dateItem.plan) === 0)continue
@@ -262,8 +269,12 @@
 										item.visit_time = timeList.join('、')
 									}
 								}
+							}
 							return item
 						})
+						console.log(this.hospital_departs,'this.hospital_departs');
+					// }else{
+
 					// }
 				});
 			},

pages/modify_visitor/modify_visitor.vue

@@ -3,7 +3,7 @@
 		<view class="block">
 			<view class="title PfScMedium">就诊人信息</view>
 			<input-box class="inputcom-wrapper" v-model="name" holder="就诊人姓名" label="姓名" @blurEvent="nameBlurEvent"></input-box>
-			<input-box class="inputcom-wrapper" v-model="idcard" holder="请输入身份证后4位" label="身份证尾号" @blurEvent="idCardBlurEvent" rule="idcardext"></input-box>
+			<input-box class="inputcom-wrapper" v-model="idcard" holder="请输入身份证号" label="身份证号" @blurEvent="idCardBlurEvent" rule="idcard"></input-box>
 			<input-box class="inputcom-wrapper" v-model="phone" holder="请输入就诊人手机号" label="常用手机号" @blurEvent="phoneBlurEvent" rule="phone"></input-box>
 		</view>