添加字段

src/projects/business/apis/Master/health.js

@@ -150,8 +150,10 @@ export function getPersonInfo(popedom) {
 export function curDateIsUpload() {
 	return request.get('/mobile/personHealthLedgerApi/curDateIsUpload')
 }
-export function getHealthStatusList() {
-	return request.post('/mobile/personHealthLedgerApi/getHealthStatusList')
+export function getHealthStatusList(code) {
+	var formData = new FormData()
+	formData.append('code', code);
+	return request.post('/mobile/personHealthLedgerApi/getHealthStatusList',formData)
 }
 
 export function uploadPicture(fileData) {

src/projects/business/views/Master/Attendance/List.vue

@@ -8,7 +8,7 @@
 				<!-- <h5>2020-09-28</h5> -->
 				<ul class="mui-table-view">
 					<li v-for="(item,index) in recordList" class="mui-table-view-cell">
-						{{item.recordTime}}
+						{{item.classifier==1?'上班时间':''}}{{item.classifier==2?'下班时间':''}}-{{item.recordTime}}
 						<div class="mui-media-body">
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='1' && item.status=='1'" @click="goToInfo(item.fillAttendanceId,item.id)">{{item.type=='1'?'已外勤打卡':'已补卡'}}</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='2'" @click="goToInfo(item.fillAttendanceId,item.id)">已拒绝</button>

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

@@ -44,6 +44,10 @@
 					<label style="width:50%">自身健康情况</label>
 					<span v-text="detail.personHealthLedger.healthStatusN" style="width:50%"> </span>
 				</div>
+				<div class="mui-input-row">
+					<label style="width:50%">疫苗接种情况</label>
+					<span v-text="detail.personHealthLedger.vaccinationStatusN" style="width:50%"> </span>
+				</div>
 				<div class="mui-input-row">
 					<label>今日体温</label>
 					<span v-text="detail.personHealthLedger.temperature+'°C'">36.3</span>

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

@@ -43,6 +43,17 @@
 						{{report.healthStatusN}}
 					</button>
 				</div>
+				
+				<div class="mui-input-row">
+					<label style="width:50%">疫苗接种情况<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
+					<span v-if="curDateIsUpload" style="width:50%" v-text="report.vaccinationStatusN">其他</span>
+				
+					<button class="mui-btn mui-btn-block mui-navigate-right" v-if="!curDateIsUpload" @click="selectHealthStatusVaccination" type='button'
+					 style="width:50%">
+						{{report.vaccinationStatusN}}
+					</button>
+				</div>
+				
 				<div class="mui-input-row">
 					<label>今日体温<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
 					<span v-if="curDateIsUpload" style="width:50%" v-text="report.temperature"></span>
@@ -191,6 +202,8 @@
                     isProvince:null,
 					healthStatus: "",
 					healthStatusN: "请选择",
+					vaccinationStatus: "",
+					vaccinationStatusN: "请选择",
 					healthRemark: "",
 					familyStatus: "",
 					familyStatusN: "请选择",
@@ -210,6 +223,7 @@
                 checkOpenId:true,
 				max: 37.3,
 				healthStatusList: [],
+					healthStatusListVaccination: [],
 			}
 		},
 		created() {
@@ -311,6 +325,16 @@
 					mui.toast(error);
 				})
 			},
+			
+			selectHealthStatusVaccination() {
+				var picker = new mui.PopPicker();
+				picker.setData(this.healthStatusListVaccination);
+			
+				picker.show((selectItems) => {
+					this.report.vaccinationStatusN = selectItems[0].text;
+					this.report.vaccinationStatus = selectItems[0].value;
+				});
+			},
 			selectHealthStatus() {
 				var picker = new mui.PopPicker();
 				picker.setData(this.healthStatusList);
@@ -417,7 +441,7 @@
                 }
 
                 if (this.report.address=='定位中……'||this.report.address=='无法获取定位') {
-                    mui.alert("定位失败，请点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
+                    mui.alert("定位失败，请检查手机权限后，点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
                     return;
                 }
 				if (this.report.healthStatus.length == 0) {
@@ -425,6 +449,14 @@
 					return;
 				}
 
+				if (this.report.vaccinationStatus.length == 0) {
+					mui.toast("请选择疫苗接种情况!");
+					return;
+				}
+				if (this.report.vaccinationStatusN.length == 0) {
+					mui.toast("请选择疫苗接种情况!");
+					return;
+				}
 				if (this.report.familyStatus.length == 0) {
 					mui.toast("请选择家庭成员身体健康情况!");
 					return;
@@ -517,6 +549,8 @@
 
                                 this.report.healthStatusN = response.personHealthLedger.healthStatusN;
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
+                                this.report.vaccinationStatusN = response.personHealthLedger.vaccinationStatusN;
+                                this.report.vaccinationStatus = response.personHealthLedger.vaccinationStatus;
 
                                 this.report.healthStatus = response.personHealthLedger.healthStatus;
                                 this.report.familyStatus = response.personHealthLedger.familyStatus;
@@ -542,7 +576,7 @@
 			},
 			getStatus() {
 
-				API_Health.getHealthStatusList().then(data => {
+				API_Health.getHealthStatusList("健康情况").then(data => {
 					var arr = data.map(item => {
 						return {
 							value: item.value,
@@ -552,6 +586,20 @@
 					this.healthStatusList = arr
 
 
+				}).catch(error => {
+					//this.isLoading = false;
+					mui.toast(error);
+				})
+				API_Health.getHealthStatusList("疫苗接种情况").then(data => {
+					var arr = data.map(item => {
+						return {
+							value: item.value,
+							text: item.name
+						};
+					});
+					this.healthStatusListVaccination = arr
+				
+				
 				}).catch(error => {
 					//this.isLoading = false;
 					mui.toast(error);