Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -4235,3 +4235,21 @@ h3 {
 .vongi-top-bread-list .vongi-top-bread button{
 	box-shadow: initial;
 }
+.vongi-ad-fix{
+	position:fixed;
+	bottom:0;
+	width:100%;
+	z-index: 9999;
+}
+.vongi-ad-fix .fyy-bindfyy-btn{
+	position:initial;
+	z-index: initial;
+}
+.vongi-wordcard-sp .vongi-ad-fix .mui-input-group .mui-input-row{
+	background:#ffffff;
+	border-top:1px #eee solid;
+	border-bottom:1px #eee solid
+}
+.vongi-over .vongi-cchai .mui-scroll{
+	margin-bottom:110px
+}

src/projects/business/views/Master/BusinessTravel/VerifyInfo.vue

@@ -60,18 +60,18 @@
 						<p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
 					</div>
 				</div>
-			</div>
 
-            <div class="mui-content-padded vongi-qingjiadt vongi-editme" v-if="detail.status=='0'&&detail.approvalEnable&&approvalPersonList.length" >
-                <form class="mui-input-group">
-                    <div class="mui-input-row">
-                        <label><i class="colorfe616c"></i> 下一级审批人</label>
-                        <button @click="selectPerson" class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
-                            {{approvalPersonName}}
-                        </button>
+                <div   class="vongi-slot-block" v-if="detail.status=='0'&&detail.approvalEnable&&approvalPersonList.length">
+                    <div class="vongi-slot-img"><img :src="approvalPersonUrl"></div>
+                    <div class="vongi-slot-content">
+                        <h4>下一级审批人 <span class="mui-pull-right mui-h5  color4fc5f7  "  v-if="approvalPersonList.length!=1"  @click="selectPerson"  >更换审批人 ></span></h4>
+                        <p>{{approvalPersonName}} <span class="color55f868" :style="getColor(0)" ></span></p>
                     </div>
-                </form>
-            </div>
+                </div>
+
+			</div>
+
+
 			<div v-if="detail.status=='0'&&detail.approvalEnable" class="fyy-scon-botton">
 				<div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
 				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
@@ -106,7 +106,9 @@
 
 				isLoading: false,
                 approvalPersonName:'',
-				subForm: {
+                approvalPersonUrl:'',
+
+                subForm: {
 					ids: this.$route.query.id,
 					status: '',
 					approvalContent: '',
@@ -136,13 +138,17 @@
                     for (var i = 0; i < list.length; i++) {
                         approvalPersonList.push({
                             value: list[i]['id'],
-                            text: list[i]['personName']
+                            text: list[i]['personName'],
+                            url: list[i]['faceImageUrl']
+
+
                         })
                     }
                     if (approvalPersonList.length) {
+
                         this.subForm.nextApprovalId = approvalPersonList[0]['value'];
                         this.approvalPersonName= approvalPersonList[0]['text'];
-
+                        this.approvalPersonUrl= approvalPersonList[0]['url'];
                     }
                     this.approvalPersonList = approvalPersonList;
 
@@ -154,6 +160,7 @@
             },
             //选择审核人
             selectPerson() {
+
                 var _this = this;
                 var picker = new mui.PopPicker();
                 picker.setData(_this.approvalPersonList);
@@ -161,6 +168,8 @@
                 picker.show(function(selectItems) {
                     _this.subForm.nextApprovalId = selectItems[0].value;
                     _this.approvalPersonName= selectItems[0].text;
+                    _this.approvalPersonUrl= selectItems[0].url;
+
                     picker.dispose();
                 })
             },

src/projects/business/views/Master/BusinessTravel/VerifyList.vue

@@ -62,15 +62,33 @@
 					</div>
 				</div>
 			</div>
-			<div v-show="recordList.length>0 && listForm.status==0" class="fyy-bindfyy-btn">
-				<form class="mui-input-group">
-					<div class="mui-input-row mui-checkbox mui-left">
-						<label>全选</label>
-						<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==selectIdList.length">
-					</div>
-				</form>
-				<!--<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('2')">拒绝</button>-->
-				<!--<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>-->
+
+            <div v-show="recordList.length>0 && listForm.status==0" class="vongi-ad-fix" style="z-index:99">
+
+				<div class=" vongi-wordcard" v-if="approvalPersonList.length">
+					<form class="mui-input-group">
+						<div class="mui-input-row">
+							<label class="color4fc5f7">下一步审批人</label>
+							<div   v-if="approvalPersonList.length!=1" class="mui-navigate-right" @click="selectPerson"   >
+								<button id='showUserPicker' class="mui-btn mui-btn-block" type='button'    ><span v-text="approvalPersonName"></span></button>
+							</div>
+                            <div   v-if="approvalPersonList.length==1"      >
+                                <button   class="mui-btn mui-btn-block" type='button'    ><span v-text="approvalPersonName"></span></button>
+                            </div>
+
+						</div>
+					</form>
+				</div>
+				<div class="fyy-bindfyy-btn">
+					<form class="mui-input-group">
+						<div class="mui-input-row mui-checkbox mui-left">
+							<label>全选</label>
+							<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==selectIdList.length">
+						</div>
+					</form>
+					<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('2')">拒绝</button>
+					<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
+				</div>
 			</div>
 		</div>
 
@@ -79,7 +97,9 @@
 </template>
 
 <script>
-	import * as API_BusinessTravel from '@/apis/Master/business_travel'
+    require('$project/assets/js/mui.picker.min.js');
+
+    import * as API_BusinessTravel from '@/apis/Master/business_travel'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -111,13 +131,19 @@
 					status: '0'
 				},
 				recordList: [],
+                approvalPersonList:[],
+                approvalPerson:false,
 
-				subForm: {
+                subForm: {
 					ids: '',
 					approvalContent: '',
-					status: ''
+					status: '',
+                    nextApprovalId:'',
 				},
-
+                //补卡1，外出2，出差3 ，请假4
+                personForm: {
+                    type: '3'
+                },
 				selectIdList: [],
 				allSelect: [],
 				firstRecordsTotal: 0,
@@ -125,6 +151,47 @@
 		},
 		created() {},
 		methods: {
+            //获取审核人列表
+            getBusinessOutApprovalPerson() {
+                this.isLoading = true;
+                API_BusinessTravel.getBusinessOutApprovalPerson(this.personForm).then(response => {
+                    this.isLoading = false;
+
+                    var list = response.data;
+                    var approvalPersonList = [];
+                    for (var i = 0; i < list.length; i++) {
+                        approvalPersonList.push({
+                            value: list[i]['id'],
+                            text: list[i]['personName']
+                        })
+                    }
+                    if (approvalPersonList.length) {
+                        this.subForm.nextApprovalId = approvalPersonList[0]['value'];
+                        this.approvalPersonName= approvalPersonList[0]['text'];
+
+                    }
+                    this.approvalPersonList = approvalPersonList;
+
+                    this.approvalPerson=true;
+                }).catch(error => {
+                    this.isLoading = false;
+                    mui.toast(error);
+                })
+            },
+            //选择审核人
+            selectPerson() {
+                var _this = this;
+                var picker = new mui.PopPicker();
+                picker.setData(_this.approvalPersonList);
+                picker.pickers[0].setSelectedValue(this.subForm.nextApprovalId);
+                picker.show(function(selectItems) {
+                    _this.subForm.nextApprovalId = selectItems[0].value;
+                    _this.approvalPersonName= selectItems[0].text;
+                    _this.$forceUpdate()
+
+                     picker.dispose();
+                })
+            },
 			//获取列表
 			getList() {
 				this.isLoading = true;
@@ -196,7 +263,10 @@
 			},
 			//检测表单
 			checkForm() {
-				if (!this.subForm.ids) {
+                if(!this.approvalPerson){
+                    mui.toast('加载下一级审批人失败，请刷新页面');
+                    return false;
+                }else if (!this.subForm.ids) {
 					mui.toast('请选择要处理的信息');
 					return false;
 				} else {
@@ -238,6 +308,7 @@
 		},
 		mounted() {
 			this.getList();
+            this.getBusinessOutApprovalPerson()
 			//监控下拉加载事件
 			var _this = this;
 			window.addEventListener('scroll', _this.handleScrool);
@@ -268,6 +339,8 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
+<style src="$project/assets/css/mui.picker.min.css"></style>
+
 <style scoped>
 	
 	.mui-segmented-control {