Browse Source

去掉过年内容

zhengkaixin 4 năm trước cách đây
mục cha
commit
d5102c519b

+ 1 - 8
src/projects/business/views/Master/Health/WorkerInfo.vue

@@ -75,14 +75,7 @@
 					<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>

+ 5 - 62
src/projects/business/views/Master/Health/WorkerReport.vue

@@ -117,47 +117,9 @@
 					</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>
@@ -485,14 +447,7 @@
 					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;
@@ -504,16 +459,7 @@
 				} 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;
@@ -549,8 +495,6 @@
                                 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;
@@ -576,8 +520,7 @@
 
                                 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(',');