浏览代码

撤销后补卡

zhengkaixin 4 年之前
父节点
当前提交
cc457cadb4

+ 2 - 2
src/projects/business/apis/Master/attendance.js

@@ -10,7 +10,7 @@ import Qs from 'qs';
 
 //获取考勤记录
 export function pageList(params) {
-	return request2({
+	return request({
 		url: '/mobile/workAttendance/pageList',
 		data: Qs.stringify(params),
 		method: 'post',
@@ -19,7 +19,7 @@ export function pageList(params) {
 
 //获取考勤记录
 export function statistics(params) {
-	return request2({
+	return request({
 		url: '/mobile/workAttendance/statistics',
 		data: Qs.stringify(params),
 		method: 'post',

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

@@ -326,7 +326,7 @@
 		mounted() {
 			  this.list=[];
 			
-			for(var i=0 ;i< 7;i++){
+			for(var i=0 ;i< 31;i++){
 				var vdate = parseUnixTime(currentTimeStamp()-24*60*60*1000*(i+1), '{y}-{m}-{d}');
 				var item={
 					    value: vdate,

+ 2 - 0
src/projects/business/views/Master/Attendance/List.vue

@@ -14,6 +14,8 @@
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='3'" @click="goToInfo(item.supplementWorkId)">已拒绝</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='0'" @click="goToInfo(item.supplementWorkId)">审核中</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status===null" @click="applybk(item.id,item.recordTime)">申请补卡</button>
+							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status==='6'" @click="applybk(item.id,item.recordTime)">申请补卡</button>
+							
 							<span :style="'color:'+statusColor[item.result]" v-text="status[item.result]">缺卡</span>
 						</div>
 					</li>

+ 2 - 2
src/utils/request2.js

@@ -17,10 +17,10 @@ var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
 
 if (process.env.VUE_APP_NODE_NAME == 'devlopment') {
 		// BACKEND_URL='http://192.168.33.120:8086/shinestar-server';
-		 BACKEND_URL='http://192.168.33.90:8086/shinestar-server';
+		// BACKEND_URL='http://192.168.33.90:8086/shinestar-server';
 		
 	//	BACKEND_URL="https://ykt-test.xiaoxinda.com/shinestar-server/"
-		//BACKEND_URL='http://223.75.170.44:6060/shinestar-server';
+		BACKEND_URL='http://223.75.170.44:6060/shinestar-server';
 		
 }