Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/assets/css/xpwyfyy.css

@@ -1440,7 +1440,7 @@ h3 {
 	margin: 7px 15px;
 	align-items: right;
 	float: right;
-	border-radius: 4px;
+	border-radius: 50%;
 }
 
 .vongi-qingjiadt-photo img {
@@ -1905,3 +1905,6 @@ h3 {
 .vongi-xzyljg .mui-table-view-cell:after{
 	left:0
 }
+.vongi-padright{
+	padding-right:15px
+}

src/projects/business/router/master.js

@@ -350,6 +350,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '考勤补卡申请',
+							form: true
 						}
 					},
 					//考勤补卡申请审核列表
@@ -405,6 +406,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '请假提交',
+							form: true,
 						}
 					},
 
@@ -661,6 +663,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '添加人员选择设备',
+							form: true
 						}
 					},
 				]

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

@@ -1,8 +1,91 @@
 <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>15500001111</span>
+          </div>
+          <div class="mui-input-row">
+            <label>身份证号</label>
+            <span>420400199301011010</span>
+          </div>
+          <div class="mui-input-row">
+            <label style="width: 50%">人脸识别照片</label>
+            <span class="vongi-qingjiadt-photo"
+              ><img src="~$project/assets/img/audit1.png" />
+            </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>2020-9-18 15:00:00</span>
+          </div>
+          <div class="mui-input-row">
+            <label>结束时间</label>
+            <span>2020-9-18 17:30:00</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>
+              </a>
+            </span>
+          </div>
+          <div class="mui-input-row">
+            <label>车牌号</label>
+            <span>鄂D88888</span>
+          </div>
+        </form>
+      </div>
+      <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+        <form class="mui-input-group vongi-login-form">
+          <div class="mui-input-row">
+            <label>邀请单状态</label>
+            <span class="color55f868">已确认</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>
+          </div>
+          <div class="mui-input-row">
+            <label>确认时间</label>
+            <span>2020-09-17 12:57:30 </span>
+          </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/business/views/Guest/From/InfoPartner.vue

@@ -1,8 +1,40 @@
 <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>15500001111</span>
+          </div>
+          <div class="mui-input-row">
+            <label>身份证号</label>
+            <span>420400199301011010</span>
+          </div>
+          <div class="mui-input-row">
+            <label style="width: 50%">人脸识别照片</label>
+            <span class="vongi-qingjiadt-photo"
+              ><img src="~$project/assets/img/audit1.png" />
+            </span>
+          </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/business/views/Guest/To/Info.vue

@@ -50,7 +50,8 @@
               style="width: 50%"
               @click="chooseImage(detail)"
             >
-              请上传
+              <!--请上传-->
+							<img src="~$project/assets/img/audit1.png" /> 
             </button>
           </div>
           <div class="mui-input-row">