Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,7 @@
 				</h5>
 			</div>
 			<div class="vongi-clasadmin">
-				<h4>职工健康码统计</h4>
+				<h4>健康码统计</h4>
 				<div class="vongi-clasadmin-list">
 					<div class="vongi-clasadmin-ma mui-col-xs-3" v-for="(item,index) in statList" :key="index" @click="goToCodeList(item.healthyCode)">
 						<span :style="'color:'+getGreenCodeColor(item.healthyCode)" v-text="item.total">2953</span>

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

@@ -14,10 +14,10 @@
 				</div>
 				<div class="mui-input-row">
 					<label>手机号</label>
-					<span v-text="detail.phone"> </span>
+					<span v-text="showTel(detail.phone)"> </span>
 				</div>
 				<div class="mui-input-row">
-					<label>公司名称</label>
+					<label>所属单位</label>
 					<span v-text="detail.position1"></span>
 				</div>
 				<div class="mui-input-row" v-if="detail.position2" >
@@ -69,6 +69,14 @@
 					<label style="width:70%" >是否接触重点疫区高危人群</label>
 					<span style="width:30%" v-text="detail.personHealthLedger.isTouch?'是':'否'">否</span>
 				</div>
+				<div class="mui-input-row">
+					<label style="width:70%">是否外省员工</label>
+					<span style="width:30%"  v-text="detail.personHealthLedger.isProvince?'是':'否'">否</span>
+				</div>
+				<div class="mui-input-row">
+					<label style="width:70%" >是否留在荆州过年</label>
+					<span style="width:30%" v-text="detail.personHealthLedger.isJingzhou?'是':'否'">否</span>
+				</div>
 				<div class="mui-input-row" style="height: 100px;">
 					<label style="width:30%;height: 100px;">定位</label>
 					<span   class="vongi-yidi-location aaa" style="text-align: left;" >{{detail.personHealthLedger.address}}</span>
@@ -93,6 +101,7 @@
 		mapMutations
 	} from 'vuex'
 	import {
+        showTel,
 		currentTimeStamp,
 		parseUnixTime
 	} from '$project/utils'
@@ -121,6 +130,9 @@
 			this.id = this.$route.query.id;
 		},
 		methods: {
+            showTel(val){
+                return showTel(val);
+			},
 			//获取详情
 			getDetail() {
 				this.isLoading = true;

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

@@ -14,12 +14,9 @@
 				</div>
 				<div class="mui-input-row">
 					<label>手机号</label>
-					<span>{{person_data.phone}}</span>
-				</div>
-				<div class="mui-input-row">
-					<label>身份证号</label>
-					<span>{{person_data.idCard}}</span>
+					<span>{{showTel(person_data.phone)}}</span>
 				</div>
+
 				<div class="mui-input-row">
 					<label>所属单位</label>
 					<span>{{person_popedom.companyName}}</span>
@@ -120,6 +117,48 @@
 					</div>
 				</div>
 
+				<div class="mui-input-row " :class="!curDateIsUpload?'vongi-pad':''">
+					<div class="mui-media-body" v-if="!curDateIsUpload">是否外省员工<i class="colorfe616c">*</i></div>
+
+					<label v-if="curDateIsUpload" style="width:70%;">是否外省员工</label>
+
+					<span v-if="curDateIsUpload" style="width:30%" v-text="report.isProvince ? '是' : '否'">是</span>
+
+					<div class="mui-input-group flew" v-if="!curDateIsUpload">
+
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>是</label>
+							<input v-model="report.isProvince" name="isProvince" value="true" type="radio">
+						</div>
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>否</label>
+							<input v-model="report.isProvince" name="isProvince" value="false" type="radio">
+						</div>
+
+					</div>
+				</div>
+
+				<div class="mui-input-row " :class="!curDateIsUpload?'vongi-pad':''">
+					<div class="mui-media-body" v-if="!curDateIsUpload">是否留在荆州过年<i class="colorfe616c">*</i></div>
+
+					<label v-if="curDateIsUpload" style="width:70%;">是否留在荆州过年</label>
+
+					<span v-if="curDateIsUpload" style="width:30%" v-text="report.isJingzhou ? '是' : '否'">是</span>
+
+					<div class="mui-input-group flew" v-if="!curDateIsUpload">
+
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>是</label>
+							<input v-model="report.isJingzhou" name="isJingzhou" value="true" type="radio">
+						</div>
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>否</label>
+							<input v-model="report.isJingzhou" name="isJingzhou" value="false" type="radio">
+						</div>
+
+					</div>
+				</div>
+
 				<div class="mui-input-row"   style="height: 100px" >
 					<label  style="width:30%;height: 100px;">定位<i class="colorfe616c"  v-if="!curDateIsUpload">*</i></label>
 					<span v-if="!curDateIsUpload" style="text-align: left;" class="vongi-yidi-location" @click="getPoint"
@@ -169,6 +208,7 @@
 		mapMutations
 	} from 'vuex'
 	import {
+        showTel,
 		currentTimeStamp,
 		parseUnixTime
 	} from '$project/utils'
@@ -185,7 +225,8 @@
 				id: '',
 				student: {},
 				report: {
-
+                    isJingzhou:null,
+                    isProvince:null,
 					healthStatus: "",
 					healthStatusN: "请选择",
 					healthRemark: "",
@@ -220,6 +261,9 @@
 
 		},
 		methods: {
+            showTel(val){
+                return showTel(val);
+            },
             getPoint(){
                 this.report.address='定位中……';
                 //this.isLoading = true;
@@ -398,6 +442,8 @@
 			},
 			submitReport() {
 
+
+
                 if (this.report.address=='定位中……'||this.report.address=='无法获取定位') {
                     mui.alert("定位失败，请点击<span class=\"mui-icon mui-icon-location\" style=\"color: #096DD9;font-size: 16px;\"></span>蓝色定位图标重新获取位置信息!");
                     return;
@@ -429,6 +475,15 @@
 					mui.toast('请输入正确的数字[30.0-40.0]');
 					return;
 				}
+                if (this.report.isProvince ==null) {
+                    mui.toast("请选择是否外省员工!");
+                    return;
+                }
+                if (this.report.isJingzhou  ==null) {
+                    mui.toast("请选择是否留在荆州过年!");
+                    return;
+                }
+
 				if (this.report.isGoto == "true" || this.report.isGoto == true) {
 					this.report.isGoto = true;
 				} else {
@@ -439,6 +494,16 @@
 				} else {
 					this.report.isTouch = false;
 				}
+                if (this.report.isJingzhou == "true" || this.report.isJingzhou == true) {
+                    this.report.isJingzhou = true;
+                } else {
+                    this.report.isJingzhou = false;
+                }
+                if (this.report.isProvince == "true" || this.report.isProvince == true) {
+                    this.report.isProvince = true;
+                } else {
+                    this.report.isProvince = false;
+                }
 				// if (this.report.pictures.length == 0) {
 				// 	mui.toast("请上传家庭成员健康码!");
 				// 	return;
@@ -474,6 +539,8 @@
                                 this.report.familyStatusN = response.personHealthLedger.familyStatusN;
                                 this.report.isGoto = response.personHealthLedger.isGoto;
                                 this.report.isTouch = response.personHealthLedger.isTouch;
+                                this.report.isJingzhou = response.personHealthLedger.isJingzhou;
+                                this.report.isProvince = response.personHealthLedger.isProvince;
                                 this.report.pictures = response.personHealthLedger.familyGreenCode.split(',');
                                 this.report.temperature = response.personHealthLedger.temperature;
                                 this.address=response.personHealthLedger.address;
@@ -497,7 +564,8 @@
 
                                 this.report.healthStatus = response.personHealthLedger.healthStatus;
                                 this.report.familyStatus = response.personHealthLedger.familyStatus;
-
+                                this.report.isJingzhou = response.personHealthLedger.isJingzhou;
+                                this.report.isProvince = response.personHealthLedger.isProvince;
                                 this.report.isGoto = response.personHealthLedger.isGoto;
                                 this.report.isTouch = response.personHealthLedger.isTouch;
                                 //this.report.pictures=response.personHealthLedger.familyGreenCode.split(',');

src/utils/index.js

@@ -362,6 +362,9 @@ export const isJSON = (str) => {
 
 //手机号隐藏中间4位
 export const showTel = (tel) => {
+	if(!tel){
+		return '';
+	}
 	tel = '' + tel;
 	return tel.substr(0, 3) + "****" + tel.substr(7);
 }