功能开发

src/projects/business/apis-xsy/scan.js

@@ -2,6 +2,19 @@ import request from '$project/utils/request'
 import Qs from 'qs';
 
 
+
+//详情
+export function carryThingsDetail(id) {
+	var 	params= {
+ 		id:id
+ 	}
+	return request({
+		url: '/mobile/carryThingsOutFactoryApi/carryThingsDetail',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
 export function indexData(params) {
 
 	return request({

src/projects/business/apis-xsy/treat.js

@@ -0,0 +1,36 @@
+import request from '$project/utils/request'
+import Qs from 'qs';
+
+
+ 
+
+export function customerDiningList(params) {
+
+	return request({
+		url: '/mobile/customerDiningApi/customerDiningList',
+	
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//根据id查询审核详情
+export function customerDiningDetail(id) {
+	 
+	var 	params= {
+		id:id
+	}
+	return request({
+		url: '/mobile/customerDiningApi/customerDiningDetail',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+export function customerDiningSubmit(params) {
+ 
+	return request({
+		url: '/mobile/customerDiningApi/customerDiningSubmit',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/components/Approval/ListSp.vue

@@ -30,8 +30,8 @@
 										
 											<router-link :to="{name:'XsyApprovalInfoSp',query:{id:item.id,procinstActUserId:item.procinstActUserId,formId:mymod.formId}}" class="mui-media-body">
 											
-											<h4 class="flew-sp margin10">{{item.name}}的{{mymod.text}}申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
-											<h5 class='mui-ellipsis color999'>{{mymod.text}}日期：{{item[mymod.param]}}</h5>
+											<h4 class="flew-sp margin10">{{item[mymod.name?mymod.name:'name']}}{{mymod.text1}}申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
+											<h5 class='mui-ellipsis color999'>{{mymod.text2}}：{{item[mymod.param]}}</h5>
 										</router-link>
 										<input name="checkbox" v-model="ids" :value="item.procinstActUserId" type="checkbox" >
 									</div>
@@ -131,49 +131,66 @@
 				mymod:{},
 				listmod:[{},{
 					title:"调班审核",
-					text:"调班",
+					text1:"的调班",
+					text2:"调班日期",
 					formId:"exchangeWork",
 					param:"adjustDate"
 				},{
 					title:"请假审核",
-					text:"请假",
+				 
+					text1:"的请假",
+					text2:"请假日期",
 					formId:"leaveWork",
 					param:"adjustDate"
 				},{
 					title:"出差审核",
-					text:"出差",
+				 
+					text1:"的出差",
+					text2:"出差日期",
 					formId:"travelWork",
 					param:"startTime"
 				},{
 					title:"补卡审核",
-					text:"补卡",
+					text1:"的补卡",
+					text2:"补卡日期",
 					formId:"applyWork",
 					param:"supplementDate"
 				},{
 					title:"批量补卡审核",
-					text:"批量补卡",
+				 
+					text1:"的补卡",
+					text2:"补卡日期",
 					formId:"batchApplyWork",
 					param:"supplementDate"
 				},{
 					title:"批量加班审核",
-					text:"加班",
+				 
+				text1:"的加班",
+				text2:"加班日期",
 					formId:"batchExtraWork",
 					param:"supplementDate"
 				},{
 					title:"加班审核",
-					text:"加班",
+				 
+					text1:"的加班",
+					text2:"加班日期",
 					formId:"extraWork",
 					param:"supplementDate"
 				},{
 					title:"携物出场",
-					text:"携物出场",
+				
+					text1:"的携物出场",
+					text2:"出场日期",
 					formId:"commerceWork",
 					param:"adjustDate"
 				},{
 					title:"食堂接待",
-					text:"食堂接待",
+				
+					text1:"的接待",
+					text2:"用餐安排",
 					formId:"treatWork",
-					param:"supplementDate"
+					param:"diningName",
+					name:"companyName",
 				}],
 				allSelect:[],
 				ids:[],

src/projects/business/views-xsy/Approval/Info.vue

@@ -24,6 +24,7 @@
 			 <Info6 v-if="sp&&formId=='batchExtraWork'" @getInfo="getInfo"></Info6>
 			 <Info7 v-if="sp&&formId=='extraWork'" @getInfo="getInfo"></Info7>
 			 <Info8 v-if="sp&&formId=='commerceWork'" @getInfo="getInfo"></Info8>
+			 <Info9 v-if="sp&&formId=='treatWork'" @getInfo="getInfo"></Info9>
 			 
 			 
 			<examineDetail @allowExamine="allowExamine" :id="id" v-if="info.sp&&info.status!=4"></examineDetail>
@@ -45,6 +46,7 @@
 	import Info6 from '@/views/Master/ExtraWork/Info.vue'
 	import Info7 from '@/views/Master/ExtraWork/Info.vue'
 	import Info8 from '@/views-xsy/Commerce/Info2.vue'
+	import Info9 from '@/views-xsy/Treat/Info.vue'
 	
 	import * as API_sp from '@/apis-xsy/xsy'
 	import ExamineDetail from '$project/components/ExamineDetail.vue'
@@ -63,14 +65,14 @@
 			Common,
 			Loading,
 			TopHeader,ExamineDetail,
-			Info1,Info2,Info3,Info4,Info5,Info6,Info7,Info8
+			Info1,Info2,Info3,Info4,Info5,Info6,Info7,Info8,Info9
 		},
 		data() {
 			return {
 				pageTitle: '申请调班详情',
 				formId:this.$route.query.formId,
 				sp:true,
-				isLoading: false,
+				isLoading: true,
 				id: '',
 				info: {},
 				examineDetail: {},
@@ -85,9 +87,11 @@
 			getInfo(op){
 				this.info=op;
 				this.info.sp=true;
+				
 				this.$emit('spstatus',op.status);
 			},
 			allowExamine(op){
+				this.isLoading=false;
 				this.$emit('allowExamine',op);
 				
 			},
@@ -122,7 +126,7 @@
 
 			},
 			update(bl) {
-				 
+				this.isLoading=true;
 				this.sp=bl;
 				if(!bl){
 					this.info.sp=false;

src/projects/business/views-xsy/Commerce/Add.vue

@@ -58,7 +58,7 @@
 <script>
 	require('$project/assets/js/mui.picker.min.js');
 	
-	import * as API from '@/apis-xsy/applyclass'
+	import * as API from '@/apis-xsy/treat'
 	import * as API_sp from '@/apis-xsy/xsy'
 	import {
 		currentTimeStamp,

src/projects/business/views-xsy/Commerce/Info.vue

@@ -6,7 +6,7 @@
 			 
 			 
 			 
-            <div class="mui-content-padded vongi-meform-pho" >
+            <div class="mui-content-padded vongi-meform-pho" v-if="qrCodeImg" >
 					<div class="vongi-center">
                         <p class="margin10">核验码</p>
 						<img :src="qrCodeImg" id="qrcode" width="80%">

src/projects/business/views-xsy/Scan/Add.vue

@@ -23,7 +23,7 @@
 			<div class="vongi-smhy-list">
 				<div class="vongi-smhy-tit">放行记录</div>
 				<ul class="mui-table-view mui-content-padded">
-					<template v-if="info.map.data">
+					<template v-if="info.map&&info.map.data">
 						
 						<li class="mui-table-view-cell mui-media" v-for="item,i in info.map.data" @click="gotoItem(item.id)">
 							<a href="javascript:;" class="mui-navigate-right">

src/projects/business/views-xsy/Scan/Info.vue

@@ -16,11 +16,11 @@
 					<form class="mui-input-group vongi-wybx">
 						<div class="mui-input-row">
 							<label>申请人</label>
-							<span>{{info.personName}}</span>
+							<span>{{info.name}}</span>
 						</div>
 						<div class="mui-input-row">
 							<label>出厂日期</label>
-							<span>{{info.leaveFactoryTime}}</span>
+							<span>{{info.date}}</span>
 						</div>
 						<div class="mui-input-row">
 							<label style="width:100%">申请理由及物品清单</label> 
@@ -30,7 +30,7 @@
 							    padding: 0 20px;
 							"
 							
-							v-model="info.leaveFactoryReason"></textarea>
+							v-model="info.content"></textarea>
 						</div>
 						<div class="mui-input-row padd10">
 							<label>图片附件</label>
@@ -53,22 +53,8 @@
 						</div>
 					</form>
 				</div>
-				<div class="mui-content-padded vongi-slot">
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1<span class="mui-pull-right mui-h5 color999">2020-11-26 13:00</span></h4>
-							<p>高进权 <span class="color55f868">同意</span></p>
-						</div>
-					</div>
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1</h4>
-							<p>高进权 <span class="color4fc5f7">审批中</span></p>
-						</div>
-					</div>
-				</div>
+				<examineDetail  :id="id" v-if="info.sp" class="mui-content-padded"></examineDetail>
+			
 				<div class="mui-content-padded vongi-qingjiadt mt-10" v-if="info.releaseTime">
 					<form class="mui-input-group">
 						<div class="mui-input-row">
@@ -96,13 +82,14 @@
 	import  Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
+	 import ExamineDetail from '$project/components/ExamineDetail.vue'
 	 
 	
 	export default {
 		name: '',
 		components: {
 			Common,
-			Loading,
+			Loading,ExamineDetail,
 			TopHeader 
 		},
 		data() {
@@ -136,9 +123,9 @@
 			getInfo(){
 				this.isLoading = true;
 					 
-				API.detail(this.id).then(response => {
+				API.carryThingsDetail(this.id).then(response => {
 					this.info=response;
-				 
+					this.info.sp=true
 					this.isLoading = false;
 				}).catch(error => {
 					this.isLoading = false;

src/projects/business/views-xsy/Treat/Add.vue

@@ -8,33 +8,33 @@
 				<form class="mui-input-group vongi-editme mt-10">
 					<div class="mui-input-row">
 						<label>申请人</label>
-						<span>赵振</span>
+						<span>{{person_popedom.personName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>接待部门</label>
-						<span>安全部</span>
+						<span>{{person_popedom.companyName}}</span>
 					</div>
 				</form>
 				<form class="mui-input-group vongi-editme margin10 mt-10">
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i>&nbsp;来客单位</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写单位信息  ">
+						<input  v-model="subForm.customerCompany" type="text" class="mui-input-clear" placeholder="请填写单位信息  ">
 					</div>
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i>&nbsp;事由</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写来访事由  ">
+						<input v-model="subForm.reason" type="text" class="mui-input-clear" placeholder="请填写来访事由  ">
 					</div>
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i>&nbsp;来客人数</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写人数  ">
+						<input v-model="subForm.customerNum"  type="number" class="mui-input-clear" placeholder="请填写人数  ">
 					</div>
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i>&nbsp;陪同人数</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写人数 ">
+						<input v-model="subForm.accompanyNum"  type="number"  class="mui-input-clear" placeholder="请填写人数 ">
 					</div>
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i>&nbsp;进餐时间</label>
-						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%">
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:65%" @click="selectData" v-text="subForm.diningTime">
 							2021-03-01 12:01
 						</button>
 					</div>
@@ -42,36 +42,275 @@
 				<form class="mui-input-group vongi-editme margin10 mt-10">
 					<div class="mui-input-row">
 						<label style="width:50%"><i class="colorfe616c">*</i>&nbsp;用餐安排(餐别)</label>
-						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%" @click="selectType" v-text="subForm.diningName?subForm.diningName:'请选择'">
 							请选择
 						</button>
 					</div>
 					<div class="mui-input-row">
 						<label style="width:50%"><i class="colorfe616c">*</i>&nbsp;进餐标准金额(元)</label>
-						<input type="text" class="mui-input-clear" placeholder="请填写金额  " style="width:50%">
+						<input  v-model="subForm.diningFee"  type="number" class="mui-input-clear" placeholder="请填写金额  " style="width:50%">
 					</div>	
 				</form>
 				<form class="mui-input-group vongi-editme">
 					<div class="mui-input-row">
 						<label>&nbsp;&nbsp;审批人</label>
-						<span>赵振</span>
+						<span>{{examinePerson.name}}</span>
 					</div>
 				</form>
 			</div>
 			<div class="fyy-footer">
 				<div class="bindfyy-btn">
-					<button type="button" class="mui-btn mui-btn-primary ">提交</button>
+					<button  class="mui-btn   " :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'" type="button" @click="submit">提交</button>
 				</div>
 			</div>
 	</div>
 </template>
 
-<script>
+
+<script>
+	require('$project/assets/js/mui.picker.min.js');
+	
+	import * as API from '@/apis-xsy/treat'
+	import * as API_sp from '@/apis-xsy/xsy'
+	import {
+		currentTimeStamp,
+		parseUnixTime,
+		hourDistanceArr
+	} from '$project/utils'
+	import  Common from '$project/components/Common.vue'
+	 import * as WxJsApi from '$project/utils/wxJsApi'
+	import SelectPerson from '../PlanClass/Person.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+
+	export default {
+		name: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,SelectPerson
+		},
+		data() {
+			return {
+				
+				pageTitle: '携物出厂申请',
+				
+				
+				isLoading: false,
+				 
+				subForm: {
+					customerCompany:"",
+					reason:"",
+					customerNum:"",
+					accompanyNum:"",
+					diningTime:"",
+					diningName:"",
+					diningFee:"",
+				 
+				 
+					formId:"treatWork",
+				},
+				examinePerson:{},
+				picList: [],
+			}
+		},
+		created() {
+			this.subForm.diningTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
+
+		},
+		methods: {
+			 //微信选择图片
+			 chooseImage() {
+			 	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);
+			 	})
+			 },
+			 //删除图片
+			 delPic(item) {
+			 	let picList = this.picList;
+			 	let index = picList.indexOf(item);
+			 	if (index > -1) {
+			 		picList.splice(index, 1);
+			 	}
+			 	this.picList = picList;
+			 },
+			 //上传图片
+			 uploadpic() {
+			 	this.isLoading = true;
+			 	WxJsApi.uploadPic(this.imgBase64).then(response => {
+			 		this.isLoading = false;
+			 
+			 		this.picList.push(response);
+			 	}).catch(error => {
+			 		this.isLoading = false;
+			 		mui.toast(error);
+			 	})
+			 },
+			  
+			 
+			//选择日期
+			selectData() {
+				var vdate = new Date()
+				 //var vdata=currentTimeStamp();
+				var _this = this;
+				
+			 
+				var picker = new mui.DtPicker({
+					"type": "datetime",
+					"beginYear": 2020,
+					"endYear": 2040,
+					"beginDate": vdate,
+			    
+					"value": _this.subForm.diningTime
+				});
+				picker.show(function(rs) {
+					_this.subForm.diningTime = rs.text;
+					
+					picker.dispose();
+					
+				});
+			},
+		 selectType() {
+		  
+		 	var _this = this;
+		 	
+		  
+		 	var picker = new mui.PopPicker( );
+			var obj=[
+				{
+					value:'午餐',
+					text:'午餐'
+				},{
+					value:'晚餐',
+					text:'晚餐'
+				},{
+					value:'宵夜',
+					text:'宵夜'
+				},
+			]
+			picker.setData(obj);
+		 	picker.show(function(rs) {
+		 		_this.subForm.diningName = rs[0].value;
+		 		
+		 	});
+		 },
+			//表单检测
+			checkFrom() {
+				
+				if (!this.subForm.customerCompany) {
+					mui.toast('请填写单位信息');
+					return false;
+				}  else if (!this.subForm.reason) {
+					mui.toast('请填写来访事由');
+					return false;
+				} else  if (!this.subForm.customerNum) {
+					mui.toast('请填写来客人数');
+					return false;
+				} else  if (!this.subForm.accompanyNum) {
+					mui.toast('请填写陪同人数');
+					return false;
+				} else  if (!this.subForm.diningTime) {
+					mui.toast('请填写进餐时间');
+					return false;
+				} else  if (!this.subForm.diningName) {
+					mui.toast('请填写用餐安排');
+					return false;
+				} else  if (!this.subForm.diningFee) {
+					mui.toast('请填写进餐标准金额');
+					return false;
+				} else {
+					return true;
+				}
+				
+				
+				
+				
+			},
+			//提交
+			submit() {
+				if(!this.examinePerson.name){
+					return;
+				}
+				this.subForm.images = this.picList.join(',');
+				
+				if (this.checkFrom()) {
+					this.isLoading = true;
+					//var obj=this.subForm;
+					
+					//obj.date=this.subForm.date+" 00:00:00"
+					
+					API.customerDiningSubmit(this.subForm).then(response => {
+						this.isLoading = false;
+						
+						mui.toast('提交成功');
+						this.$router.replace({
+						    name: "XsyApprovalInfo",
+							
+						    query: {
+								formId:"treatWork",
+								id:response.id
+							}
+						})
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
+			getExaminePerson(){
+				API_sp.examinePerson(this.subForm.formId).then(response => {
+					this.examinePerson=response
+				}).catch(error => {
+					
+					mui.toast(error);
+				})
+			},
+			 
+			asynCallBack() {
+
+			},
+		
+		},
+		mounted() {
+			  
+		
+			
+			this.getExaminePerson();
+		},
+		destroyed() {},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/xsy.css"></style>
+<style src="$project/assets/css/mui.picker.min.css"></style>
+
 <style>
 </style>
 

src/projects/business/views-xsy/Treat/Info.vue

@@ -1,87 +1,157 @@
 <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="vongi-qingjiadt-head flew-sp">
-					<div class="flew-items">
-						<div class="flew"><img src="$project/assets/img/03.jpg" width="50" /></div>
-						<h4>赵振 申请来客接待进餐</h4>
-					</div>
-					<button class="mui-btn  mui-btn-primary mui-btn-outlined">审批中</button>
-					<!--<button class="mui-btn  mui-btn-danger mui-btn-outlined">已拒绝</button>
-					<button class="mui-btn  mui-btn-success mui-btn-outlined">已批准</button>-->
-				</div>
+				
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>接待部门</label>
-						<span>安全部</span>
+						<span>{{info.companyName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>申请日期</label>
-						<span>2021-03-01 星期一</span>
+						<span>{{info.createTime}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>来客单位</label>
-						<span>客户</span>
+						<span>{{info.customerCompany}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>事由</label>
-						<span>客户</span>
+						<span>{{info.reason}}</span>
 					</div>
                     <div class="mui-input-row">
 						<label>来客人数</label>
-						<span>11</span>
+						<span>{{info.customerNum}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>陪同人数</label>
-						<span>12</span>
+						<span>{{info.accompanyNum}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>进餐时间</label>
-						<span>2021-03-01 12:01</span>
+						<span>{{info.diningTime}}</span>
 					</div>
 				</form>
                 <form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>用餐安排</label>
-						<span>午餐</span>
+						<span>{{info.diningName}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label style="width:50%">进餐标准金额(元)</label>
-						<span style="width:50%">1,000.00</span>
+						<span style="width:50%">{{info.diningFee}}</span>
 					</div>
 					<div class="mui-input-row">
 						<label>大写</label>
-						<span>壹仟元整</span>
+						<span>{{info.diningFeeChinese}}</span>
 					</div>
 				</form>
-				<div class="mui-content-padded">
-					<h5>审核记录</h5>
-				</div>
-				<div class="vongi-slot">
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1<span class="mui-pull-right mui-h5 color999">2020-11-26 13:00</span></h4>
-							<p>高进权 <span class="color55f868">同意</span></p>
-						</div>
-					</div>
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1</h4>
-							<p>高进权 <span class="color4fc5f7">审批中</span></p>
-						</div>
-					</div>
-				</div>
+				
 			</div>
 	</div>
 </template>
 
-<script>
+
+<script>
+	import * as API from '@/apis-xsy/treat'
+	import * as API_sp from '@/apis-xsy/xsy'
+import ExamineDetail from '$project/components/ExamineDetail.vue'
+
+	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: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,ExamineDetail
+		},
+		data() {
+			return {
+				pageTitle: '申请调班详情',
+
+				isLoading: false,
+				id: '',
+				info: {},
+				examineDetail: {},
+				only: "test"
+
+			}
+		},
+		created() {
+			this.id = this.$route.query.id;
+		},
+		methods: {
+			allowExamine(op){
+				this.$emit('allowExamine',op);
+				
+			},
+			getClass(ac, i) {
+				var reclass = ""
+				
+				if (ac.action == "0") {
+					if (this.only == "test") {
+
+						this.only = i;
+					}
+					if (this.only == i) {
+						return "color3385FF"
+					} else {
+						return "mui-hidden"
+					}
+
+				}
+
+				if (ac.action == "3" || ac.action == "2") {
+					return "colorfe616c"
+				}
+
+				if (ac.action == "1" || ac.action == "4") {
+					return "color389E0D"
+				}
+				return reclass
+			},
+		 
+			getAdjustShiftDetail() {
+				this.isLoading = true;
+
+				API.customerDiningDetail(this.id).then(response => {
+					this.info = response;
+					this.info.sp=true;
+					this.isLoading = false;
+					
+				 
+					 this.$emit('getInfo',this.info);
+					
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {
+
+			},
+			update() {
+				this.info.sp=false;
+				this.getAdjustShiftDetail();
+			 
+			}
+		},
+		mounted() {
+			this.getAdjustShiftDetail();
+			
+		},
+		destroyed() {},
+		
+
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>

src/projects/business/views-xsy/Treat/List.vue

@@ -6,7 +6,7 @@
 		</header>
 		<div class="mui-content margin60">
 			<div class="mui-content-padded">
-				<ul class="mui-table-view fyy-view">
+				<ul class="mui-table-view fyy-view" v-for="item,i in recordList" @click="gotoItem(item.id)" style="  margin-bottom: 10px;" >
 					<li class="mui-table-view-cell">
 						<label>接待部门：</label>
 						<span>邹杰<span class="mui-pull-right colorf8b155">待审核</span></span>
@@ -22,17 +22,134 @@
 						<span>03-01 15:00</span>
 					</li>
 				</ul>
+				<NullList :remark="'暂无申请记录'" v-if="!recordList.length"></NullList>
+				
 			</div>
 		</div>
 		<div class="fyy-footer">
 			<div class="bindfyy-btn">
-				<button type="button" class="mui-btn mui-btn-primary ">申请接待进餐</button>
+				<button type="button"  @click="gotoUrl" class="mui-btn mui-btn-primary ">申请接待进餐</button>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
+	import * as API from '@/apis-xsy/treat'
+	 
+	import  Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NullList from '$project/components/NullList.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime,
+		hourDistanceArr
+	} from '$project/utils'
+	export default {
+		name: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,NullList
+		},
+		data() {
+			return {
+			 
+			 
+				pageTitle: '携物出厂',
+			 
+				isLoading: false,			
+				listForm: {
+					pageIndex: 1,
+					pageSize: 10,
+					totalPage: 1,
+				},
+				recordList: [],
+				
+			  
+			}
+		},
+		created() {
+			 
+		},
+		methods: {
+		
+		
+			gotoItem(id){
+							  this.$router.push({
+							      name: "XsyTreatInfo",
+									query:{id:id }
+							  })
+			},
+			gotoUrl(){
+				 this.$router.push({
+				     name: "XsyTreatAdd",
+				 })
+			},
+			 //获取列表
+			 getList() {
+			 	this.isLoading = true;
+			 	API.customerDiningList(this.listForm).then(response => {
+			 		if (response) {
+			 			if (this.listForm.pageIndex == 1) {
+			 				this.recordList = response.data;
+			 				this.listForm.pageIndex = response.pageNumber;
+			 				this.listForm.totalPage = response.totalPage;
+							
+			 			} else {
+			 				this.recordList = [
+			 					...this.recordList,
+			 					...response.data
+			 				];
+			 			}
+			 		}
+			 		this.listForm.pageIndex++;
+			 		this.isLoading = false;
+			 	}).catch(error => {
+			 		this.isLoading = false;
+			 		mui.toast(error);
+			 	})
+			 },
+			 //下拉事件
+			 handleScrool() {
+				 
+			 	if (isReachBottom()) {
+			 		console.log('到达底部')
+					if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				
+			 	}
+			 },
+		 
+			asynCallBack() {
+	
+			},
+		
+		},
+	mounted() {
+			this.getList();
+		
+		//监控下拉加载事件
+		var _this = this;
+		window.addEventListener('scroll', _this.handleScrool);
+	},
+	destroyed() {
+		//销毁监听事件
+		var _this = this;
+		window.removeEventListener('scroll', _this.handleScrool);
+	},
+	
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>

src/projects/business/views-xsy/TreatApproval/List.vue

@@ -1,142 +1,49 @@
 <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-wordcard-sp">
-			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
-				<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 mui-active" href="#item1mobile">
-							<span class="fyy-badge">待处理<span class="mui-badge">5</span></span>
-						</a>
-						<a class="mui-control-item" href="#item2mobile">
-							已处理
-						</a>
-					</div>
-				</div>
-				<div class="mui-slider-group">
-					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
-							<div class="mui-scroll">
-								<form class="mui-input-group fyy-checkbox">
-									<div class="mui-input-row mui-checkbox mui-left">
-										<a href="" class="mui-media-body">
-											<div class="vongi-sh-row mui-clearfix">
-												<label>接待部门：</label>
-												<span>安全部</span>
-												<h5 class="color999">10-17 18:00</h5>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>申请人：</label>
-												<span>赵振</span>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>用餐安排：</label>
-												<span>午餐</span>
-											</div>
-										</a>
-										<input name="checkbox" value="Item 1" type="checkbox" checked>
-									</div>
-									<div class="mui-input-row mui-checkbox mui-left">
-										<a href="" class="mui-media-body">
-											<div class="vongi-sh-row mui-clearfix">
-												<label>接待部门：</label>
-												<span>安全部</span>
-												<h5 class="color999">10-17 18:00</h5>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>申请人：</label>
-												<span>赵振</span>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>用餐安排：</label>
-												<span>午餐</span>
-											</div>
-										</a>
-										<input name="checkbox" value="Item 1" type="checkbox">
-									</div>	
-								</form>
-							</div>
-						</div>
-					</div>
-					<div id="item2mobile" class="mui-slider-item mui-control-content">
-						<div class="mui-scroll-wrapper">
-							<div class="mui-scroll">
-								<ul class="mui-table-view mui-table-view-chevron">
-									<li class="mui-table-view-cell mui-media">
-										<a  href="">
-											<div class="vongi-sh-row mui-clearfix">
-												<label>接待部门：</label>
-												<span>安全部</span>
-												<h5 class="color999">10-17 18:00</h5>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>申请人：</label>
-												<span>赵振</span>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>用餐安排：</label>
-												<span>午餐</span>
-												<button type="" class="mui-btn mui-btn-success mui-btn-outlined">已同意</button>
-											</div>
-										</a>
-									</li>
-									<li class="mui-table-view-cell mui-media">
-										<a  href="">
-											<div class="vongi-sh-row mui-clearfix">
-												<label>接待部门：</label>
-												<span>安全部</span>
-												<h5 class="color999">10-17 18:00</h5>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>申请人：</label>
-												<span>赵振</span>
-											</div>
-											<div class="vongi-sh-row mui-clearfix">
-												<label>用餐安排：</label>
-												<span>午餐</span>
-												<button type="" class="mui-btn mui-btn-danger mui-btn-outlined">已同意</button>
-											</div>
-										</a>
-									</li>
-								</ul>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="fyy-bindfyy-btn">
-				<form class="mui-input-group">
-					<div class="mui-input-row mui-checkbox mui-left">
-						<label>全选</label>
-						<input name="checkbox" value="Item 1" type="checkbox">
-					</div>
-				</form>
-				<button type="button" class="mui-btn mui-btn-danger">拒绝</button>
-				<button type="button" class="mui-btn mui-btn-success">同意</button>
-			</div>
-		</div>
-		<!--弹窗-->
-		<!-- <div class="mui-popup mui-popup-in vongi-mui-pop" style="display: block;">
-			<div class="mui-popup-inner vongi-pop-inner">
-				<div class="mui-popup-title">审核意见</div>
-				<div class="mui-popup-input">
-					<textarea id="textarea" rows="3" placeholder="可输入审核意见"></textarea>
-				</div>
-			</div>
-			<div class="mui-popup-buttons"><span class="mui-popup-button">取消</span><span class="mui-popup-button mui-popup-button-bold">提交</span></div>
-		</div>
-		<div class="mui-popup-backdrop mui-active" style="display: block;"></div> -->
-</div>
+	<div>
+			 <ListSp formId="9" ></ListSp>
+	</div>
 </template>
 
-<script>
+
+<script>
+	
+	
+	 import  ListSp from '@/components/Approval/ListSp.vue'
+	 
+	
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+
+	export default {
+		name: '',
+		components: {
+			ListSp
+		},
+		data() { 
+			return{
+				
+			}
+		},
+		created() {
+			 
+		},
+		methods: {  
+		
+		},
+	mounted() {
+		 
+	},
+
+	
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/xsy.css"></style>
 <style>
+	
+
 </style>