请假申请,出差,加班

.env.production

@@ -2,7 +2,7 @@ NODE_ENV=production
 VUE_APP_NODE_NAME=production
 OUT_PUT_NAME=prod
 VUE_APP_LOCAL_STORAGE_PREFIX=xsy_prod
-VUE_APP_BACKEND_URL=https://xpgjapi.xiaoxinda.com/
+VUE_APP_BACKEND_URL=http://223.75.170.44:6060/shinestar-server
 VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869

src/components/ExamineDetail.vue

@@ -16,7 +16,7 @@
 							v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
 							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'">
 						</div>
-						<div class="vongi-slot-img" v-else-if="item.source==1&&item.operation=='or'&&item.action!=0 ">
+						<div class="vongi-slot-img" v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
 							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'"
 								v-if="item1.action!='0'">
 						</div>
@@ -35,7 +35,7 @@
 									<span :class="getClass(item1,i)">{{item1.remark}}</span>
 								</p>
 							</template>
-							<template v-else-if="item.source==1&&item.operation=='or'&&item.action!=0 ">
+							<template v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
 								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
 									<span :class="getClass(item1,i)" v-if="item1.action!='0'">{{item1.remark}}</span>
 								</p>

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

@@ -130,7 +130,8 @@ import ExamineDetail from '$project/components/ExamineDetail.vue'
 			asynCallBack() {
 
 			},
-			update() {
+			update() {
+				this.adjustShiftDetail.sp=false;
 				this.getAdjustShiftDetail();
 			 
 			}

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

@@ -13,7 +13,8 @@
 				
 					<li class="mui-table-view-cell" >
 						<label>调班类型：</label>
-						<span>{{item.typeName}}<span class="mui-pull-right" :class="{'colorf8b155':item.status=='0','color55f868':item.status=='1'||item.status=='4','colorfe616c':item.status=='2'||item.status=='3'}">{{item.statusName}}</span></span>
+						<span>{{item.typeName}}
+						<span class="mui-pull-right" :class="{'colorf8b155':item.status=='0','color55f868':item.status=='1'||item.status=='4','colorfe616c':item.status=='2'||item.status=='3'}">{{item.statusName}}</span></span>
 						<!--<span class="mui-pull-right color55f868">已确认/无需审核</span>
 						<span class="mui-pull-right colorfe616c">已拒绝</span>-->
 					</li>

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

@@ -80,6 +80,7 @@
 			},
 			//同意拒绝
 			doAction() {
+				this.allowExamineBl=false;
 				this.subForm.procinstActUserIds =this.$route.query.procinstActUserId;
 				if (this.checkForm()) {
 					this.isLoading = true;

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -81,7 +81,7 @@
 
 
 <script>
-		import * as API_sp from '@/apis-xsy/xsy'
+	import * as API_sp from '@/apis-xsy/xsy'
 	require('$project/assets/js/mui.picker.min.js');
 	import * as API_Leave from '@/apis/Master/leave'
 	import Common from '$project/components/Common.vue'

src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -7,7 +7,7 @@
 			<h1 class="mui-title">{{pageTitle}}</h1>
 		</header>
 		
-    <div class="mui-content vongi-qingjiadt margin60">
+    <div class="mui-content vongi-qingjiadt ">
         <div class="vongi-qingjiadt-head flew-sp">
             <div class="flew-items">
                 <div class="flew"><img :src="detail.faceImageUrl" width="50" /></div>
@@ -55,7 +55,8 @@
 
 
         </form>
-          <examineDetail :id="id" @allowExamine="allowExamine" v-if="detail.sp&&detail.status!=4"></examineDetail>
+		<examineDetail :id="id" @allowExamine="allowExamine" v-if="detail.sp&&detail.status!=4"></examineDetail>
+		
     </div>
 
 
@@ -71,8 +72,7 @@ import Loading from '$project/components/Loading.vue'
 import ExamineDetail from '$project/components/ExamineDetail.vue'
 
 import TopHeader from '$project/components/TopHeader.vue'
-import isReachBottom from '$project/utils/isReachBottom'
-import {
+ import {
     mapGetters,
     mapMutations
 } from 'vuex'
@@ -102,8 +102,7 @@ export default {
     },
     methods: {
 		allowExamine(op){
-			this.$emit('allowExamine',op);
-			
+			this.$emit('allowExamine',op);	
 		},
         //获取状态颜色
         getColor(status) {
@@ -141,6 +140,11 @@ export default {
         asynCallBack() {
 
         },
+		update() {
+			this.detail.sp=false;
+			this.getDetail();
+		 
+		}
     },
     mounted() {
         this.getDetail();

src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -12,8 +12,11 @@
 							{{mod.title}}
 							<span v-text="mod.createTime">12:00</span>
 						</h4>
-						<button type="button" class="mui-btn  mui-btn-outlined" :class="statusColor[mod.status]" v-text="status[mod.status]">
-						</button>
+						 
+						<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':mod.status==0,
+						'mui-btn-danger':mod.status==2||mod.status==3,
+						'mui-btn-success':mod.status==1||mod.status==4}"  v-text="status[mod.status]"  ></button>
+							
 					</li>
 
 				</ul>
@@ -65,10 +68,7 @@
 					result: 0,
 				},
 				recordList: [],
-				status: ['待审核', '已批准', '已拒绝'],
-				statusColor: ['', 'mui-btn-success', 'mui-btn-danger'],
-
-
+				status: ['待审核', '已批准','已退回', '已拒绝','无需审批'],
 			}
 		},
 		created() {

src/projects/business/views/Master/Attendance/VerifyLeaveList.vue

@@ -30,12 +30,12 @@
 										
 											<router-link :to="{name:'MasterAttendanceVerifyLeaveInfo',query:{id:item.id,procinstActUserId:item.procinstActUserId}}" class="mui-media-body">
 											
-											<h4 class="flew-sp margin10">{{item.name}}的请假申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
-											<h5 class='mui-ellipsis color999'>请假日期：{{item.adjustDate}}</h5>
+											<h4 class="flew-sp margin10">{{item.name}}的{{item.typeN}}申请<span class="color999 mui-h5"></span></h4>
+											<h5 class='mui-ellipsis color999'>申请日期：{{item.createTime}}</h5>
 										</router-link>
 										<input name="checkbox" v-model="ids" :value="item.procinstActUserId" type="checkbox" >
 									</div>
-									<NullList :remark="'暂无调班申请记录'" v-if="!recordList.length"></NullList>
+									<NullList :remark="'暂无请假申请记录'" v-if="!recordList.length"></NullList>
 									 
 								</div>
 							</div>
@@ -48,8 +48,8 @@
 									<li class="mui-table-view-cell mui-media" v-for="item,i in recordList2">
 										<router-link :to="{name:'MasterAttendanceVerifyLeaveInfo',query:{id:item.id}}" class="mui-media-body">
 										
-											<h4 class="flew-sp margin10">{{item.name}}的调班申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
-											<h5 class='mui-ellipsis color999 flew-sp flew-items'>调班日期：{{item.adjustDate}}
+											<h4 class="flew-sp margin10">{{item.name}}的申请<span class="color999 mui-h5"></span></h4>
+											<h5 class='mui-ellipsis color999 flew-sp flew-items'>申请日期：{{item.createTime}}
 											<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':item.action==0,
 											'mui-btn-danger':item.action==2||item.action==3,
 											'mui-btn-success':item.action==1||item.action==4}"   >{{item.actionName}}</button>

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

@@ -35,16 +35,17 @@
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<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}}
+						<label><i class="colorfe616c"></i> 审批人</label>
+						<button  class="mui-btn mui-btn-block  mui-ellipsis" type='button' style="width:65%">
+							{{examinePerson.name}}
 						</button>
 					</div>
 				</form>
 			</div>
 		</div>
 		<div class="fyy-footer">
-			<div class="bindfyy-btn"><button @click="submit" type="submit" class="mui-btn mui-btn-primary ">保 存</button></div>
+			<div class="bindfyy-btn">
+				<button @click="submit" type="submit" class="mui-btn   "  :class="examinePerson.name?'mui-btn-primary':'mui-btn-grey'">保 存</button></div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -52,6 +53,7 @@
 </template>
 
 <script>
+	import * as API_sp from '@/apis-xsy/xsy'
 	require('$project/assets/js/mui.picker.min.js');
 	import * as API_BusinessTravel from '@/apis/Master/business_travel'
 	import Common from '$project/components/Common.vue'
@@ -75,7 +77,7 @@
 		data() {
 			return {
 				pageTitle: '出差申请单',
-
+				examinePerson:{},
 				isLoading: false,
 
 				subForm: {
@@ -84,7 +86,8 @@
 					startTime: '',
 					estimatedTime: '',
 					content: '',
-					approvalPersonId: ''
+					approvalPersonId: '',
+					formId: "travelWork",
 				},
 
 				approvalPersonList: [],
@@ -98,41 +101,16 @@
 			this.subForm.startTime = parseUnixTime(currentTimeStamp(), '{y}-{m}-{d} {h}:{i}');
 		},
 		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.approvalPersonId = approvalPersonList[0]['value'];
-					}
-					this.approvalPersonList = approvalPersonList;
-
+			getExaminePerson(){
+				API_sp.examinePerson(this.subForm.formId).then(response => {
+					this.examinePerson=response
 				}).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.approvalPersonId);
-				picker.show(function(selectItems) {
-					_this.subForm.approvalPersonId = selectItems[0].value;
-					picker.dispose();
-				})
-			},
+			 
+			
 			//选择日期
 			selectData() {
 				var _this = this;
@@ -159,7 +137,7 @@
 				} else if (!this.subForm.content) {
 					mui.toast('请填写申请理由');
 					return false;
-				} else if (!this.subForm.approvalPersonId) {
+				} else if (false) {
 					mui.toast('请选择审批人');
 					return false;
 				} else {
@@ -168,13 +146,16 @@
 			},
 			//提交
 			submit() {
+				if(!this.examinePerson.name){
+					return;
+				}
 				if (this.checkForm()) {
 					this.isLoading = true;
 					API_BusinessTravel.submitBusiness(this.subForm).then(response => {
 						this.isLoading = false;
 
 						mui.toast('提交成功');
-						this.$router.push({
+						this.$router.replace({
 							name: 'MasterBusinessTravelInfo',
 							query: {
 								id: response.id
@@ -192,7 +173,7 @@
 		},
 		mounted() {
 			//获取审核人列表
-			this.getBusinessOutApprovalPerson();
+			this.getExaminePerson();
 		},
 		destroyed() {},
 		computed: {

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

@@ -1,16 +1,19 @@
 <template>
 	<div>
 		<common @asynCallBack="asynCallBack" :doLoading="true"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div v-if="detail.personName" class="mui-content vongi-qingjiadt margin60">
+		<header class="mui-bar mui-bar-nav">
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left" v-if="!$route.query.token"></a>
+				<h1 class="mui-title">{{pageTitle}}</h1>
+			</header>
+		<div v-if="detail.personName" class="mui-content vongi-qingjiadt ">
 			<div class="vongi-qingjiadt-head flew-sp">
 				<div class="flew-items">
 					<div class="flew"><img :src="detail.faceImageUrl" width="50" v-viewer /></div>
 					<h4>{{detail.personName}} 申请 <span class="color4fc5f7" v-text="detail.typeN"></span></h4>
 				</div>
-				<button class="mui-btn  mui-btn-primary mui-btn-outlined" :style="getColor(detail.status)" v-text="detail.statusN"></button>
-			</div>
+<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':detail.status==0,
+       	'mui-btn-danger':detail.status==2||detail.status==3,
+       	'mui-btn-success':detail.status==1||detail.status==4}">{{detail.statusN}}</button>			</div>
 			<form class="mui-input-group margin10">
 				<div class="mui-input-row">
 					<label>所属部门</label>
@@ -32,10 +35,7 @@
 					<label>出差事由</label>
 					<span v-text="detail.content"></span>
 				</div>
-				<div class="mui-input-row">
-					<label>申请单编号</label>
-					<span v-text="detail.approvalNo"></span>
-				</div>
+				
 				<div class="mui-input-row">
 					<label>申请时间</label>
 					<span v-text="detail.createTime"></span>
@@ -45,19 +45,14 @@
 					<span v-text="detail.endTime?detail.endTime:closeFrom.time"></span>
 				</div>
 			</form>
-			<div class="vongi-slot">
-				<div v-for="(item,index) in detail.list" class="vongi-slot-block">
-					<div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
-					<div class="vongi-slot-content">
-						<h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
-						<p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
-					</div>
-				</div>
-			</div>
+			 <examineDetail :id="id" @allowExamine="allowExamine" v-if="detail.sp&&detail.status!=4"></examineDetail>
+			 
 		</div>
 		<div v-if="wm && !detail.endTime" class="fyy-footer">
 			<div class="bindfyy-btn"><button type="button" @click="closeActoin" class="mui-btn mui-btn-danger">结束出差</button></div>
+	
 		</div>
+			
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>
@@ -66,6 +61,8 @@
 	import * as API_BusinessTravel from '@/apis/Master/business_travel'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
+	import ExamineDetail from '$project/components/ExamineDetail.vue'
+	
 	import TopHeader from '$project/components/TopHeader.vue'
 	import {
 		mapGetters,
@@ -76,7 +73,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader,
+			TopHeader,ExamineDetail
 		},
 		data() {
 			return {
@@ -101,6 +98,9 @@
 		},
 		created() {},
 		methods: {
+			allowExamine(op){
+				this.$emit('allowExamine',op);	
+			},
 			//获取详情
 			getInfo() {
 				this.isLoading = true;
@@ -108,6 +108,7 @@
 					this.isLoading = false;
 
 					this.detail = response;
+					this.detail.sp=true
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -152,6 +153,11 @@
 				//获取详情
 				this.getInfo();
 			},
+			update() {
+				this.detail.sp=false;
+				this.getInfo();
+			 
+			}
 		},
 		mounted() {
 			this.isLoading = true;

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

@@ -16,7 +16,10 @@
 							<p class='mui-ellipsis'>出差事由:{{item.content}}</p>
 							<p class='flew-sp flew-items'>
 								预估天数:{{item.estimatedTime}}天
-								<button type="button" :style="getColor(item.status)" class="mui-btn mui-btn-primary mui-btn-outlined" v-text="item.statusN"></button>
+								<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':item.status==0,
+								'mui-btn-danger':item.status==2||item.status==3,
+								'mui-btn-success':item.status==1||item.status==4}"   >{{item.statusN}}</button>
+								
 							</p>
 						</router-link>
 					</li>

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

@@ -1,254 +1,136 @@
 <template>
-	<div>
-		<common @asynCallBack="asynCallBack" :doLoading="true"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
-		<div class="mui-content vongi-wordcard">
-			<div class="mui-content-padded vongi-wordcard-top">
-				<div class="mui-media-object mui-pull-left">
-					<img :src="detail.faceImageUrl">
-				</div>
-				<div class="mui-media-body">
-					{{detail.personName}}
-					<p class='mui-ellipsis'><span class="color4fc5f7" v-text="detail.typeN"></span>申请</p>
-				</div>
-				<button :style="getColor(detail.status)" v-text="detail.statusN" type="button" class="mui-btn mui-btn-primary mui-btn-outlined">
-
-				</button>
-			</div>
-			<div class="mui-content-padded vongi-wordcard-center">
-				<ul class="mui-table-view">
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请类型</div>
-						<span v-text="detail.typeN"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">所在部门</div>
-						<span v-text="detail.companyName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">出差地点</div>
-						<span v-text="detail.destination"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">出差时间</div>
-						<span v-text="detail.startTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">预估天数</div>
-						<span v-text="detail.estimatedTime+'天'"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">出差事由</div>
-						<span v-text="detail.content"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请单编号</div>
-						<span v-text="detail.approvalNo"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请时间</div>
-						<span v-text="detail.createTime"></span>
-					</li>
-				</ul>
+<div>
+		<Info @allowExamine="allowExamine" ref="myinfo"></Info>
+		<div class="mui-content vongi-qingjiadt">
+			 
+			<div class="fyy-scon-botton" v-if="allowExamineBl">
+				<div class="examine-btn examine-btn1" @click="openFrom('3')">拒绝</div>
+				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
 			</div>
-			<div class="vongi-slot mui-content-padded">
-				<div v-for="(item,index) in detail.list" class="vongi-slot-block">
-					<div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
-					<div class="vongi-slot-content">
-						<h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
-						<p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
-					</div>
+		</div>
+		<!--弹窗-->
+		<div class="mui-popup mui-popup-in vongi-mui-pop"  v-show="showApprovalBl">
+			<div class="mui-popup-inner vongi-pop-inner">
+				<div class="mui-popup-title">审核意见</div>
+				<div class="mui-popup-input">
+					<textarea id="textarea" rows="3" v-model="subForm.content" placeholder="可输入审核意见"></textarea>
 				</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>
-			</div>
+			<div class="mui-popup-buttons">
+				<span class="mui-popup-button"  @click="showApprovalBl=false">取消</span>
+			<span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
 		</div>
-
+		<div class="mui-popup-backdrop mui-active" v-show="showApprovalBl"></div>
 		<loading :visible="isLoading"></loading>
-	</div>
+</div>
 </template>
 
 <script>
-	require('$project/assets/js/mui.picker.min.js');
+	import Info from './Info.vue'
+	
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
 
-	import * as API_BusinessTravel from '@/apis/Master/business_travel'
-	import Common from '$project/components/Common.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: 'MasterBusinessTravelVerifyInfo',
+		name: '',
 		components: {
 			Common,
 			Loading,
-			TopHeader,
+			TopHeader,Info
 		},
 		data() {
 			return {
-				pageTitle: '出差审批详情',
-
+				pageTitle: '申请详情',
+				showApprovalBl:false,
+				allowExamineBl:false,
 				isLoading: false,
-				approvalPersonName: '',
-				approvalPersonUrl: '',
-
 				subForm: {
-					ids: this.$route.query.id,
-					status: '',
-					approvalContent: '',
-					nextApprovalId: '',
-				},
-				approvalPersonList: [],
-				//补卡1，外出2，出差3 ，请假4
-				personForm: {
-					type: '3'
-				},
-				approvalPerson: true,
-				detail: {
-					list: [],
+					procinstActUserIds: '',
+					content: '',
+					status: ''
 				},
 			}
 		},
-		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'],
-							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;
-
-					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.approvalPersonUrl = selectItems[0].url;
-
-					picker.dispose();
-				})
-			},
-			//获取详情
-			getInfo() {
-				this.isLoading = true;
-				API_BusinessTravel.businessOutDetail(this.subForm.ids).then(response => {
-					this.isLoading = false;
-
-					this.detail = response;
-				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
-				})
-			},
-			//获取状态颜色
-			getColor(status) {
-				var color = '';
-				if (status == '0') {
-					color = '#4fc5f7';
-				} else if (status == '1') {
-					color = '#55f868';
-				} else if (status == '2') {
-					color = '#fe616c';
-				}
-				return 'color:' + color + ';border-color:' + color + ';';
-			},
-			//显示内容表单
-			openFrom(status) {
-				if (!this.subForm.ids) {
-					mui.toast('请选择要处理的信息');
-				} else {
-					this.subForm.status = status;
-					this.subForm.approvalContent = status == 1 ? '同意' : '拒绝';
-					//this.openFromVisible = true;
-					//直接点击处理，不需要弹窗理由框
-					this.doAction();
-				}
-			},
-			//检测表单
-			checkForm() {
-				if (!this.approvalPerson) {
-					mui.toast('加载下一级审批人失败，请刷新页面');
-					return false;
-				} else if (!this.subForm.ids) {
-					mui.toast('请选择要处理的信息');
-					return false;
-				} else {
-					return true;
+		created() {
+			
+	
+		},
+		methods: { 
+			allowExamine(bl){
+				 
+				if(bl==""){
+					 this.allowExamineBl=false;
+					return
 				}
+				 if(bl==this.$route.query.procinstActUserId){
+					 this.allowExamineBl=true;
+				 }else{
+					 this.allowExamineBl=false;
+				 }
+			
 			},
 			//同意拒绝
 			doAction() {
+				this.subForm.procinstActUserIds =this.$route.query.procinstActUserId;
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_BusinessTravel.businessOutApproval(this.subForm).then(response => {
+					API.examineSubmit(this.subForm).then(response => {
 						this.isLoading = false;
-
-						this.openFromVisible = false;
-						this.getInfo();
+			
+						this.showApprovalBl = false;
+						this.$refs.myinfo.update();
+						mui.toast("操作成功");
+						 
 					}).catch(error => {
 						this.isLoading = false;
 						mui.toast(error);
 					})
 				}
 			},
+			//检测表单
+			checkForm() {
+				if (false) {
+					mui.toast('请选择要处理的信息');
+					return false;
+				} else {
+					return true;
+				}
+			},
+		    openFrom(status) {
+		    	if (false) {
+		    		mui.toast('请选择要处理的信息');
+		    	} else {
+		    		this.subForm.status = status;
+		    		this.subForm.content = status == 1 ? '同意' : '拒绝';
+		    		this.showApprovalBl = true;
+		    		//直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
+		    		//this.doAction();
+		    	}
+		    },
 			asynCallBack() {
-				//获取详情
-				this.getInfo();
-				// this.getBusinessOutApprovalPerson();
+	
 			},
+		
 		},
 		mounted() {
-			this.isLoading = true;
+		
 		},
 		destroyed() {},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-			})
-		},
+	
 	}
 </script>
 
-<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 src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/xsy.css"></style>
 <style>
 </style>

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

@@ -1,272 +1,176 @@
 <template>
-	<div>
+<div>
 		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
-
+	<loading :visible="isLoading"></loading>
+    <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="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 				<div class="mui-scroll">
-					<a @click="reloadList('0')" :class="'mui-control-item '+(listForm.status=='0'?'mui-active':'')">
-						<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
+					<a class="mui-control-item " @click="mySwitchTab(true)" :class="{'mui-active':switchTab}" >
+						<span class="fyy-badge">待处理<span class="mui-badge" v-show="mybadge">{{mybadge}}</span></span>
 					</a>
-					<a @click="reloadList('1')" :class="'mui-control-item '+(listForm.status=='1'?'mui-active':'')">
+					<a class="mui-control-item"  @click="mySwitchTab(false)" :class="{'mui-active':!switchTab}"   >
 						已处理
 					</a>
 				</div>
 			</div>
-			
-			<NullList :remark="'暂无申请记录'" v-if="!recordList.length"></NullList>
-			
 			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
 				
-				<div class="mui-slider-group vongi-cchai">
-					<div v-if="listForm.status=='0'" class="mui-slider-item mui-control-content mui-active">
-						<div class="mui-scroll-wrapper vongi-over-hei">
+				<div class="mui-slider-group">
+					
+					<div  class="mui-slider-item mui-control-content " v-show="switchTab">
+						<div  class="mui-scroll-wrapper vongi-over-hei" >
 							<div class="mui-scroll">
-								<form class="mui-input-group fyy-checkbox">
-									<div v-for="(item,index) in recordList" class="mui-input-row mui-checkbox mui-left">
-										<router-link :to="{name:'MasterBusinessTravelVerifyInfo',query:{id:item.id}}">
-											<h4>{{item.personName}}的出差申请<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
-											<p class='mui-ellipsis'>出差事由:{{item.content}}</p>
-											<p class='mui-ellipsis flew-items flew-sp'>
-												预估天数:{{item.estimatedTime}}天
-												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" :style="getColor(item.status)"
-												 v-text="item.statusN"></button>
-											</p>
+								<div class="mui-input-group fyy-checkbox">
+									
+									<div class="mui-input-row mui-checkbox mui-left" v-for="item,i in recordList">
+										
+											<router-link :to="{name:'MasterBusinessTravelVerifyInfo',query:{id:item.id,procinstActUserId:item.procinstActUserId}}" class="mui-media-body">
+											
+											<h4 class="flew-sp margin10">{{item.name}}的出差申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
+											<h5 class='mui-ellipsis color999'>出差日期：{{item.startTime}}</h5>
 										</router-link>
-										<input name="checkbox" v-model="selectIdList" :value="item.id" type="checkbox">
+										<input name="checkbox" v-model="ids" :value="item.procinstActUserId" type="checkbox" >
 									</div>
-								</form>
+									<NullList :remark="'暂无出差申请记录'" v-if="!recordList.length"></NullList>
+									 
+								</div>
 							</div>
 						</div>
 					</div>
-					<div v-if="listForm.status=='1'" class="mui-slider-item mui-control-content">
+					<div  class="mui-slider-item mui-control-content" v-show="!switchTab">
 						<div class="mui-scroll-wrapper">
 							<div class="mui-scroll">
 								<ul class="mui-table-view mui-table-view-chevron">
-									<li v-for="(item,index) in recordList" class="mui-table-view-cell mui-media">
-										<router-link :to="{name:'MasterBusinessTravelVerifyInfo',query:{id:item.id}}">
-											<h4>{{item.personName}}的出差申请<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
-											<p class='mui-ellipsis'>出差事由:{{item.content}}</p>
-											<p class='mui-ellipsis flew-items flew-sp'>
-												预估天数:{{item.estimatedTime}}天
-												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" :style="getColor(item.status)"
-												 v-text="item.statusN"></button>
-											</p>
+									<li class="mui-table-view-cell mui-media" v-for="item,i in recordList2">
+										<router-link :to="{name:'MasterBusinessTravelVerifyInfo',query:{id:item.id}}" class="mui-media-body">
+										
+											<h4 class="flew-sp margin10">{{item.name}}的出差申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
+											<h5 class='mui-ellipsis color999 flew-sp flew-items'>出差日期：{{item.startTime}}
+											<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':item.action==0,
+											'mui-btn-danger':item.action==2||item.action==3,
+											'mui-btn-success':item.action==1||item.action==4}"   >{{item.actionName}}</button>
+															
+										 
+											
+											</h5>
 										</router-link>
 									</li>
+									
 								</ul>
+								<NullList :remark="'暂无已处理记录'" v-if="!recordList2.length"></NullList>
+								
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-
-            <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 class="fyy-bindfyy-btn" v-show="switchTab">
+				<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==ids.length">
+						
+					</div>
+				</form>
+				<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('3')">拒绝</button>
+				<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
+			</div>
+		</div>
+		<!--弹窗-->
+		<div class="mui-popup mui-popup-in vongi-mui-pop"  v-show="showApprovalBl">
+			<div class="mui-popup-inner vongi-pop-inner">
+				<div class="mui-popup-title">审核意见</div>
+				<div class="mui-popup-input">
+					<textarea id="textarea" rows="3" v-model="subForm.content" placeholder="可输入审核意见"></textarea>
 				</div>
 			</div>
+			<div class="mui-popup-buttons">
+				<span class="mui-popup-button"  @click="showApprovalBl=false">取消</span>
+			<span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
 		</div>
-
-		<loading :visible="isLoading"></loading>
-	</div>
+		<div class="mui-popup-backdrop mui-active" v-show="showApprovalBl"></div>
+</div>
 </template>
 
-<script>
-    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'
+
+<script>
+	
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
+
+	import  Common from '$project/components/Common.vue'
+ 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
-	import isReachBottom from '$project/utils/isReachBottom'
 	import NullList from '$project/components/NullList.vue'
-	import {
-		mapGetters,
-		mapMutations
-	} from 'vuex'
-	export default {
-		name: 'MasterBusinessTravelVerifyList',
-		components: {
-			Common,
-			Loading,
-			TopHeader,
-			NullList
-		},
-		data() {
+	import isReachBottom from '$project/utils/isReachBottom'
+	
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+
+	export default {
+		name: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,NullList
+		},
+		data() {
 			return {
-				pageTitle: '出差审批',
-
-				isLoading: false,
-
+				allSelect:[],
+				ids:[],
+				switchTab:true,
+				mybadge:0,
+				pageTitle: '出差申请审核列表',
+				showApprovalBl:false,
+				isLoading: false,			
 				listForm: {
-					type: '3',
+					procinstType:3,
 					pageIndex: 1,
-					pageSize: 20,
+					pageSize: 10,
 					totalPage: 1,
-					status: '0'
 				},
 				recordList: [],
-                approvalPersonList:[],
-                approvalPerson:true,
-
-                subForm: {
-					ids: '',
-					approvalContent: '',
-					status: '',
-                    nextApprovalId:'',
+				
+				listForm2: {
+					procinstType:3,
+					pageIndex: 1,
+					pageSize: 20,
+					totalPage: 1,
 				},
-                //补卡1，外出2，出差3 ，请假4
-                personForm: {
-                    type: '3'
-                },
-				selectIdList: [],
-				allSelect: [],
-				firstRecordsTotal: 0,
-			}
-		},
-		created() {},
+				recordList2: [],
+				subForm: {
+					
+					procinstActUserIds: '',
+					content: '',
+					status: ''
+				},
+			}
+		},
+		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;
-				API_BusinessTravel.verifyList(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
-							];
-						}
+			mySwitchTab(bl){
+				this.switchTab=bl;
+				if(bl){
+					if(this.recordList.length==0){
+						this.getList()
 					}
-
-					if (this.listForm.status == 0) {
-						this.firstRecordsTotal = response.recordsTotal;
-					}
-
-					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;
+				}else{
+					if(this.recordList2.length==0){
+						this.getList2()
 					}
 				}
 			},
-			//切换
-			reloadList(status) {
-				this.listForm.status = status;
-				this.listForm.pageIndex = 1;
-				this.getList();
-			},
-			//选择所有
-			selectAll() {
-				if (this.allSelect.length) {
-					this.selectIdList = [];
-				} else {
-					var selectIdList = [];
-					this.recordList.forEach(function(item, index) {
-						selectIdList.push(item.id);
-					})
-					this.selectIdList = selectIdList;
-				}
-			},
-			//显示内容表单
-			openFrom(status) {
-				if (!this.selectIdList.length) {
-					mui.toast('请选择要处理的信息');
-				} else {
-					this.subForm.status = status;
-					this.subForm.content = status == 1 ? '同意' : '拒绝';
-					//this.openFromVisible = true;
-					//直接点击处理，不需要弹窗理由框
-					this.doAction();
-				}
-			},
 			//检测表单
 			checkForm() {
-                if(!this.approvalPerson){
-                    mui.toast('加载下一级审批人失败，请刷新页面');
-                    return false;
-                }else if (!this.subForm.ids) {
+				if (false) {
 					mui.toast('请选择要处理的信息');
 					return false;
 				} else {
@@ -275,14 +179,16 @@
 			},
 			//同意拒绝
 			doAction() {
-				this.subForm.ids = this.selectIdList.join(',');
+				this.subForm.procinstActUserIds = this.ids.join(',');
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_BusinessTravel.businessOutApproval(this.subForm).then(response => {
+					API.examineSubmit(this.subForm).then(response => {
 						this.isLoading = false;
-
-						this.openFromVisible = false;
+			
+						this.showApprovalBl = false;
 						this.listForm.pageIndex = 1;
+						this.recordList2=[];
+						mui.toast("操作成功");
 						this.getList();
 					}).catch(error => {
 						this.isLoading = false;
@@ -290,68 +196,130 @@
 					})
 				}
 			},
-			//获取状态颜色
-			getColor(status) {
-				var color = '';
-				if (status == '0') {
-					color = '#4fc5f7';
-				} else if (status == '1') {
-					color = '#55f868';
-				} else if (status == '2') {
-					color = '#fe616c';
+			//显示内容表单
+			openFrom(status) {
+				if (!this.ids.length) {
+					mui.toast('请选择要处理的信息');
+				} else {
+					this.subForm.status = status;
+					this.subForm.content = status == 1 ? '同意' : '拒绝';
+					this.showApprovalBl = true;
+					//直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
+					//this.doAction();
 				}
-				return 'color:' + color + ';border-color:' + color + ';';
-			},
-			asynCallBack() {
-
 			},
-		},
-		mounted() {
+			//选择所有
+			selectAll() {
+				
+				if (this.allSelect.length) {
+					this.ids = [];
+				} else {
+					var selectIdList = [];
+					this.recordList.forEach(function(item, index) {
+						selectIdList.push(item.procinstActUserId);
+					})
+					this.ids = selectIdList;
+				}
+			},
+			//获取列表
+			getList2() {
+				this.isLoading = true;
+				API.alreadyExamineShiftList(this.listForm2).then(response => {
+					if (response) {
+						if (this.listForm2.pageIndex == 1) {
+							this.recordList2 = response.data;
+							this.listForm2.pageIndex = response.pageNumber;
+							this.listForm2.totalPage = response.totalPage;
+							
+						} else {
+							this.recordList2 = [
+								...this.recordList2,
+								...response.data
+							];
+						}
+					}
+					this.listForm2.pageIndex++;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			 //获取列表
+			 getList() {
+			 	this.isLoading = true;
+			 	API.waitExamineShiftList(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;
+							this.mybadge=response.recordsTotal
+			 			} 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.switchTab){
+						if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+							this.getList();
+						} else {
+							return;
+						}
+					}else{
+						if (this.listForm2.pageIndex <= this.listForm2.totalPage && this.isLoading == false) {
+							this.getList2();
+						} else {
+							return;
+						}
+					}
+			 		
+			 	}
+			 },
+		 
+			asynCallBack() {
+
+			},
+		
+		},
+	mounted() {
+		if(this.switchTab){
 			this.getList();
-            //this.getBusinessOutApprovalPerson()
-			//监控下拉加载事件
-			var _this = this;
-			window.addEventListener('scroll', _this.handleScrool);
-		},
-		destroyed() {
-			//销毁监听事件
-			var _this = this;
-			window.removeEventListener('scroll', _this.handleScrool);
-		},
-		computed: {
-			...mapGetters({
-				openId: 'wx_openid',
-				token: 'token',
-			})
-		},
-		//keepalive监控判断
-		beforeRouteLeave(to, from, next) {
-			console.log(to.name);
-			if (['MasterBusinessTravelVerifyInfo'].indexOf(to.name) > -1) {
-				this.$store.commit('SET_KEEP_ALIVE_COMPONENTS', ['MasterBusinessTravelVerifyList'])
-			} else {
-				this.$store.commit('SET_KEEP_ALIVE_COMPONENTS', [])
-			}
-			next()
-		},
-	}
+		}else{
+			this.getList2();
+		}
+		
+		//监控下拉加载事件
+		var _this = this;
+		window.addEventListener('scroll', _this.handleScrool);
+	},
+	destroyed() {
+		//销毁监听事件
+		var _this = this;
+		window.removeEventListener('scroll', _this.handleScrool);
+	},
+	
+	}
 </script>
 
-<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 {
-		position: fixed;
-		top: 44px;
-		z-index: 99;
-		background-color: #eee;
-	}
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/xsy.css"></style>
+<style>
 	
-	.mui-fullscreen {
-		position: unset;
-		margin-top: 45px;
-	}
-</style>
+
+</style>

src/utils/request.js

@@ -14,7 +14,7 @@ axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
 
 //检测是否可以访问通
 var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
-
+//var BACKEND_URL="https://ykt-test.xiaoxinda.com/shinestar-server/"
 
 // 创建axios实例
 const service = axios.create({