eraser 4 年 前
コミット
821738bb53

+ 13 - 8
components/manager/assets.vue

@@ -121,13 +121,6 @@
 			},
 			showNextOrLastPageBtn()
 			{
-				// if((this.pageTotalNum-this.totalItem)>0)
-				// {
-				// 	this.bShowLastPageBtn = false;
-				// 	this.bShowNextPageBtn = false;
-				// 	// console.log('0000')
-				// }
-				// else 
 				if(this.pageTotalNum==this.currentPage)
 				{
 					this.bShowLastPageBtn = true;
@@ -171,7 +164,7 @@
 								"UserID":mydata_userInfo.userID,
 								"ItemName":content_arr[0].input,
 							}
-							
+							console.log('data===',data)
 							uni.showLoading({
 							    title: '上传中'  
 							});
@@ -253,6 +246,18 @@
 </script>
 
 <style lang="scss">
+	// 允许文字被选择
+	th
+	{
+	moz-user-select: -moz-text;
+	-moz-user-select: text;
+	-o-user-select: text;
+	-khtml-user-select: text;
+	-webkit-user-select: text;
+	-ms-user-select: text;
+	user-select: text;
+	}
+	
 	.m_right {
 		width: 100%;
 		margin-top: 5rpx;

+ 13 - 9
components/manager/project.vue

@@ -129,14 +129,7 @@
 				this.paging(this.currentPage);
 			},
 			showNextOrLastPageBtn()
-			{
-				// if((this.pageTotalNum-this.totalItem)>0)
-				// {
-				// 	this.bShowLastPageBtn = false;
-				// 	this.bShowNextPageBtn = false;
-				// 	console.log('0000')
-				// }
-				// else 
+			{ 
 				if(this.pageTotalNum==this.currentPage)
 				{
 					this.bShowLastPageBtn = true;
@@ -321,7 +314,18 @@
 
 <style lang="scss">
 	@import '../../assets/icon/iconfont.css';
-
+	// 允许文字被选择
+	th
+	{
+	moz-user-select: -moz-text;
+	-moz-user-select: text;
+	-o-user-select: text;
+	-khtml-user-select: text;
+	-webkit-user-select: text;
+	-ms-user-select: text;
+	user-select: text;
+	}
+	
 	.m_right {
 		width: 100%;
 		margin-top: 5rpx;

+ 33 - 24
components/manager/user.vue

@@ -145,13 +145,6 @@
 			},
 			showNextOrLastPageBtn()
 			{
-				// if((this.pageTotalNum-this.totalItem)>0)
-				// {
-				// 	this.bShowLastPageBtn = false;
-				// 	this.bShowNextPageBtn = false;
-				// 	// console.log('0000')
-				// }
-				// else 
 				if(this.pageTotalNum==this.currentPage)
 				{
 					this.bShowLastPageBtn = true;
@@ -183,23 +176,28 @@
 				let _self = this;
 				let callback = function(content_arr){
 					let data = {
-						"IlabAccount":content_arr[0].input,
-						"UserID" : content_arr[1].input,        
-						"SetUserID":content_arr[2].input,        
-						"Name":content_arr[3].input,              
-						"School":content_arr[4].input,       
-						"Department":content_arr[5].input,  
-						"Profession":content_arr[6].input,    
-						"Class":content_arr[7].input,          
-						"StudentID":content_arr[8].input,       
-						"Post":content_arr[9].input,            
-						"PhoneNum":content_arr[10].input,
-						"Email":content_arr[11].input,
-						"Nation":content_arr[12].input,             
-						"PoliticsStatus":content_arr[13].input, 
-						"NativePlace":content_arr[14].input,   
-						"Certificate":content_arr[15].input,
-						"CertificateNum":content_arr[16].input,
+						"UserID":mydata_userInfo.userID,
+						"Users":[
+							{
+								"IlabAccount":content_arr[0].input,
+								"UserID" : content_arr[1].input,        
+								"SetUserID":content_arr[2].input,        
+								"Name":content_arr[3].input,              
+								"School":content_arr[4].input,       
+								"Department":content_arr[5].input,  
+								"Profession":content_arr[6].input,    
+								"Class":content_arr[7].input,          
+								"StudentID":Number(content_arr[8].input),       
+								"Post":content_arr[9].input,            
+								"PhoneNum":Number(content_arr[10].input),
+								"Email":content_arr[11].input,
+								"Nation":content_arr[12].input,             
+								"PoliticsStatus":content_arr[13].input, 
+								"NativePlace":content_arr[14].input,   
+								"Certificate":content_arr[15].input,
+								"CertificateNum":content_arr[16].input
+							}
+						]					
 					}
 					// console.log('data===',data)
 					
@@ -461,6 +459,17 @@
 </script>
 
 <style lang="scss">
+	// 允许文字被选择
+	th
+	{
+	moz-user-select: -moz-text;
+	-moz-user-select: text;
+	-o-user-select: text;
+	-khtml-user-select: text;
+	-webkit-user-select: text;
+	-ms-user-select: text;
+	user-select: text;
+	}
 	.m_right {
 		width: 100%;
 		margin-top: 5rpx;

+ 3 - 3
components/popForm.vue

@@ -86,7 +86,7 @@
 					length = this.itemNumPerPage;
 					
 				}
-				console.log('length=',length)
+				// console.log('length=',length)
 				for(let i = 0;i<length;i++){
 					this.curr_content_arr.push(this.content_arr[i]);
 				}
@@ -138,11 +138,11 @@
 					nextPageItemNum = this.itemNumPerPage;
 				}
 				
-				let fromIndex = (this.curr_page-1)*this.itemNumPerPage-1;
+				let fromIndex = (this.curr_page-1)*this.itemNumPerPage;
 				let toIndex = fromIndex+this.itemNumPerPage;
 				if(toIndex>totalItemNum)
 				{
-					toIndex = totalItemNum - 1;
+					toIndex = totalItemNum;
 				}
 				
 				// console.log('from='+fromIndex+';To='+toIndex)