Merge remote-tracking branch 'origin/master'

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

@@ -6,7 +6,7 @@
 		<div class="mui-content fyy-wall vongi-zgtz">
 			<div class="mui-content-padded fyy-date mui-clearfix">
 				<h5>{{person_data.companyName}}
-					<a class="mui-navigate-right mui-pull-right" v-html="curDate" @click="selectDate()">2020-03-19</a>
+					<a class="mui-navigate-right mui-pull-right" v-text="curDate" @click="selectDate()">2020-03-19</a>
 				</h5>
 			</div>
 			<div class="vongi-clasadmin">
@@ -28,13 +28,13 @@
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
 						<a class="mui-control-item " :class="selectedIndex==0?'mui-active':''" style="width:30%" @click="ckSelectedIndex(0)">
-							全部<span class="mui-badge" v-html="allCount">3</span>
+							全部<span class="mui-badge" v-text="allCount">3</span>
 						</a>
 						<a class="mui-control-item" :class="selectedIndex==1?'mui-active':''" style="width:36%" @click="ckSelectedIndex(1)">
-							正常记录<span class="mui-badge" v-html="doneCount">2</span>
+							正常记录<span class="mui-badge" v-text="doneCount">2</span>
 						</a>
 						<a class="mui-control-item" :class="selectedIndex==2?'mui-active':''" style="width:34%" @click="ckSelectedIndex(2)">
-							异常记录<span class="mui-badge" v-html="undoCount">1</span>
+							异常记录<span class="mui-badge" v-text="undoCount">1</span>
 						</a>
 					</div>
 				</div>
@@ -54,7 +54,7 @@
 													<div class="mui-pull-left flew-items">
 														<div class="mui-media-object flew"><img v-if="mod.faceImageUrl!=null" :src="mod.faceImageUrl + '?x-oss-process=image/resize,m_fill,w_64'"
 															 width="50" /></div>
-														<h4 v-html="mod.name"></h4>
+														<h4 v-text="mod.name"></h4>
 														<span class="mui-icon iconfont icon-erweima1  " :style="'color:'+getGreenCodeColor(mod.healthyCode)"></span>
 													</div>
 													<div class="mui-pull-right color55f868" v-if="mod.upLoad">已上报</div>

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

@@ -10,23 +10,23 @@
 			<form class="mui-input-group">
 				<div class="mui-input-row">
 					<label>姓名</label>
-					<span v-html="detail.name">王后雄</span>
+					<span v-text="detail.name">王后雄</span>
 				</div>
 				<div class="mui-input-row">
 					<label>手机号</label>
-					<span v-html="detail.phone"> </span>
+					<span v-text="detail.phone"> </span>
 				</div>
 				<div class="mui-input-row">
 					<label>公司名称</label>
-					<span v-html="detail.position1"></span>
+					<span v-text="detail.position1"></span>
 				</div>
-				<div class="mui-input-row">
+				<div class="mui-input-row" v-if="detail.position2" >
 					<label>所属部门</label>
-					<span v-html="detail.position2"></span>
+					<span v-text="detail.position2"></span>
 				</div>
-				<div class="mui-input-row">
+				<div class="mui-input-row" v-if="detail.position3">
 					<label>岗位</label>
-					<span v-html="detail.position3"></span>
+					<span v-text="detail.position3"></span>
 				</div>
 
 			</form>
@@ -36,20 +36,20 @@
 			<form class="mui-input-group">
 				<div class="mui-input-row">
 					<label style="width:50%">自身健康情况</label>
-					<span v-html="detail.personHealthLedger.healthStatusN" style="width:50%"> </span>
+					<span v-text="detail.personHealthLedger.healthStatusN" style="width:50%"> </span>
 				</div>
 				<div class="mui-input-row">
 					<label>今日体温</label>
-					<span v-html="detail.personHealthLedger.temperature+'°C'">36.3</span>
+					<span v-text="detail.personHealthLedger.temperature+'°C'">36.3</span>
 				</div>
 				<div class="mui-input-row">
 					<label>其他情况</label>
-					<span v-html="detail.personHealthLedger.healthRemark">无</span>
+					<span v-text="detail.personHealthLedger.healthRemark">无</span>
 
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%">家庭成员身体健康情况</label>
-					<span v-html="detail.personHealthLedger.familyStatusN" style="width:30%">健康</span>
+					<span v-text="detail.personHealthLedger.familyStatusN" style="width:30%">健康</span>
 				</div>
 				<div class="mui-input-row">
 					<label style="width:50%">家庭成员健康码</label>
@@ -63,11 +63,11 @@
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%">假期是否曾前往重点疫区</label>
-					<span style="width:30%"  v-html="detail.personHealthLedger.isGoto?'是':'否'">否</span>
+					<span style="width:30%"  v-text="detail.personHealthLedger.isGoto?'是':'否'">否</span>
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%" >是否接触重点疫区高危人群</label>
-					<span style="width:30%" v-html="detail.personHealthLedger.isTouch?'是':'否'">否</span>
+					<span style="width:30%" v-text="detail.personHealthLedger.isTouch?'是':'否'">否</span>
 				</div>
 			</form>
 

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

@@ -24,11 +24,11 @@
 					<label>所属单位</label>
 					<span>{{person_popedom.companyName}}</span>
 				</div>
-				<div class="mui-input-row">
+				<div class="mui-input-row" v-if="person_popedom.deptName">
 					<label>所属部门</label>
 					<span>{{person_popedom.deptName}}</span>
 				</div>
-				<div class="mui-input-row">
+				<div class="mui-input-row" v-if="person_popedom.job">
 					<label>岗位</label>
 					<span>{{person_popedom.job}}</span>
 				</div>
@@ -39,7 +39,7 @@
 			<form class="mui-input-group vongi-editme">
 				<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-html="report.healthStatusN">其他</span>
+					<span v-if="curDateIsUpload" style="width:50%" v-text="report.healthStatusN">其他</span>
 
 					<button class="mui-btn mui-btn-block mui-navigate-right" v-if="!curDateIsUpload" @click="selectHealthStatus" type='button'
 					 style="width:50%">
@@ -48,13 +48,13 @@
 				</div>
 				<div class="mui-input-row">
 					<label>今日体温<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
-					<span v-if="curDateIsUpload" style="width:50%" v-html="report.temperature"></span>
+					<span v-if="curDateIsUpload" style="width:50%" v-text="report.temperature"></span>
 
 					<input type="text" class="mui-input-clear" v-if="!curDateIsUpload" v-model="report.temperature" placeholder="请输入体温度数  ">
 				</div>
 				<div class="mui-input-row">
 					<label>其他情况</label>
-					<span v-if="curDateIsUpload" style="width:50%" v-html="report.healthRemark"></span>
+					<span v-if="curDateIsUpload" style="width:50%" v-text="report.healthRemark"></span>
 					<input type="text" class="mui-input-clear" v-if="!curDateIsUpload" v-model="report.healthRemark" placeholder="请填写具体情况  ">
 
 
@@ -62,7 +62,7 @@
 				</div>
 				<div class="mui-input-row">
 					<label style="width:70%">家庭成员身体健康情况<i class="colorfe616c" v-if="!curDateIsUpload">*</i></label>
-					<span v-if="curDateIsUpload" style="width:30%" v-html="report.familyStatusN">其他</span>
+					<span v-if="curDateIsUpload" style="width:30%" v-text="report.familyStatusN">其他</span>
 
 					<button v-if="!curDateIsUpload" @click="selectFamilyHealthStatus" class="mui-btn mui-btn-block mui-navigate-right"
 					 type='button' style="width:30%">
@@ -84,7 +84,7 @@
 				<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-html="report.isGoto ? '是' : '否'">是</span>
+					<span v-if="curDateIsUpload" style="width:30%" v-text="report.isGoto ? '是' : '否'">是</span>
 
 					<div class="mui-input-group flew" v-if="!curDateIsUpload">
 
@@ -104,7 +104,7 @@
 
 					<label v-if="curDateIsUpload" style="width:70%;">是否接触重点疫区高危人群</label>
 
-					<span v-if="curDateIsUpload" style="width:30%" v-html="report.isTouch ? '是' : '否'">是</span>
+					<span v-if="curDateIsUpload" style="width:30%" v-text="report.isTouch ? '是' : '否'">是</span>
 
 					<div class="mui-input-group flew" v-if="!curDateIsUpload">
 

src/projects/business/views/Master/Property/Contact.vue

@@ -13,7 +13,7 @@
 						{{mod.name}}
 					</div>
 					<a :href="'tel:'+mod.telephone">
-						{{mod.telephone}}
+						{{mod.telephone}}{{mod.subTelephone?'转分机号'+mod.subTelephone:''}}
 						<span class="iconfont icon-dianhua1"></span>
 					</a>
 				</li>