Browse Source

代码提交

user5 1 year ago
parent
commit
f1f6a43ee1
18 changed files with 303 additions and 12 deletions
  1. 0 1
      src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java
  2. 8 8
      src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java
  3. 10 0
      src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java
  4. 12 0
      src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml
  5. 7 3
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp
  6. 25 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp
  7. 24 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp
  8. 1 0
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp
  9. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp
  10. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp
  11. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp
  12. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp
  13. 7 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp
  14. 25 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp
  15. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp
  16. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp
  17. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp
  18. 23 0
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

+ 0 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageElectronicSealController.java

@@ -143,7 +143,6 @@ public class RuralProjectMessageElectronicSealController extends BaseController
         model.addAttribute("userList", auditUserList);
         //添加查询类型list
         projectRecords.setTypeList(typeList);
-        projectRecords.setSubmitMoney("1");
         Page<RuralProjectRecords> page = ruralProjectMessageAllService.findSignaturePage(new Page<RuralProjectRecords>(request, response), projectRecords);
         model.addAttribute("page", page);
         //无合同状态下,获取委托方的名称

+ 8 - 8
src/main/java/com/jeeplus/modules/statement/service/StatementCompanyComprehensiveService.java

@@ -114,7 +114,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         }
         //存放到对应报表的list集合,方便页面集合展示
         StatementCompanyComprehensiveInfo xminfo = new StatementCompanyComprehensiveInfo();
-        xminfo.setOfficeName("当"+nyr+"合计");
+        /*xminfo.setOfficeName("当"+nyr+"合计");
         xminfo.setField1(xmnum1);
         xminfo.setField2(xmnum2);
         xminfo.setField3(xmnum3);
@@ -131,7 +131,7 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         xminfo.setField14(xmnum14);
         xminfo.setField15(xmnum15);
         xminfo.setField16(xmnum16);
-        reportFormList1.add(xminfo);
+        reportFormList1.add(xminfo);*/
 
         //公司级:开票报表
         //类型(1:项目;2:开票;3:报销;4:合同)
@@ -151,12 +151,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         }
         //存放到对应报表的list集合,方便页面集合展示
         StatementCompanyComprehensiveInfo kpinfo = new StatementCompanyComprehensiveInfo();
-        kpinfo.setOfficeName("当"+nyr+"合计");
+        /*kpinfo.setOfficeName("当"+nyr+"合计");
         kpinfo.setField1(kpnum1);
         kpinfo.setField2(kpnum2);
         kpinfo.setField3(kpnum3);
         kpinfo.setField4(kpnum4);
-        reportFormList2.add(kpinfo);
+        reportFormList2.add(kpinfo);*/
 
         //公司级:报销报表
         //类型(1:项目;2:开票;3:报销;4:合同)
@@ -172,10 +172,10 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         }
         //存放到对应报表的list集合,方便页面集合展示
         StatementCompanyComprehensiveInfo bxinfo = new StatementCompanyComprehensiveInfo();
-        bxinfo.setOfficeName("当"+nyr+"合计");
+        /*bxinfo.setOfficeName("当"+nyr+"合计");
         bxinfo.setField1(bxnum1);
         bxinfo.setField2(bxnum2);
-        reportFormList3.add(bxinfo);
+        reportFormList3.add(bxinfo);*/
 
         //公司级:合同报表
         //类型(1:项目;2:开票;3:报销;4:合同)
@@ -195,12 +195,12 @@ public class StatementCompanyComprehensiveService extends CrudService<StatementC
         }
         //存放到对应报表的list集合,方便页面集合展示
         StatementCompanyComprehensiveInfo htinfo = new StatementCompanyComprehensiveInfo();
-        htinfo.setOfficeName("当"+nyr+"合计");
+        /*htinfo.setOfficeName("当"+nyr+"合计");
         htinfo.setField1(htnum1);
         htinfo.setField2(htnum2);
         htinfo.setField3(htnum3);
         htinfo.setField4(htnum4);
-        reportFormList4.add(htinfo);
+        reportFormList4.add(htinfo);*/
 
         //公司级:项目报表总览 年度级
         //type:类型(1:项目;2:开票;3:报销;4:合同)

+ 10 - 0
src/main/java/com/jeeplus/modules/workreimbursement/web/WorkReimbursementController.java

@@ -425,6 +425,16 @@ public class WorkReimbursementController extends BaseController {
 			workReimbursement.setCompanyId(UserUtils.getSelectCompany().getId());
 			workReimbursement.setCreateOffice(UserUtils.getSelectOffice().getId());
 			String str = "报销类型未选择";
+
+			Date auditDate= new Date("2024-01-20 00:00:00");
+			Date nowDate = new Date();
+			//判定当前数据已经在数据库存在并且发起时间是在特定日期之后,并且部门是工程四部
+			User loginUser = UserUtils.getUser();
+			if(StringUtils.isNotBlank(workReimbursement.getId() && workReimbursement.getCreateDate()>auditDate)){
+
+			}
+
+
 			if("0".equals(workReimbursement.getReimbursementType())){
 				str = workReimbursementService.save(workReimbursement, variables,processInstanceId);
 			}else if("1".equals(workReimbursement.getReimbursementType())){

+ 12 - 0
src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectMessageAllDao.xml

@@ -490,6 +490,7 @@ END) as projectScale*/
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN sys_user su on w1.user_id = su.id
+		LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
@@ -548,6 +549,9 @@ END) as projectScale*/
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
 				AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
 			</if>
+			<if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
+				AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
+			</if>
 			<if test="projectStatus !=null">
 				AND a.status = #{projectStatus}
 			</if>
@@ -957,6 +961,7 @@ END) as projectScale*/
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN sys_user su on w1.user_id = su.id
+		LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
@@ -1015,6 +1020,9 @@ END) as projectScale*/
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
 				AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
 			</if>
+			<if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
+				AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
+			</if>
 			<if test="projectStatus !=null">
 				AND a.status = #{projectStatus}
 			</if>
@@ -1360,6 +1368,7 @@ END) as projectScale*/
 		LEFT JOIN sys_user sua on a.create_by = sua.id
 		LEFT JOIN work_project_user w1 on a.id = w1.project_id
 		LEFT JOIN sys_user su on w1.user_id = su.id
+		LEFT JOIN sys_user suMaster on a.project_master_id = suMaster.id
 		LEFT JOIN work_contract_info wci on a.contract_id = wci.id
 		LEFT JOIN work_client_info wct on wci.client_id = wct.id
 		LEFT JOIN sys_office o ON o.id = a.office_id
@@ -1418,6 +1427,9 @@ END) as projectScale*/
 			<if test="(leaderNameStr != null and leaderNameStr != '') or (leaderId != null and leaderId != '')">
 				AND ((w1.user_id = #{leaderId}) or su.name like concat('%',#{leaderNameStr},'%')) AND w1.is_master = '1' AND w1.del_flag='0'
 			</if>
+			<if test="(projectMasterName != null and projectMasterName != '') or (projectMasterId != null and projectMasterId != '')">
+				AND ((a.project_master_id = #{projectMasterId}) or suMaster.name like concat('%',#{projectMasterName},'%')) AND suMaster.del_flag='0'
+			</if>
 			<if test="projectStatus !=null">
 				AND a.status = #{projectStatus}
 			</if>

+ 7 - 3
src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -151,9 +151,13 @@
 
                     var ziXunBDE = $("#ZiXunBDE").val();
                     var ShenDingJia = $("#ShenDingJia").val();
-                    if(ziXunBDE != ShenDingJia){
-                        parent.layer.msg("咨询标的额和审定价不同,请调整!", {icon: 5});
-                        return ;
+                    var identification = '${identification}'
+                    console.log(identification)
+                    if(identification && "projectReported" === identification){
+                        if(ziXunBDE != ShenDingJia){
+                            parent.layer.msg("咨询标的额和审定价不同,请调整!", {icon: 5});
+                            return ;
+                        }
                     }
                     var projectType = $("#ProjectType").val();
                     if(projectType == 19){

+ 25 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportForm.jsp

@@ -57,6 +57,31 @@
 
 						var leng = $("#file_attachment tr").length;
 						var leng1 = $("#reportedConsultantList tr").length;
+						var trArr = [];
+
+						// 获取所有咨询员信息行(<tr>元素)
+						var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+						// 遍历每一行
+						consultantRows.forEach(function(row) {
+							// 获取当前行中第三个<td>元素
+							var thirdTd = row.querySelector('td:nth-child(3)');
+							// 获取第三个<td>中的<input>元素
+							var inputElement = thirdTd.querySelector('input');
+							// 获取<input>元素的值
+							var inputValue = inputElement.value;
+							if(inputValue){
+								trArr.push(inputValue);
+							}
+						});
+						// 使用 Set 进行数组去重
+						let uniqueArr = [...new Set(trArr)];
+
+						if(trArr.length != uniqueArr.length){
+							parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+							return false;
+						}
+
+
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						var projectStartDate = new Date('${projectStartDate}');

+ 24 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp

@@ -56,6 +56,30 @@
 				var projectId = '${projectId}';
 				var leng = $("#file_attachment tr").length;
 				var leng1 = $("#reportedConsultantList tr").length;
+
+				var trArr = [];
+
+				// 获取所有咨询员信息行(<tr>元素)
+				var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+				// 遍历每一行
+				consultantRows.forEach(function(row) {
+					// 获取当前行中第三个<td>元素
+					var thirdTd = row.querySelector('td:nth-child(3)');
+					// 获取第三个<td>中的<input>元素
+					var inputElement = thirdTd.querySelector('input');
+					// 获取<input>元素的值
+					var inputValue = inputElement.value;
+					if(inputValue){
+						trArr.push(inputValue);
+					}
+				});
+				// 使用 Set 进行数组去重
+				let uniqueArr = [...new Set(trArr)];
+
+				if(trArr.length != uniqueArr.length){
+					parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+					return false;
+				}
 				var boolFlag = true;
 				var startDate = new Date($("#startDate").val());
 				var endingDate = new Date($("#endingDate").val());

+ 1 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -39,6 +39,7 @@
 						var projectId = '${projectRecords.id}';
 						var leng = $("#file_attachment tr").length;
 						var leng1 = $("#reportedConsultantList tr").length;
+
 						var boolFlag = true;
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp

@@ -49,6 +49,29 @@
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/holdSaveRecord");
 					}else{
 						var leng1 = $("#reportedConsultantList tr").length;
+						var trArr = [];
+
+						// 获取所有咨询员信息行(<tr>元素)
+						var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+						// 遍历每一行
+						consultantRows.forEach(function(row) {
+							// 获取当前行中第三个<td>元素
+							var thirdTd = row.querySelector('td:nth-child(3)');
+							// 获取第三个<td>中的<input>元素
+							var inputElement = thirdTd.querySelector('input');
+							// 获取<input>元素的值
+							var inputValue = inputElement.value;
+							if(inputValue){
+								trArr.push(inputValue);
+							}
+						});
+						// 使用 Set 进行数组去重
+						let uniqueArr = [...new Set(trArr)];
+
+						if(trArr.length != uniqueArr.length){
+							parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+							return false;
+						}
 						if (leng1<=1){
 							top.layer.msg("请添加咨询员信息!", {icon: 0});
 							return false;

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp

@@ -49,6 +49,29 @@
 						$("#inputForm").attr("action","${ctx}/ruralProject/ruralCostProjectMessageNew/holdSaveRecord");
 					}else{
 						var leng1 = $("#reportedConsultantList tr").length;
+						var trArr = [];
+
+						// 获取所有咨询员信息行(<tr>元素)
+						var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+						// 遍历每一行
+						consultantRows.forEach(function(row) {
+							// 获取当前行中第三个<td>元素
+							var thirdTd = row.querySelector('td:nth-child(3)');
+							// 获取第三个<td>中的<input>元素
+							var inputElement = thirdTd.querySelector('input');
+							// 获取<input>元素的值
+							var inputValue = inputElement.value;
+							if(inputValue){
+								trArr.push(inputValue);
+							}
+						});
+						// 使用 Set 进行数组去重
+						let uniqueArr = [...new Set(trArr)];
+
+						if(trArr.length != uniqueArr.length){
+							parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+							return false;
+						}
 						if (leng1<=1){
 							top.layer.msg("请添加咨询员信息!", {icon: 0});
 							return false;

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp

@@ -28,6 +28,29 @@
             if(validateForm.form()){
 				var projectId = '${project.id}';
 				var leng1 = $("#reportedConsultantList tr").length;
+				var trArr = [];
+
+				// 获取所有咨询员信息行(<tr>元素)
+				var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+				// 遍历每一行
+				consultantRows.forEach(function(row) {
+					// 获取当前行中第三个<td>元素
+					var thirdTd = row.querySelector('td:nth-child(3)');
+					// 获取第三个<td>中的<input>元素
+					var inputElement = thirdTd.querySelector('input');
+					// 获取<input>元素的值
+					var inputValue = inputElement.value;
+					if(inputValue){
+						trArr.push(inputValue);
+					}
+				});
+				// 使用 Set 进行数组去重
+				let uniqueArr = [...new Set(trArr)];
+
+				if(trArr.length != uniqueArr.length){
+					parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+					return false;
+				}
 				if (leng1<=1){
 					top.layer.msg("请添加咨询员信息!", {icon: 0});
 					return false;

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp

@@ -28,6 +28,29 @@
             if(validateForm.form()){
 				var projectId = '${project.id}';
 				var leng1 = $("#reportedConsultantList tr").length;
+				var trArr = [];
+
+				// 获取所有咨询员信息行(<tr>元素)
+				var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+				// 遍历每一行
+				consultantRows.forEach(function(row) {
+					// 获取当前行中第三个<td>元素
+					var thirdTd = row.querySelector('td:nth-child(3)');
+					// 获取第三个<td>中的<input>元素
+					var inputElement = thirdTd.querySelector('input');
+					// 获取<input>元素的值
+					var inputValue = inputElement.value;
+					if(inputValue){
+						trArr.push(inputValue);
+					}
+				});
+				// 使用 Set 进行数组去重
+				let uniqueArr = [...new Set(trArr)];
+
+				if(trArr.length != uniqueArr.length){
+					parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+					return false;
+				}
 				if (leng1<=1){
 					top.layer.msg("请添加咨询员信息!", {icon: 0});
 					return false;

+ 7 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllList.jsp

@@ -823,6 +823,13 @@
 																	 title="项目责任人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
 						</div>
+						<div class="layui-item query athird ">
+							<label class="layui-form-label">项目负责人:</label>
+							<div class="layui-input-block with-icon">
+								<sys:inquireselectUserNotReadolnyTow id="projectMaster" name="projectMasterId" value="${ruralProjectRecords.projectMasterId}" labelName="projectMasterName" labelValue="${ruralProjectRecords.projectMasterName}" cssStyle="background-color: #fff"
+																	 title="项目负责人" url="/sys/office/treeDataAll?type=3" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+							</div>
+						</div>
 						<div class="layui-item query athird">
 							<label class="layui-form-label">部门:</label>
 							<div class="layui-input-block with-icon">

+ 25 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp

@@ -57,6 +57,31 @@
 						}
 						var leng = $("#file_attachment tr").length;
 						var leng1 = $("#reportedConsultantList tr").length;
+						var trArr = [];
+
+						// 获取所有咨询员信息行(<tr>元素)
+						var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+						// 遍历每一行
+						consultantRows.forEach(function(row) {
+							// 获取当前行中第三个<td>元素
+							var thirdTd = row.querySelector('td:nth-child(3)');
+							// 获取第三个<td>中的<input>元素
+							var inputElement = thirdTd.querySelector('input');
+							// 获取<input>元素的值
+							var inputValue = inputElement.value;
+							if(inputValue){
+								trArr.push(inputValue);
+							}
+						});
+						// 使用 Set 进行数组去重
+						let uniqueArr = [...new Set(trArr)];
+
+						if(trArr.length != uniqueArr.length){
+							parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+							return false;
+						}
+
+
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						var projectStartDate = new Date('${projectStartDate}');

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp

@@ -45,6 +45,29 @@
                 }
                 var projectId = '${projectcontentinfo.project.id}';
                 var leng1 = $("#reportedConsultantList tr").length;
+                var trArr = [];
+
+                // 获取所有咨询员信息行(<tr>元素)
+                var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+                // 遍历每一行
+                consultantRows.forEach(function(row) {
+                    // 获取当前行中第三个<td>元素
+                    var thirdTd = row.querySelector('td:nth-child(3)');
+                    // 获取第三个<td>中的<input>元素
+                    var inputElement = thirdTd.querySelector('input');
+                    // 获取<input>元素的值
+                    var inputValue = inputElement.value;
+                    if(inputValue){
+                        trArr.push(inputValue);
+                    }
+                });
+                // 使用 Set 进行数组去重
+                let uniqueArr = [...new Set(trArr)];
+
+                if(trArr.length != uniqueArr.length){
+                    parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+                    return false;
+                }
                 var leng = $("#file_attachment tr").length;
                 var boolFlag = true;
                 var startDate = new Date($("#startDate").val());

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp

@@ -45,6 +45,29 @@
                 }
                 var projectId = '${projectcontentinfo.project.id}';
                 var leng1 = $("#reportedConsultantList tr").length;
+                var trArr = [];
+
+                // 获取所有咨询员信息行(<tr>元素)
+                var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+                // 遍历每一行
+                consultantRows.forEach(function(row) {
+                    // 获取当前行中第三个<td>元素
+                    var thirdTd = row.querySelector('td:nth-child(3)');
+                    // 获取第三个<td>中的<input>元素
+                    var inputElement = thirdTd.querySelector('input');
+                    // 获取<input>元素的值
+                    var inputValue = inputElement.value;
+                    if(inputValue){
+                        trArr.push(inputValue);
+                    }
+                });
+                // 使用 Set 进行数组去重
+                let uniqueArr = [...new Set(trArr)];
+
+                if(trArr.length != uniqueArr.length){
+                    parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+                    return false;
+                }
                 var leng = $("#file_attachment tr").length;
                 var boolFlag = true;
                 var startDate = new Date($("#startDate").val());

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportForm.jsp

@@ -27,6 +27,29 @@
 					if(obj == 1){
 						var leng = $("#file_attachment tr").length;
 						var leng1 = $("#reportedConsultantList tr").length;
+						var trArr = [];
+
+						// 获取所有咨询员信息行(<tr>元素)
+						var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+						// 遍历每一行
+						consultantRows.forEach(function(row) {
+							// 获取当前行中第三个<td>元素
+							var thirdTd = row.querySelector('td:nth-child(3)');
+							// 获取第三个<td>中的<input>元素
+							var inputElement = thirdTd.querySelector('input');
+							// 获取<input>元素的值
+							var inputValue = inputElement.value;
+							if(inputValue){
+								trArr.push(inputValue);
+							}
+						});
+						// 使用 Set 进行数组去重
+						let uniqueArr = [...new Set(trArr)];
+
+						if(trArr.length != uniqueArr.length){
+							parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+							return false;
+						}
 						var startDate = new Date($("#startDate").val());
 						var endingDate = new Date($("#endingDate").val());
 						var projectStartDate = new Date('${projectStartDate}');

+ 23 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

@@ -28,6 +28,29 @@
             if(validateForm.form()){
                 var projectId = '${projectcontentinfo.project.id}';
                 var leng1 = $("#reportedConsultantList tr").length;
+                var trArr = [];
+
+                // 获取所有咨询员信息行(<tr>元素)
+                var consultantRows = document.querySelectorAll('#reportedConsultantList tr');
+                // 遍历每一行
+                consultantRows.forEach(function(row) {
+                    // 获取当前行中第三个<td>元素
+                    var thirdTd = row.querySelector('td:nth-child(3)');
+                    // 获取第三个<td>中的<input>元素
+                    var inputElement = thirdTd.querySelector('input');
+                    // 获取<input>元素的值
+                    var inputValue = inputElement.value;
+                    if(inputValue){
+                        trArr.push(inputValue);
+                    }
+                });
+                // 使用 Set 进行数组去重
+                let uniqueArr = [...new Set(trArr)];
+
+                if(trArr.length != uniqueArr.length){
+                    parent.layer.msg("项目组成员信息不可相同!", {icon: 5});
+                    return false;
+                }
                 var leng = $("#file_attachment tr").length;
                 var boolFlag = true;
                 var startDate = new Date($("#startDate").val());