发票调整，电子发票报销调整

src/main/java/com/jeeplus/modules/workreimbursement/service/WorkReimbursementNewService.java

@@ -1379,7 +1379,7 @@ public class WorkReimbursementNewService extends CrudService<WorkReimbursementDa
                         workActivityProcess.setIsApproval("2");
                     }
                     break;
-                } else if ("fpglys".equals(taskDefKey) && count.contains("3")) {
+                } else if (("fpglys".equals(taskDefKey) || "dzfpbxshybxsd".equals(taskDefKey)) && count.contains("3")) {
                     taskCount = "3";
                     exp = "pass";
                     if ("yes".equals(workReimbursement.getAct().getFlag())) {

src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementNewController.java

@@ -229,14 +229,14 @@ public class WorkReimbursementNewController extends BaseController {
 				if("0".equals(workReimbursement.getReimbursementType())){
 					users = UserUtils.getByRoleActivityEnname("zjbfzribvf",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 				}else if ("1".equals(workReimbursement.getReimbursementType())){
-					users = UserUtils.getByRoleActivityEnname("cwygevod",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
+					users = UserUtils.getByRoleActivityEnname("dzfpbxshybxsd",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
 				}
 			}else  if ("gsld".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 				if (users==null )
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);
 				//users = UserUtils.getByRoleActivityEnname("zjl",3,workReimbursement.getOfficeId(),"8",workReimbursement.getCreateBy());
-			}else  if ("fpglys".equals(taskDefKey)){
+			}else  if ("fpglys".equals(taskDefKey) || "dzfpbxshybxsd".equals(taskDefKey)){
 				users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),3);
 				if (users==null )
 					users = UserUtils.getByProssType(workReimbursement.getProcessInstanceId(),1);

src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementElectronicInvoiceReimbursementModifyApply.jsp

@@ -143,9 +143,8 @@
             var reimbursementType=$('input:radio[name="reimbursementType"]:checked').val();
 
             if(reimbursementType == '1'){
-                var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
-                var files = $("#attachment_file_InvoiceReimbursement")[0].files;
-                if(files.length == 0){
+                var leng = $("#file_attachment_InvoiceReimbursement tr").length;
+                if(leng.length == 0){
                     parent.layer.msg("请上传电子发票xml文件!", {icon: 5});
                     flags= false;
                 }

src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewFormAdd.jsp

@@ -143,9 +143,8 @@
                 var reimbursementType=$('input:radio[name="reimbursementType"]:checked').val();
 
                 if(reimbursementType == '1'){
-                    var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
-                    var files = $("#attachment_file_InvoiceReimbursement")[0].files;
-                    if(files.length == 0){
+                    var leng = $("#file_attachment_InvoiceReimbursement tr").length;
+                    if(leng.length == 0){
                         parent.layer.msg("请上传电子发票xml文件!", {icon: 5});
                         flags= false;
                     }

src/main/webapp/webpage/modules/workreimbursement/new/workReimbursementNewModifyApply.jsp

@@ -148,9 +148,8 @@
             var reimbursementType=$('input:radio[name="reimbursementType"]:checked').val();
 
             if(reimbursementType == '1'){
-                var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
-                var files = $("#attachment_file_InvoiceReimbursement")[0].files;
-                if(files.length == 0){
+                var leng = $("#file_attachment_InvoiceReimbursement tr").length;
+                if(leng.length == 0){
                     parent.layer.msg("请上传电子发票xml文件!", {icon: 5});
                     flags= false;
                 }

src/main/webapp/webpage/modules/workreimbursement/workReimbursementFormAdd.jsp

@@ -181,9 +181,8 @@
                 var reimbursementType=$('input:radio[name="reimbursementType"]:checked').val();
 
                 if(reimbursementType == '1'){
-                    var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
-                    var files = $("#attachment_file_InvoiceReimbursement")[0].files;
-                    if(files.length == 0){
+                    var leng = $("#file_attachment_InvoiceReimbursement tr").length;
+                    if(leng.length == 0){
                         parent.layer.msg("请上传电子发票xml文件!", {icon: 5});
                         flags= false;
                     }

src/main/webapp/webpage/modules/workreimbursement/workReimbursementModifyApply.jsp

@@ -143,9 +143,8 @@
             var reimbursementType=$('input:radio[name="reimbursementType"]:checked').val();
 
             if(reimbursementType == '1'){
-                var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
-                var files = $("#attachment_file_InvoiceReimbursement")[0].files;
-                if(files.length == 0){
+                var leng = $("#file_attachment_InvoiceReimbursement tr").length;
+                if(leng.length == 0){
                     parent.layer.msg("请上传电子发票xml文件!", {icon: 5});
                     flags= false;
                 }