提交优化

src/projects/business/views/Master/Health/WorkerReport.vue

@@ -40,7 +40,7 @@
 
 					<button class="mui-btn mui-btn-block mui-navigate-right" v-if="!curDateIsUpload" @click="selectHealthStatus" type='button'
 					 style="width:50%">
-						{{report.healthStatusN}}
+						{{report.healthStatusN?report.healthStatusN:'请选择'}}
 					</button>
 				</div>
 				
@@ -50,7 +50,7 @@
 				
 					<button class="mui-btn mui-btn-block mui-navigate-right" v-if="!curDateIsUpload" @click="selectHealthStatusVaccination" type='button'
 					 style="width:50%">
-						{{report.vaccinationStatusN}}
+						{{report.vaccinationStatusN?report.vaccinationStatusN:'请选择'}}
 					</button>
 				</div>
 				
@@ -74,7 +74,7 @@
 
 					<button v-if="!curDateIsUpload" @click="selectFamilyHealthStatus" class="mui-btn mui-btn-block mui-navigate-right"
 					 type='button' style="width:30%">
-						{{report.familyStatusN}}
+						{{report.familyStatusN?report.familyStatusN:'请选择'}}
 					</button>
 				</div>
 				<div class="mui-input-row vongi-wordcard vongi-input-up">
@@ -444,23 +444,23 @@
                     mui.alert("定位失败，请检查手机权限后，点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
                     return;
                 }
-				if (this.report.healthStatus.length == 0) {
-					mui.toast("请选择自身健康情况!");
-					return;
-				}
+				// if (this.report.healthStatus.length == 0) {
+				// 	mui.toast("请选择自身健康情况!");
+				// 	return;
+				// }
 
-				if (this.report.vaccinationStatus.length == 0) {
-					mui.toast("请选择疫苗接种情况!");
-					return;
-				}
-				if (this.report.vaccinationStatusN.length == 0) {
+				// if (this.report.vaccinationStatus.length == 0) {
+				// 	mui.toast("请选择疫苗接种情况!");
+				// 	return;
+				// }
+				if (!this.report.vaccinationStatusN) {
 					mui.toast("请选择疫苗接种情况!");
 					return;
 				}
-				if (this.report.familyStatus.length == 0) {
-					mui.toast("请选择家庭成员身体健康情况!");
-					return;
-				}
+				// if (this.report.familyStatus.length == 0) {
+				// 	mui.toast("请选择家庭成员身体健康情况!");
+				// 	return;
+				// }
                 if (!this.report.healthStatusN) {
                     mui.toast("请选择自身健康情况!");
                     return;
@@ -522,6 +522,7 @@
                             this.student = response;
 
                             if (response.personHealthLedger != null) {
+								this.report.vaccinationStatusN = response.personHealthLedger.vaccinationStatusN;
                                 this.report.healthStatusN = response.personHealthLedger.healthStatusN;
                                 this.report.healthRemark = response.personHealthLedger.healthRemark;
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
@@ -544,9 +545,9 @@
                             this.isLoading = false;
                             this.student = response;
                             if (response.personHealthLedger != null) {
+								
                                 this.report.healthRemark = response.personHealthLedger.healthRemark;
                                 //this.report.temperature=response.personHealthLedger.temperature;
-
                                 this.report.healthStatusN = response.personHealthLedger.healthStatusN;
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
                                 this.report.vaccinationStatusN = response.personHealthLedger.vaccinationStatusN;