审批 时长显示 ，增加分钟 ， 锁屏代码添加

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

@@ -21,7 +21,8 @@
 				<label>申请时间</label>
 				<span>{{adjustShiftDetail.createTime}}</span>
 			</div>
-		</form>
+		</form>
+			<loading :visible="isLoading"></loading>
 	</div>
 </template>
 

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

@@ -62,6 +62,7 @@
 				
 				</div>
 			</div>
+				<loading :visible="isLoading"></loading>
 		</div>
 </template>
 

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

@@ -56,6 +56,7 @@
 
 			 
 		</div>
+			<loading :visible="isLoading"></loading>
 </div>
 </template>
 

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

@@ -58,6 +58,7 @@
 					</div>
 			</div>
 		</div>
+			<loading :visible="isLoading"></loading>
 </div>
 </template>
 

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

@@ -50,6 +50,7 @@
 					<!--<button type="button" class="mui-btn mui-btn-grey ">确认调班</button>-->
 				</div>
 			</div>
+				<loading :visible="isLoading"></loading>
 		</div>
 </template>
 

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

@@ -42,6 +42,7 @@
 				</ul>				
 			</div>			
 		</div>
+			<loading :visible="isLoading"></loading>
 </div>
 </template>
 

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

@@ -73,6 +73,7 @@
 			</div>
 
 		</div>
+			<loading :visible="isLoading"></loading>
 </div>
 </template>
 

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

@@ -49,6 +49,7 @@
 				</form>
 				
 			</div>
+				<loading :visible="isLoading"></loading>
 	</div>
 </template>
 

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

@@ -34,7 +34,7 @@
                 <form class="mui-input-group vongi-editme margin10">
 					<div class="mui-input-row">
 						<label >&nbsp;&nbsp;时长(小时)</label>
-						<span v-text="subForm.hours">4.5</span>
+						<span v-text="subForm.ffN">4.5</span>
 					</div>
 				</form>
 				<form class="mui-input-group vongi-editme margin10">
@@ -71,6 +71,7 @@
 				</button>
 				</div>
 			</div>
+			<loading :visible="isLoading"></loading>
 		</div>
 </template>
 
@@ -119,6 +120,7 @@
 					reason: '',
 					startTime: '',
 					endTime: '',
+					ff:0,
 					hours: 0,
 					type: '2',
 					
@@ -155,6 +157,7 @@
 					};
 					this.subForm.personIds=response.nameId;
 					this.seletPerson=response.name
+					this.countHours()
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -317,6 +320,11 @@
 			countHours() {
 				var hoursArr = hourDistanceArr(this.subForm.startTime, this.subForm.endTime);
 				this.subForm.hours = hoursArr[0];
+				this.subForm.ff = hoursArr[1];
+				
+				var subForm=this.subForm;
+				this.subForm.ffN = (subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'');
+				
 			},
 			getExaminePersonList(){
 				

src/projects/business/views-xsy/WorkOvertime/Add3.vue

@@ -34,7 +34,7 @@
                 <form class="mui-input-group vongi-editme margin10">
 					<div class="mui-input-row">
 						<label >&nbsp;&nbsp;时长(小时)</label>
-						<span v-text="subForm.hours">4.5</span>
+						<span v-text="subForm.ffN">4.5</span>
 					</div>
 				</form>
 				<form class="mui-input-group vongi-editme margin10">
@@ -51,6 +51,7 @@
 					<!--<button type="button" class="mui-btn mui-btn-grey ">确认调班</button>-->
 				</div>
 			</div>
+				<loading :visible="isLoading"></loading>
 		</div>
 </template>
 
@@ -97,6 +98,7 @@
 					startTime: '',
 					endTime: '',
 					hours: 0,
+						ff:0,
 					type: '3',
 					draft:1,
 					formId: 'batchExtraWork',
@@ -236,6 +238,11 @@
 			countHours() {
 				var hoursArr = hourDistanceArr(this.subForm.startTime, this.subForm.endTime);
 				this.subForm.hours = hoursArr[0];
+				this.subForm.ff = hoursArr[1];
+				
+				var subForm=this.subForm;
+				this.subForm.ffN = (subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'');
+				
 			},
 			getExaminePerson(){
 				

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

@@ -21,7 +21,7 @@
 			<form class="mui-input-group margint10">
 				<div class="mui-input-row">
 					<label>时长(小时)</label>
-					<div><button class="mui-btn mui-btn-block" type='button' v-text="subForm.hours+'小时'"></button></div>
+					<div><button class="mui-btn mui-btn-block" type='button' v-text="(subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'')"></button></div>
 				</div>
 				<div class="mui-input-row">
 					<label><span class="colorfe616c"></span>审批人</label>
@@ -86,6 +86,7 @@ id:"",
 					reason: '',
 					startTime: '',
 					endTime: '',
+					ff:0,
 					hours: 0,
 					type: '1',
 					formId: 'extraWork',
@@ -119,7 +120,7 @@ id:"",
 						... this.subForm ,
 						...response
 					};
-					
+					this.countHours()
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -235,6 +236,10 @@ id:"",
 			countHours() {
 				var hoursArr = hourDistanceArr(this.subForm.startTime, this.subForm.endTime);
 				this.subForm.hours = hoursArr[0];
+				this.subForm.ff = hoursArr[1];
+				var subForm=this.subForm;
+				this.subForm.ffN = (subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'');
+				
 			},
 			getExaminePerson(){
 				API_sp.examinePerson(this.subForm.formId).then(response => {

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

@@ -19,7 +19,7 @@
 				</div>
 		        <div class="mui-input-row">
 					<label>预计时长</label>
-					<span>{{detail.hours}}小时</span>
+					<span>{{detail.ffN}}</span>
 				</div>
 				<div class="mui-input-row" v-if="detail.durationStr">
 					<label>实际时长</label>
@@ -53,6 +53,11 @@
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		currentTimeStamp,
+		parseUnixTime,
+		hourDistanceArr
+	} from '$project/utils'
 	import {
 		mapGetters,
 		mapMutations
@@ -77,6 +82,13 @@
 		},
 		created() {},
 		methods: {
+			countHours() {
+				var hoursArr = hourDistanceArr(this.detail.startTime, this.detail.endTime);
+				var subForm=this.detail;
+				this.detail.hours = hoursArr[0];
+				this.detail.ff = hoursArr[1];
+				this.detail.ffN = (subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'');
+			},
 			//获取详情
 			getInfo() {
 				this.isLoading = true;
@@ -84,6 +96,7 @@
 					this.isLoading = false;
 
 					this.detail = response;
+					this.countHours()
 					this.$emit('getInfo',this.detail);
 				}).catch(error => {
 					this.isLoading = false;

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

@@ -24,7 +24,7 @@
 					</li>
 					<li class="mui-table-view-cell mui-media">
 						<div class="mui-media-body">加班时长</div>
-						<span>{{detail.hours}}小时</span>
+						<span>{{detail.ffN}}小时</span>
 					</li>
 					<li class="mui-table-view-cell mui-media">
 						<div class="mui-media-body">加班原因</div>
@@ -148,6 +148,13 @@
 					picker.dispose();
 				})
 			},
+			countHours() {
+				var hoursArr = hourDistanceArr(this.detail.startTime, this.detail.endTime);
+				var subForm=this.detail;
+				this.detail.hours = hoursArr[0];
+				this.detail.ff = hoursArr[1];
+				this.detail.ffN = (subForm.hours!=0||subForm.ff==0?subForm.hours+'小时':'')+(subForm.ff!=0?subForm.ff+'分钟':'');
+			},
 			//获取详情
 			getInfo() {
 				this.isLoading = true;
@@ -155,6 +162,7 @@
 					this.isLoading = false;
 
 					this.detail = response;
+					this.countHours();
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);

src/utils/storage.js

@@ -55,7 +55,7 @@ export const getOpenId = () => get('wx_openid')
 export const setOpenId = (data) => set('wx_openid', data)
 if (process.env.VUE_APP_NODE_NAME == 'devlopment') {
 	setOpenId("oHjCawigqi8SEAwutwkQ-VEgdp3k")
-	//setOpenId("oHjCawmHqG44pqUW54iBlenaHYB8")
+	setOpenId("oHjCawmHqG44pqUW54iBlenaHYB8")
 	
 }
 export const getUserId = () => get('ali_openid')