Forráskód Böngészése

DailyReport checkupload UI Could input different projectID split by comma

Paul 2 éve
szülő
commit
3054c72fc2
3 módosított fájl, 49 hozzáadás és 13 törlés
  1. 1 1
      New Text Document.html
  2. 48 12
      js/check.xlsx.full.js
  3. BIN
      日报模板-test.xlsx

+ 1 - 1
New Text Document.html

@@ -51,7 +51,7 @@
                            document.getElementById('message').innerHTML += HaveData3Para(workbook,"C","C16");
                            document.getElementById('message').innerHTML += HaveData3Para(workbook,"C","C16");
                             return;
                             return;
                           };
                           };
-                          readWorkbook(workbook,"message","2022-05-22","兰国玉","U1065","U1065P2022");
+                          readWorkbook(workbook,"message","2022-06-07","张强","U1999","U1055P2022,U1065P2022,U1098P2022");
                          // if (document.getElementById('TextBox3').innerHTML == ""&&document.getElementById('FileUpload1').value != "") {                           
                          // if (document.getElementById('TextBox3').innerHTML == ""&&document.getElementById('FileUpload1').value != "") {                           
                          //     document.getElementById('Button1').disabled =false;
                          //     document.getElementById('Button1').disabled =false;
                               //alert("pass!")                             
                               //alert("pass!")                             

+ 48 - 12
js/check.xlsx.full.js

@@ -85,6 +85,16 @@
 					}
 					}
 			   }*/
 			   }*/
 
 
+			   function 项目号(str) {	
+				if (str.length != 10){
+					return "所填:"+ str +",不是10字符!";
+				}else if(str.substr(0,1)!="U" || !myIsNaN(str.substr(1,4)) || str.substr(5,1)!="P" || !myIsNaN(str.substr(6,4)) ){
+					return "所填:"+ str +",格式有误!";
+				}else{
+					return true;
+				};	
+			};
+
 	              // 检验日报excel文件
 	              // 检验日报excel文件
 	              function readWorkbook(workbook,logID,strDate,userID,unitID,projectID) {
 	              function readWorkbook(workbook,logID,strDate,userID,unitID,projectID) {
                  
                  
@@ -157,11 +167,45 @@
 											 };
 											 };
 
 
 										}else if (arrayFunNames[i][index]==="项目号") {
 										}else if (arrayFunNames[i][index]==="项目号") {
+											var strs= new Array();
+											var  bHaveMoreID=false
+											if (projectID.includes(',') && !projectID.includes(',')) {
+												strs = projectID.split(',')
+												bHaveMoreID=true
+											} else if (projectID.includes(',')  && !projectID.includes(',') ) {
+												strs = projectID.split(',')
+												bHaveMoreID=true
+											}else if (projectID.includes(',')  && projectID.includes(',') ) {
+												document.getElementById(logID).innerHTML += "所填:"+ projectID +",同时包含中英文豆号!"+ '\n';
+											}
+         
+											if (bHaveMoreID) {												
+												for (let index = 0; index < strs.length; index++) {													
+													if (项目号(strs[index]) != true) {
+														document.getElementById(logID).innerHTML += 项目号(strs[index])+ '\n';
+													}
+												}
+
+												var bEqual=false
+												for (let index = 0; index < strs.length; index++) {
+													if (worksheet[cell_ref].v == strs[index]) {
+														bEqual = true 
+													}
+													
+												}
+												if (bEqual != true ) {
+													document.getElementById(logID).innerHTML += "表" + arraySheetNames[i] + "单元格" + cell_ref + "所填:"+ worksheet[cell_ref].v +",不含于:" + projectID +  '\n';
+												}
+
+											} else {
+												if (worksheet[cell_ref].v != projectID) {
+													document.getElementById(logID).innerHTML += "表" + arraySheetNames[i] + "单元格" + cell_ref + "所填:"+ worksheet[cell_ref].v +",不等于:" + projectID +  '\n';
+												 };												
+											}
+
 											if (eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") != true){
 											if (eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") != true){
 												document.getElementById(logID).innerHTML += "表" + arraySheetNames[i] + "单元格" + cell_ref + eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") + '\n';
 												document.getElementById(logID).innerHTML += "表" + arraySheetNames[i] + "单元格" + cell_ref + eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") + '\n';
-											 }else if (worksheet[cell_ref].v != projectID) {
-												document.getElementById(logID).innerHTML += "表" + arraySheetNames[i] + "单元格" + cell_ref + "所填:"+ worksheet[cell_ref].v +",不等于所选:" + projectID +  '\n';
-											 };
+											 }
 
 
 										}else{
 										}else{
 											if (eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") != true ){				  
 											if (eval(arrayFunNames[i][index]+"('"+worksheet[cell_ref].v+"')") != true ){				  
@@ -896,15 +940,7 @@ function makeBalanceJSONstring(workbook){
 	};//generate balance data to json string from workbook
 	};//generate balance data to json string from workbook
 
 
 ///////////////////under this line start for invoice xlsx file //////////////////////////////////
 ///////////////////under this line start for invoice xlsx file //////////////////////////////////
-function 项目号(str) {	
-	if (str.length != 10){
-		return "所填:"+ str +",不是10字符!";
-	}else if(str.substr(0,1)!="U" || !myIsNaN(str.substr(1,4)) || str.substr(5,1)!="P" || !myIsNaN(str.substr(6,4)) ){
-		return "所填:"+ str +",格式有误!";
-	}else{
-		return true;
-	};	
-};
+
 
 
 			   	              // 检验 开票 excel文件
 			   	              // 检验 开票 excel文件
 								 function checkInvoiceFile(workbook,logID,userID) {                 
 								 function checkInvoiceFile(workbook,logID,userID) {                 

BIN
日报模板-test.xlsx