Merge remote-tracking branch 'origin/master'

src/assets/css/mui.min.css

@@ -3399,7 +3399,7 @@ select:focus {
 	display: block;
 	overflow: hidden;
 	width: 100%;
-	height: 2px;
+	height: 4px;
 	-webkit-transform-origin: center top;
 	transform-origin: center top;
 	vertical-align: middle;

src/assets/css/xpwyfyy.css

@@ -1594,6 +1594,7 @@ h3 {
 
 .vongi-clasadmin-ma span {
 	font-size: 24px;
+	font-weight: bold;
 }
 
 .vongi-yddk-dat-photo {
@@ -1713,6 +1714,24 @@ h3 {
 	justify-content: space-between;
 }
 
+.vongi-fklist .vongi-clasadmin {
+	background: 0
+}
+
+.vongi-fklist .vongi-clasadmin-list {
+	margin: 0 10px;
+	background: #ffffff;
+	border-radius: 7px;
+}
+
+.vongi-fklist .vongi-clasadmin h4 {
+	font-size: 18px
+}
+
+.vongi-fklist .vongi-clasadmin button {
+	font-size: 16px
+}
+
 .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active:after {
 	width: 50px;
 	height: 2px;
@@ -2229,4 +2248,107 @@ h3 {
 
 .vongi-input-up .fyy-upphoto {
 	padding-bottom: 10px
+}
+
+.vongi-smhy-list {
+	position: relative;
+	padding-top: 30px
+}
+
+.vongi-smhy-tit {
+	text-align: center;
+	position: absolute;
+	top: 0;
+	left: 50%;
+	margin-left: -43px;
+	background: #EEEEEE;
+	padding: 0 15px;
+}
+
+.vongi-smhy-list:before {
+	width: 160px;
+	height: 1px;
+	margin-left: -80px;
+	background: #D9D9D9;
+	content: "";
+	top: 10px;
+	left: 50%;
+	position: absolute
+}
+
+.vongi-smhy-list .mui-table-view-cell {
+	line-height: 28px;
+}
+
+.vongi-smhy-list .mui-table-view-cell .vongi-smhy-more {
+	text-align: center;
+	color: #3385FF
+}
+
+.vongi-smhy-list .mui-table-view:before,
+.vongi-smhy-list .mui-table-view:after {
+	background: 0
+}
+
+.vongi-smhy-list .mui-table-view {
+	border-radius: 7px;
+}
+
+.vongi-mwsh-input .flew-sp.vongi-container {
+	width: 65%;
+	padding: 0
+}
+
+.vongi-container .mui-col-xs-8 {
+	position: relative
+}
+
+.vongi-progressbar {
+	background: #BBBBBB;
+	width: 100%;
+	height: 6px;
+	border-radius: 3px;
+	position: relative;
+	overflow: hidden;
+}
+
+.vongi-progressbar span {
+	height: 100%;
+	background: #40CF8F;
+	width: 50%;
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+
+.vongi-range {
+	width: 20px;
+	height: 20px;
+	border-radius: 50%;
+	background: #ffffff;
+	position: absolute;
+	top: -8px;
+	left: 50%;
+	box-shadow: 0 1px 6px #ccc;
+}
+
+.vongi-fklist .openfyy-list .mui-table-view-cell.vongi-mwsh-input {
+	line-height: 41px;
+	padding: 0;
+}
+
+.vongi-mwsh-input .flew-sp {
+	border-bottom: 1px #eee solid;
+	padding: 0 15px
+}
+
+.vongi-mwsh .mui-content-padded {
+	border-radius: 7px;
+	overflow: hidden;
+}
+.vongi-clasadmin .vongi-btn{
+	padding:15px 10px;	
+}
+.vongi-clasadmin .vongi-btn button{
+	border-radius: 7px;
 }

src/projects/business/apis/Guest/from.js

@@ -19,7 +19,17 @@ export function getDeviceList() {
     })
 }
 
-//获取访客记录
+//访客离开操作
+export function out(id) {
+    return request({
+        url: '/mobile/guestInfoRecordApi/out/'+id,
+        //data: Qs.stringify({id:id}),
+        method: 'get',
+    })
+}
+
+
+//离开记录
 export function getDetail(id) {
     return request({
         url: '/mobile/guestInfoRecordApi/get/'+id,
@@ -27,7 +37,6 @@ export function getDetail(id) {
         method: 'get',
     })
 }
-
 //添加访客记录
 export function add(params) {
     return request.post('/mobile/guestInfoRecordApi/add', params,{

src/projects/business/views/Guest/From/Info.vue

@@ -1,59 +1,59 @@
 <template>
   <div>
-    <header class="mui-bar mui-bar-nav">
-      <h1 class="mui-title">邀请函详情</h1>
-      <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-    </header>
-    <div class="mui-content">
+
+
+    <common @asynCallBack="asynCallBack"></common>
+    <top-header :pageTitle="pageTitle" v-if="step=='1'"   ></top-header>
+    <div class="mui-content margin60 "  v-if="step=='1'"   >
       <div class="mui-content-padded vongi-qingjiadt">
         <form class="mui-input-group">
           <div class="mui-input-row">
             <label>受邀人</label>
-            <span>刘韬</span>
+            <span>{{detail.name}}</span>
           </div>
           <div class="mui-input-row">
             <label>手机号码</label>
-            <span>15500001111</span>
+            <span>{{detail.mobilePhone}}</span>
           </div>
           <div class="mui-input-row">
             <label>身份证号</label>
-            <span>420400199301011010</span>
+            <span>{{detail.idCard}}</span>
           </div>
-          <div class="mui-input-row">
+          <div class="mui-input-row" v-if="detail.isUpPhoto">
             <label style="width: 50%">人脸识别照片</label>
-            <span class="vongi-qingjiadt-photo"
-              ><img src="~$project/assets/img/audit1.png" />
+
+            <span  style="width: 50%" v-if="!detail.photo" >未上传</span>
+            <span class="vongi-qingjiadt-photo"  v-if="detail.photo" >
+               <img  :src="detail.photo">
             </span>
           </div>
           <div class="mui-input-row">
             <label>受邀单位</label>
-            <span>湖北荆盛商贸有限公司</span>
+            <span>{{detail.unit}}</span>
           </div>
           <div class="mui-input-row">
             <label>访问事由</label>
-            <span>商务洽谈</span>
+            <span>{{detail.visitReasons}}</span>
           </div>
           <div class="mui-input-row">
             <label>邀访时间</label>
-            <span>2020-9-18 15:00:00</span>
+            <span>{{detail.visitDate}}</span>
           </div>
           <div class="mui-input-row">
             <label>结束时间</label>
-            <span>2020-9-18 17:30:00</span>
+            <span>{{detail.expirationTime}}</span>
           </div>
           <div class="mui-input-row">
-            <label style="width: 50%">人脸识别照片</label>
-            <span class="vongi-fkdat-name" style="width: 50%">
-              <a class="flew mui-navigate-right vongi-padright" href="">
-                <h5>冯</h5>
-                <h5>冯</h5>
-                <h5>冯</h5>
+            <label style="width: 50%">同行人员</label>
+            <span class="vongi-fkdat-name" style="width: 50%" >
+              <a class="flew mui-navigate-right vongi-padright"   v-if="list.length"  @click="step='2'" >
+                   <h5 v-for="mod in getFellow()">{{mod}}</h5>
               </a>
             </span>
           </div>
           <div class="mui-input-row">
             <label>车牌号</label>
-            <span>鄂D88888</span>
+            <span>{{detail.numberPlate}}</span>
           </div>
         </form>
       </div>
@@ -61,28 +61,194 @@
         <form class="mui-input-group vongi-login-form">
           <div class="mui-input-row">
             <label>邀请单状态</label>
-            <span class="color55f868">已确认</span>
+            <span :class="statusColor[detail.status]" v-text="status[detail.status]"></span>
             <!--<span class="colorf8b155">待确认</span>
 						<span class="color999">已过期</span>-->
           </div>
           <div class="mui-input-row">
             <label>发送时间</label>
-            <span>2020-09-16 10:00:00 </span>
+            <span>{{detail.createTime}}</span>
           </div>
           <div class="mui-input-row">
             <label>确认时间</label>
-            <span>2020-09-17 12:57:30 </span>
+            <span>{{detail.confirmationTime}} </span>
           </div>
         </form>
       </div>
-      <div class="vongi-btn vongi-login-btn">
-        <button class="mui-btn mui-btn-primary">确认访客已离开</button>
+
+
+
+
+    </div>
+    <div class="fyy-footer" v-if="!detail.outTime&&(detail.status=='1'||detail.status=='3')&&step=='1'">
+      <div class="bindfyy-btn">
+        <button type="button" class="mui-btn mui-btn-primary " @click="out"  >
+          确认访客已离开
+        </button>
+      </div>
+    </div>
+
+    <div class="fyy-footer" v-if="detail.status=='0'&&step=='1'">
+      <div class="bindfyy-btn">
+        <button type="button" class="mui-btn mui-active  "   >
+          等待受邀者确认...
+        </button>
       </div>
     </div>
+    <div class="fyy-footer" v-if="detail.outTime!=null&&step=='1'">
+      <div class="bindfyy-btn">
+        <button type="button" class="mui-btn  mui-active "   >
+          访客已离开
+        </button>
+      </div>
+    </div>
+
+    <header class="mui-bar mui-bar-nav"  v-if="step=='2'">
+      <h1 class="mui-title">同行人员</h1>
+      <a   class="mui-icon mui-icon-left-nav mui-pull-left"  @click="step='1'"></a>
+
+    </header>
+    <div   v-if="step=='2'" class="mui-content margin60">
+      <div class="mui-content-padded vongi-editme vongi-qingjiadt">
+        <form class="mui-input-group" v-for="(item,index) in list" style="padding-top: 10px">
+          <div class="mui-input-row">
+            <label>姓名<i class="colorfe616c"></i></label>
+            <span>{{item.name}}</span>
+
+          </div>
+          <div class="mui-input-row">
+            <label>手机号码</label>
+            <span>{{item.mobilePhone}}</span>
+
+          </div>
+          <div class="mui-input-row">
+            <label>身份证号</label>
+            <span>{{item.idCard}}</span>
+
+          </div>
+
+        </form>
+      </div>
+
+    </div>
+    <loading :visible="isLoading"></loading>
+
   </div>
 </template>
 
+
 <script>
+
+  import * as API_From from '@/apis/Guest/from'
+  import Common from '$project/components/Common.vue'
+  import Loading from '$project/components/Loading.vue'
+  import TopHeader from '$project/components/TopHeader.vue'
+  import {
+    mapGetters,
+    mapMutations
+  } from 'vuex'
+  import {
+
+  } from '$project/utils'
+  export default {
+    name: 'GuestFromInfo',
+    components: {
+      Common,
+      Loading,
+      TopHeader
+    },
+    data() {
+      return {
+        pageTitle: '邀请函详情',
+        step:'1',
+        id: '',
+        detail: {
+          id:'',
+          name:'',
+          mobilePhone:'',
+          unit:'',
+          visitReasons:'',
+
+          visitDate: '请选择',
+          expirationTime: '请选择',
+          issueDevice: '',
+          isUpPhoto:1,
+        },
+        list:[],
+        isLoading: false,
+
+        status: ['待确认', '已确认', '已拒绝','已过期'],
+        statusColor: ['colorf8b155', 'color55f868', 'colorfe616c','color999'],
+
+      }
+    },
+    created() {
+      this.id = this.$route.query.id;
+    },
+    methods:  {
+
+      getFellow(){
+        var sz=[];
+        if(this.list){
+          for(var  m in this.list){
+            var mod =this.list[m];
+            if(mod.name){
+              sz.push(mod.name.substring(0,1))
+            }
+          }
+        }
+        return sz;
+      },
+      out(){
+        this.isLoading = true;
+
+        API_From.out(this.id ).then(response => {
+          this.isLoading = false;
+
+          this.detail.outTime = true;
+
+        }).catch(error => {
+          this.isLoading = false;
+          mui.toast(error);
+        })
+      },
+      //获取详情
+      getDetail() {
+        this.isLoading = true;
+
+        API_From.getDetail(this.id ).then(response => {
+          this.isLoading = false;
+
+          this.detail = response.info;
+          this.list=response.list;
+        }).catch(error => {
+          this.isLoading = false;
+          mui.toast(error);
+        })
+      },asynCallBack(){},
+    },
+    mounted() {
+      if(this.id){
+        this.detail.id=this.id;
+        this.getDetail();
+      }
+
+
+    },
+
+
+    destroyed() {
+
+    },
+    computed: {
+      ...mapGetters({
+        openId: 'wx_openid',
+        token: 'token',
+        person_data: 'person_data',
+        person_popedom: 'person_popedom',
+      })
+    }
+  }
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>

src/projects/business/views/Guest/To/Info.vue

@@ -52,10 +52,10 @@
                     type="button"
                     style="width: 50%"
 
-                    @click="clickMyFile(detail)"
+                    @click="clickMyFile(subForm)"
             >
-            <div  v-if="!detail.photo">请上传</div>
-            <img     v-if="detail.photo" :src="detail.photo">
+            <div  v-if="!subForm.photo">请上传</div>
+            <img     v-if="subForm.photo" :src="subForm.photo">
             </button>
             <!--请上传-->
           </div>
@@ -136,10 +136,11 @@
                     type="text"
                     v-model="item.idCard"
                     class="mui-input-clear"
-                    placeholder="请输入单位名称"
+                    placeholder="请输入身份证号"
             />
           </div>
-          <div class="mui-input-row" v-if="detail.isUpPhoto" >
+
+          <div class="mui-input-row" v-if="false" >
             <label style="width: 50%"
             >人脸识别照片<i class="iconfont icon-tishi color4fc5f7" @click="valert"></i
             ></label>
@@ -331,7 +332,7 @@
         }
         return sz;
       },
-      //微信选择图片
+      //选择图片
       uploadPicture(event) {
 
 
@@ -370,26 +371,7 @@
         this.uploadpic(obj.field);
         this.cropperVisible = false;
       },
-      //微信选择图片
-      chooseImageWx(mod) {
-        this.indexModel=mod;
-
-        WxJsApi.chooseImage().then(res => {
-          var localData = res.localData;
 
-          if (localData.indexOf('data:image') != 0) {
-            //判断是否有这样的头部
-            localData = 'data:image/jpeg;base64,' + localData
-          }
-          localData = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
-          this.imgBase64 = localData;
-          //显示裁剪图片
-          //_this.showCropper(field);
-          this.uploadpic();
-        }).catch(error => {
-          mui.toast(error);
-        })
-      },
       //上传图片
       uploadpic() {
         this.isLoading = true;
@@ -462,7 +444,7 @@
     },
     mounted() {
       //获取微信配置
-     // WxJsApi.getWxConfig();
+
       this.getDetail();
 
     },

src/projects/business/views/Master/Guest/Approval.vue

@@ -1,8 +1,140 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">门卫审核信息</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-fklist margin60">
+			<ul class="mui-table-view openfyy-list vongi-mwsh">
+				<li class="mui-table-view-cell mui-media">
+					<div class="mui-ellipsis flew-sp">
+						来访人员：刘韬
+						<span>访问电话：15522331122</span>
+					</div>
+					<div class="mui-ellipsis flew-sp">
+						访问时间：2020-09-18 15:00:00
+					</div>
+				</li>
+				<li class="mui-table-view-cell mui-media vongi-mwsh-input">
+					<div class="mui-ellipsis flew-sp">
+						来访人员
+					</div>
+					<div class="mui-ellipsis flew-sp">
+						姓名：刘韬
+						<span>联系电话：15500001111</span>
+					</div>
+					<div class="mui-ellipsis flew-sp">
+						身份证号：4204001993001011010
+					</div>
+					<div class="flew-sp">
+						<label>入场体温</label>
+						<div class="vongi-container flew-sp flew-items">
+							<div class="mui-col-xs-8">
+								<p class="vongi-progressbar">
+									<span></span>
+								</p>
+								<div class="vongi-range"></div>
+							</div>
+							<span>36.3℃</span>
+						</div>
+					</div>
+					<div class="flew-sp">
+						<label>出场体温</label>
+						<div class="vongi-container flew-sp flew-items">
+							<div class="mui-col-xs-8">
+<!--								<p class="mui-progressbar vongi-progressbar">-->
+<!--									<span></span>-->
+<!--								</p>-->
+<!--								<div class="vongi-range"></div>-->
+
+								<div class="mui-input-row mui-input-range">
+
+									<input type="range"   min="0" max="100">
+								</div>
+							</div>
+							<span>36.3℃</span>
+						</div>
+					</div>
+				</li>
+				<li class="mui-input-group mui-content-padded vongi-editme">
+					<div class="mui-input-row">
+						<label>车牌号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入车牌号">
+					</div>
+				</li>
+				<li class="mui-input-group mui-content-padded">
+					<div class="mui-input-row">
+						<label>进场时间</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							2020-10-12 15:00:00
+						</button>
+					</div>
+					<div class="mui-input-row">
+						<label>出场时间</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							请选择
+						</button>
+					</div>
+				</li>
+			</ul>
+		</div>
+		<div class="fyy-footer">
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary ">提  交</button></div>
+		</div>
+</div>
 </template>
 
 <script>
-</script>
+	require('$project/assets/js/mui.picker.min.js');
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+ 	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'Master',
+		components: {
+			Common,
+			Loading,
+			TopHeader,
+
+		},
+		data() {
+			return {
+				isLoading: false,
+
+
+			}
+		},
+		created() {},
+		methods: {
+
+			asynCallBack() {
 
+			},
+		},
+		mounted() {
+
+
+
+		},
+		destroyed() {
+
+		},
+		computed: {
+
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				menu_list: 'menu_list'
+			})
+		}
+	}
+</script>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
-</style>
+</style>

src/projects/business/views/Master/Guest/Scan.vue

@@ -1,8 +1,71 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">扫码核验</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-fklist">
+			<div class="vongi-clasadmin">
+				<h4>湖北荆鹏软件有限公司</h4>
+				<div class="vongi-clasadmin-list">
+					<div class="vongi-clasadmin-ma mui-col-xs-6">
+						<p class="mui-ellipsis">2020-09-18</p>
+						<span class="color05c8af">2953</span>
+						<div class="mui-media-body">总预约数</div>
+					</div>
+					<div class="vongi-clasadmin-ma mui-col-xs-6">
+						<p class="mui-ellipsis">企业今日出入情况</p>
+						<span class="color05c8af">18/18</span>
+						<div class="mui-media-body">进厂数 / 出厂数</div>
+					</div>
+				</div>
+				<div class="vongi-btn">
+					<button class="mui-btn mui-btn-primary">
+						扫码核验<span class="iconfont icon-saoyisao"></span>
+					</button>
+				</div>
+			</div>
+			<div class="vongi-smhy-list">
+				<div class="vongi-smhy-tit">出入记录</div>
+				<ul class="mui-table-view mui-content-padded">
+					<li class="mui-table-view-cell mui-media">
+						<a href="javascript:;" class="mui-navigate-right">
+							远鹏众创空间
+						</a>
+						<div class="mui-ellipsis flew-sp">
+							来访人员：刘韬
+							<span>访问时间：15:00:00-17:30:00</span>
+						</div>
+						<p class="mui-ellipsis flew-sp">
+							同行人员：2
+							<span>出厂时间：-</span>
+						</p>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<a href="javascript:;" class="mui-navigate-right">
+							远鹏众创空间
+						</a>
+						<div class="mui-ellipsis flew-sp">
+							来访人员：刘韬
+							<span>访问时间：15:00:00-17:30:00</span>
+						</div>
+						<p class="mui-ellipsis flew-sp">
+							同行人员：2
+							<span>出厂时间：-</span>
+						</p>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<a href="" class="vongi-smhy-more">查看全部记录</a>
+					</li>
+				</ul>				
+			</div>			
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style>
 </style>

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

@@ -50,7 +50,7 @@
 										</a>
 										<ul class="mui-table-view mui-table-view-chevron">
 											<li class="mui-table-view-cell" v-for="(mod,index2) in item.list" :key="index2">
-												<a class="mui-navigate-right" @click="viewDetail(mod)" :class="{'mui-navigate-right': mod.upLoad}">
+												<a   @click="viewDetail(mod)" :class="{'mui-navigate-right': mod.upLoad}">
 													<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>
@@ -287,7 +287,7 @@
 			viewDetail(item) {
 				if (item.upLoad) {
 					this.$router.push({
-						name: 'HouseKeeperControlHealthWorkerInfo',
+						name: 'MasterHealthWorkerInfo',
 						query: {
 							id: item.personHealthLedgerId
 						}

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

@@ -18,16 +18,15 @@
 				</div>
 				<div class="mui-input-row">
 					<label>公司名称</label>
-					<span v-html="detail.companyName"></span>
+					<span v-html="detail.personHealthLedger.personInfo.position1"></span>
 				</div>
 				<div class="mui-input-row">
-					<label>工号</label>
-					<span> </span>
+					<label>所属部门</label>
+					<span v-html="detail.personHealthLedger.personInfo.position2"></span>
 				</div>
-
 				<div class="mui-input-row">
 					<label>岗位</label>
-					<span> </span>
+					<span v-html="detail.personHealthLedger.personInfo.position3"></span>
 				</div>
 
 			</form>
@@ -45,8 +44,7 @@
 				</div>
 				<div class="mui-input-row">
 					<label>其他情况</label>
-					<!--						<span>无</span>-->
-					<textarea class="mui-input-textarea" readonly v-html="detail.personHealthLedger.healthRemark"></textarea>
+					<span v-html="detail.personHealthLedger.healthRemark">无</span>
 
 				</div>
 				<div class="mui-input-row">
@@ -64,12 +62,12 @@
 					</span>
 				</div>
 				<div class="mui-input-row">
-					<label style="width:70%" v-html="detail.personHealthLedger.isGoto?'是':'否'">假期是否曾前往重点疫区</label>
-					<span style="width:30%">否</span>
+					<label style="width:70%">假期是否曾前往重点疫区</label>
+					<span style="width:30%"  v-html="detail.personHealthLedger.isGoto?'是':'否'">否</span>
 				</div>
 				<div class="mui-input-row">
-					<label style="width:70%" v-html="detail.personHealthLedger.isTouch?'是':'否'">是否接触重点疫区高危人群</label>
-					<span style="width:30%">否</span>
+					<label style="width:70%" >是否接触重点疫区高危人群</label>
+					<span style="width:30%" v-html="detail.personHealthLedger.isTouch?'是':'否'">否</span>
 				</div>
 			</form>
 

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

@@ -1,115 +1,510 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">健康打卡</h1>
-			</header>
-			<div class="mui-content vongi-qingjiadt">
-				<div class="mui-content-padded">
-					<h5>身份信息</h5>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-qingjiadt">
+			<div class="mui-content-padded">
+				<h5>身份信息</h5>
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>姓名</label>
+					<span>{{person_data.name}}</span>
 				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>姓名</label>
-						<span>王后雄</span>
-					</div>
-					<div class="mui-input-row">
-						<label>手机号</label>
-						<span>18600112233</span>
-					</div>
-					<div class="mui-input-row">
-						<label>身份证号</label>
-						<span>420400200002020101</span>
-					</div>
-					<div class="mui-input-row">
-						<label>所属单位</label>
-						<span>湖北荆鹏软件集团有限公司</span>
-					</div>
-					<div class="mui-input-row">
-						<label>所属部门</label>
-						<span>信息工程中心</span>
-					</div>
-					<div class="mui-input-row">
-						<label>岗位</label>
-						<span>员工</span>
-					</div>
-				</form>
-				<div class="mui-content-padded">
-					<h5>健康状态</h5>
+				<div class="mui-input-row">
+					<label>手机号</label>
+					<span>{{person_data.phone}}</span>
 				</div>
-				<form class="mui-input-group vongi-editme">
-					<div class="mui-input-row">
-						<label style="width:50%">自身健康情况</label>
-						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
-							健康
-						</button>
-					</div>
-					<div class="mui-input-row">
-						<label>今日体温<i class="colorfe616c">*</i></label>
-						<input type="text" class="mui-input-clear" placeholder="请输入体温度数  ">
-					</div>
-					<div class="mui-input-row">
-						<label>其他情况</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写具体情况  ">
-					</div>
-					<div class="mui-input-row">
-						<label style="width:70%">家庭成员身体健康情况<i class="colorfe616c">*</i></label>
-						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:30%">
-							健康
-						</button>
-					</div>
-					<div class="mui-input-row vongi-wordcard vongi-input-up">
-						<div class="mui-media-body">上传家庭成员健康码</div>
-						<div class="fyy-upphoto">
-							<div class="mui-col-xs-3 fyy-upphoto-close">
-								<img src="~$project/assets/img/zhaop.jpg" />
-								<a class="mui-icon mui-icon-closeempty"></a>
-							</div>
-							<div class="mui-col-xs-3">
-								<a><i class="mui-icon mui-icon-plusempty"></i></a>
-							</div>
+				<div class="mui-input-row">
+					<label>身份证号</label>
+					<span>{{person_data.idCard}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>所属单位</label>
+					<span>{{person_data.position1}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>所属部门</label>
+					<span>{{person_data.position2}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>岗位</label>
+					<span>{{person_data.position3}}</span>
+				</div>
+			</form>
+			<div class="mui-content-padded">
+				<h5>健康状态</h5>
+			</div>
+			<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>
+
+					<button class="mui-btn mui-btn-block mui-navigate-right"
+							v-if="!curDateIsUpload"
+							@click="selectHealthStatus"
+							type='button' style="width:50%">
+						{{report.healthStatusN}}
+					</button>
+				</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>
+
+					<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>
+					<input type="text" class="mui-input-clear"
+						   v-if="!curDateIsUpload"
+						   v-model="report.healthRemark" placeholder="请填写具体情况  ">
+
+
+
+				</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>
+
+					<button  v-if="!curDateIsUpload"
+							 @click="selectFamilyHealthStatus"
+							 class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:30%">
+						{{report.familyStatusN}}
+					</button>
+				</div>
+				<div class="mui-input-row vongi-wordcard vongi-input-up">
+					<div class="mui-media-body">上传家庭成员健康码</div>
+					<div class="fyy-upphoto">
+						<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(picture,index) in report.pictures" :key="index"  >
+							<img :src="picture + '?x-oss-process=image/resize,m_fill,w_128,h_128'" />
+							<a class="mui-icon mui-icon-closeempty" v-if="!curDateIsUpload" @click="delImg(index)" ></a>
+						</div>
+						<div class="mui-col-xs-3"  v-if="!curDateIsUpload"   @click="changeImg" >
+							<a><i class="mui-icon mui-icon-plusempty"></i></a>
 						</div>
 					</div>
-					<div class="mui-input-row vongi-pad">
-						<div class="mui-media-body">假期是否曾前往重点疫区<i class="colorfe616c">*</i></div>
-						<div class="mui-input-group flew">
-							<div class="mui-radio mui-left mui-col-xs-6">
-								<label>是</label>
-								<input name="radio1" type="radio">
-							</div>
-							<div class="mui-radio mui-left mui-col-xs-6">
-								<label>否</label>
-								<input name="radio1" type="radio" checked>
-							</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-html="report.isGoto ? '是' : '否'">是</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.isGoto" name="isGoto" value="true" type="radio">
+						</div>
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>否</label>
+							<input     v-model="report.isGoto" name="isGoto" value="false" type="radio">
 						</div>
+
 					</div>
-					<div class="mui-input-row vongi-pad">
-						<div class="mui-media-body">是否接触重点疫区高危人群<i class="colorfe616c">*</i></div>
-						<div class="mui-input-group flew">
-							<div class="mui-radio mui-left mui-col-xs-6">
-								<label>是</label>
-								<input name="radio2" type="radio">
-							</div>
-							<div class="mui-radio mui-left mui-col-xs-6">
-								<label>否</label>
-								<input name="radio2" type="radio" checked>
-							</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-html="report.isTouch ? '是' : '否'">是</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.isTouch" name="isTouch" value="true" type="radio">
 						</div>
+						<div class="mui-radio mui-left mui-col-xs-6">
+							<label>否</label>
+							<input     v-model="report.isTouch" name="isTouch" value="false" type="radio">
+						</div>
+
 					</div>
-				</form>
-				<div class="vongi-btn vongi-login-btn">
-					<button class="mui-btn mui-btn-primary ">
-							提交
-						</button>
 				</div>
+			</form>
+			<div class="vongi-btn vongi-login-btn" v-if="!curDateIsUpload&&!send">
+				<button class="mui-btn mui-btn-primary " @click="submitReport()" >
+					提交
+				</button>
 			</div>
-</div>
+			<div class="fyy-popup-button" v-if="curDateIsUpload&&!send" >
+				<div class="mui-col-xs-6">
+					<button class="mui-btn mui-btn-primary " @click="sendReport()" >
+						确认提交
+					</button>
+				</div>
+				<div class="mui-col-xs-6">
+					<button class="mui-btn mui-btn-warning " @click="noSubmitReport()" >
+						撤回编辑
+					</button>
+				</div>
+
+			</div>
+
+		</div>
+		<loading :visible="isLoading"></loading>
+
+	</div>
 </template>
 
+
 <script>
-</script>
+	require('$project/assets/js/mui.picker.min.js');
+	import * as API_Health from '@/apis/Master/health'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+
+	import * as WxJsApi from '$project/utils/wxJsApi'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime
+	} from '$project/utils'
+	export default {
+		name: 'MasterHealthWorkerReport',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '健康打卡',
+				id: '',
+				student: {},
+				report: {
+					healthStatus: "",
+					healthStatusN: "请选择",
+					healthRemark: "",
+					familyStatus: "",
+					familyStatusN: "请选择",
+					pictures: [],
+					isGoto: false,
+					isTouch: false
+				},
+				curDateIsUpload:false,
+				send:false,
+				isLoading: false,
+				max:37.3,
+				healthStatusList:[],
+			}
+		},
+		created() {
+			this.id = this.$route.query.id;
+			this.getStatus();
+			API_Health.curDateIsUpload().then(data => {
+				this.curDateIsUpload=data;
+				this.send=data;
+
+				if (data) {
+					API_Health.getDetail(this.id,'1').then(response => {
+						this.isLoading = false;
+						this.student = response;
+
+						if(response.personHealthLedger!=null){
+							this.report.healthStatusN=response.personHealthLedger.healthStatusN;
+							this.report.healthRemark=response.personHealthLedger.healthRemark;
+							this.report.familyStatusN=response.personHealthLedger.familyStatusN;
+							this.report.isGoto=response.personHealthLedger.isGoto;
+							this.report.isTouch=response.personHealthLedger.isTouch;
+							this.report.pictures=response.personHealthLedger.familyGreenCode.split(',');
+							this.report.temperature=response.personHealthLedger.temperature;
+
+						}
+
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+
+				} else {
+					API_Health.getPersonInfo('1').then(response => {
+						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.healthStatus=response.personHealthLedger.healthStatus;
+							this.report.familyStatus=response.personHealthLedger.familyStatus;
+
+							this.report.isGoto=response.personHealthLedger.isGoto;
+							this.report.isTouch=response.personHealthLedger.isTouch;
+							//this.report.pictures=response.personHealthLedger.familyGreenCode.split(',');
+						}
+						this.id=response.id;
+
+
+
+
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			}).catch(error => {
+				this.isLoading = false;
+				mui.toast(error);
+			})
+
+		},
+		methods: {
+			asynCallBack(){},
+			delImg(index){
+
+				this.report.pictures.splice(index, 1);
+			},
+			changeImg() {
+				if(this.report.pictures.length >= 3){
+					mui.toast("只能上传3张家庭成员健康码");
+					return;
+				}
+				var _this = this;
+
+				WxJsApi.chooseImage().then(res => {
+					var localData = res.localData;
+
+					if (localData.indexOf('data:image') != 0) {
+						//判断是否有这样的头部
+						localData = 'data:image/jpeg;base64,' + localData
+					}
+					localData = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
+					this.imgBase64 = localData;
+					//显示裁剪图片
+					//_this.showCropper(field);
+					this.uploadpic();
+				}).catch(error => {
+					mui.toast(error);
+				})
+
+
+			},
+			//上传图片
+			uploadpic() {
+				this.isLoading = true;
+
+				WxJsApi.uploadPic(this.imgBase64).then(response => {
+					this.isLoading = false;
+					this.report.pictures.push(response);
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			selectHealthStatus() {
+				var picker = new mui.PopPicker();
+				picker.setData(this.healthStatusList);
+
+				picker.show((selectItems) => {
+					this.report.healthStatusN = selectItems[0].text;
+					this.report.healthStatus = selectItems[0].value;
+				});
+			},
+			selectFamilyHealthStatus() {
+				var picker = new mui.PopPicker();
+				picker.setData(this.healthStatusList);
 
+				picker.show((selectItems) => {
+					this.report.familyStatusN = selectItems[0].text;
+					this.report.familyStatus = selectItems[0].value;
+				});
+
+			},
+			uploadPicture(event) {
+				if(this.report.pictures.length >= 3){
+					mui.toast("只能上传3张家庭成员健康码");
+					return;
+				}
+				var fileData = event.target.files[0];
+
+				this.isLoading = true;
+
+				API_Health.uploadPicture(fileData).then(data => {
+					this.report.pictures.push(data);
+
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			fatherMethod(idCard){
+				this.student.idCard=idCard
+			},
+			selectGoto() {
+				var picker = new mui.PopPicker();
+
+				picker.setData([{
+					text: "是",
+					value: true
+				},
+					{
+						text: "否",
+						value: false
+					}
+				]);
+
+				picker.show((selectItems) => {
+					this.report.isGoto = selectItems[0].value;
+				});
+			},
+			selectTouch() {
+				var picker = new mui.PopPicker();
+
+				picker.setData([{
+					text: "是",
+					value: true
+				},
+					{
+						text: "否",
+						value: false
+					}
+				]);
+
+				picker.show((selectItems) => {
+					this.report.isTouch = selectItems[0].value;
+				});
+			},
+			sendReport(){
+				this.isLoading = true;
+				API_Health.save({
+					...this.report,
+					personId: this.student.id,
+					familyGreenCode: this.report.pictures.join(",")
+				}).then(data => {
+					mui.toast("已提交");
+					this.send=false;
+					this.isLoading = false;
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			} 	,noSubmitReport(){
+				this.curDateIsUpload=false;
+			},
+			submitReport() {
+
+				if (this.report.healthStatus.length == 0) {
+					mui.toast("请选择自身健康情况!");
+					return;
+				}
+
+				if (this.report.familyStatus.length == 0) {
+					mui.toast("请选择家庭成员身体健康情况!");
+					return;
+				}
+				if (!this.report.temperature) {
+					mui.toast('请输入体温度数');
+					return ;
+				}
+				var reg = new RegExp("^((3\\d)|(3\\d\\.\\d|40|40.0))$");
+
+				if (!reg.test(this.report.temperature)) {
+					mui.toast('请输入正确的数字[30.0-40.0]');
+					return ;
+				}
+				if(this.report.isGoto=="true"||this.report.isGoto==true){
+					this.report.isGoto=true;
+				}else{
+					this.report.isGoto=false;
+				}
+				if(this.report.isTouch=="true"||this.report.isTouch==true){
+					this.report.isTouch=true;
+				}else{
+					this.report.isTouch=false;
+				}
+				// if (this.report.pictures.length == 0) {
+				// 	mui.toast("请上传家庭成员健康码!");
+				// 	return;
+				// }
+				this.curDateIsUpload=true;
+
+				if(this.report.temperature>this.max){
+					//	mui.alert("提交温度大于等于<span style='color: red'>37.2°</span><br/>需要点击下方【确认提交】<br/>确认后不能修改！");
+					//	mui.alert("提交温度大于等于<span style='color: red'>37.2°</span><br/><ul><li>1、过高体温将会上报至平台管理人员</li><li>2、过高体温将会上报至学校领导</li></ul><br/>需要点击下方【确认提交】<br/>确认后不能修改！");
+					mui.alert("提交体温<span style='color: red'>"+this.report.temperature+"℃</span>为异常体温，系统会将异常数据通报公司相关负责人。<br>如体温属实请点击下方【确认提交】按钮，确认后无法修改！");
+				}else{
+					mui.alert("需要点击下方【确认提交】<br/>确认后不能修改！");
+				}
+				//mui.alert("需要点击下方确认提交，确认后不能修改！");
+
+
+			},
+			getStatus(){
+
+				API_Health.getHealthStatusList().then(data => {
+					var arr = data.map(item => {
+						return {
+							value: item.value,
+							text: item.name
+						};
+					});
+					this.healthStatusList=arr
+
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//获取详情
+			getDetail() {
+				this.isLoading = true;
+
+				API_Health.getDetail(this.id, '3').then(response => {
+					this.isLoading = false;
+
+					this.detail = response;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {},
+		},
+		mounted() {
+			WxJsApi.getWxConfig();
+		},
+		destroyed() {
+
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
+</script>
+<style src="$project/assets/css/mui.picker.min.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
-<style>
+<style scoped>
+	.fyy-popup-button{
+		display: flex;
+		padding:10px
+	}
+	.fyy-popup-button .mui-col-xs-6{
+		padding:0 5px
+	}
+	.fyy-popup-button button{
+		width:100%
+	}
 </style>

src/projects/home/views/Register/Business/Step1.vue

@@ -1,8 +1,37 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content margin60">
+			<div class="mui-content-padded">
+				<h5>该号码尚未注册，正在为您注册新的身份：</h5>
+			</div>
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>选择行业</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							工厂园区
+						</button>
+					</div>
+					<div class="mui-input-row">
+						<label>您的单位</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							请选择
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Business/Step2.vue

@@ -1,8 +1,46 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">选择单位</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-xzdw">
+			<div class="mui-content-padded vongi-xzdw-search">
+				<input type="search" placeholder="请输入姓名">
+				<span class="mui-icon mui-icon-search"></span>
+			</div>
+			<div class="mui-content-padded fyy-date mui-clearfix">
+				<h5>荆州市</h5>
+			</div>
+			<div class="mui-row mui-fullscreen vongi-xzdw-city">
+				<div class="mui-col-xs-3">
+					<div class="mui-segmented-control mui-segmented-control-inverted mui-segmented-control-vertical">
+						<a class="mui-control-item mui-active" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+					</div>
+				</div>
+				<div class="mui-col-xs-9">
+					<div class="mui-control-content">
+						<ul class="mui-table-view">
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Business/Step3.vue

@@ -1,8 +1,45 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>您的单位</label>
+						<span>湖北荆鹏软件集团有限公司</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>员工</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>所属部门</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
+							信息工程中心
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						下一步
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Business/Step4.vue

@@ -1,8 +1,61 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>单位</label>
+						<span>湖北荆鹏软件集团有限公司</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>员工</span>
+					</div>
+					<div class="mui-input-row">
+						<label>部门</label>
+						<span>信息工程中心</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<span>姓名</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<span>15500001111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入身份证号">
+					</div>
+					<div class="mui-input-row">
+						<label style="width:50%">人脸识别照片<i class="iconfont icon-tishi color4fc5f7"></i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							<img src="~$project/assets/img/audit1.png" /> 
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						提  交
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Pension/Step1.vue

@@ -1,8 +1,37 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content margin60">
+			<div class="mui-content-padded">
+				<h5>该号码尚未注册，正在为您注册新的身份：</h5>
+			</div>
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>选择行业</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							机构、居家养老
+						</button>
+					</div>
+					<div class="mui-input-row">
+						<label>养老类型</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							请选择
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Pension/Step4.vue

@@ -1,8 +1,66 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>养老类型</label>
+						<span>机构养老</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>长者</span>
+					</div>
+					<div class="mui-input-row">
+						<label>养老机构</label>
+						<span>金色家园老年公寓</span>
+					</div>
+					<div class="mui-input-row">
+						<label>房号</label>
+						<span>颐养楼1-2-201</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<span>姓名</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<span>15500001111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入身份证号">
+					</div>
+					<div class="mui-input-row">
+						<label style="width:50%">人脸识别照片<i class="iconfont icon-tishi color4fc5f7"></i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							<img src="~$project/assets/img/audit1.png" /> 
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						提  交
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>
+

src/projects/home/views/Register/Pension/step2.vue

@@ -1,8 +1,45 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">选择养老机构</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-xzdw-search">
+				<input type="search" placeholder="请输入姓名">
+				<span class="mui-icon mui-icon-search"></span>
+			</div>
+			<ul class="mui-table-view vongi-xzyljg">
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						金色家园老年公寓(西干渠路)
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						金色家园老年公寓(西干渠路)
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						金色家园老年公寓(西干渠路)
+					</a>
+				</li>
+				<li class="mui-table-view-cell mui-media">
+					<a href="javascript:;">
+						金色家园老年公寓(西干渠路)
+					</a>
+				</li>
+			</ul>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Pension/step3.vue

@@ -1,8 +1,50 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>养老类型</label>
+						<span>机构养老</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>长者</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>养老机构</label>
+						<span>金色家园老年公寓</span>
+					</div>
+					<div class="mui-input-row">
+						<label>养老类型</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
+							颐养楼-201
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						下一步
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>
+

src/projects/home/views/Register/Residence/Step1.vue

@@ -1,8 +1,37 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content margin60">
+			<div class="mui-content-padded">
+				<h5>该号码尚未注册，正在为您注册新的身份：</h5>
+			</div>
+			<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>选择行业</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							社区住宅
+						</button>
+					</div>
+					<div class="mui-input-row">
+						<label>所在小区</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							请选择
+						</button>
+					</div>
+				</form>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Residence/Step2.vue

@@ -1,8 +1,46 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">选择单位</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-xzdw">
+			<div class="mui-content-padded vongi-xzdw-search">
+				<input type="search" placeholder="请输入姓名">
+				<span class="mui-icon mui-icon-search"></span>
+			</div>
+			<div class="mui-content-padded fyy-date mui-clearfix">
+				<h5>荆州市</h5>
+			</div>
+			<div class="mui-row mui-fullscreen vongi-xzdw-city">
+				<div class="mui-col-xs-3">
+					<div class="mui-segmented-control mui-segmented-control-inverted mui-segmented-control-vertical">
+						<a class="mui-control-item mui-active" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+						<a class="mui-control-item" href="">荆州市</a>
+					</div>
+				</div>
+				<div class="mui-col-xs-9">
+					<div class="mui-control-content">
+						<ul class="mui-table-view">
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+							<li class="mui-table-view-cell">市辖区</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Residence/Step3.vue

@@ -1,8 +1,45 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>所在小区</label>
+						<span>富润·沙市花园</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>业主</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>楼栋房号</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
+							1-1-2201
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						下一步
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/home/views/Register/Residence/Step4.vue

@@ -1,8 +1,62 @@
 <template>
+<div>
+   <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">注册</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content">
+			<div class="mui-content-padded vongi-qingjiadt">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>所在小区</label>
+						<span>富润·沙市花园</span>
+					</div>
+					<div class="mui-input-row">
+						<label>您的身份</label>
+						<span>业主</span>
+					</div>
+					<div class="mui-input-row">
+						<label>楼栋房号</label>
+						<span>1-1-2201</span>
+					</div>
+				</form>
+			</div>
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名</label>
+						<span>姓名</span>
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码</label>
+						<span>15500001111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>身份证号</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入身份证号">
+					</div>
+					<div class="mui-input-row">
+						<label style="width:50%">人脸识别照片<i class="iconfont icon-tishi color4fc5f7"></i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							<img src="~$project/assets/img/audit1.png" /> 
+						</button>
+					</div>
+				</form>
+			</div>
+			<div class="vongi-btn vongi-login-btn">
+				<button class="mui-btn mui-btn-primary ">
+						提  交
+					</button>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>
+