Jelajahi Sumber

意见审核功能部分修改

user5 3 tahun lalu
induk
melakukan
2895825f5c
22 mengubah file dengan 91 tambahan dan 177 penghapusan
  1. 8 8
      src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java
  2. 15 3
      src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml
  3. 2 2
      src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp
  4. 0 26
      src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp
  5. 12 4
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp
  6. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/new/reportModify.jsp
  7. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/projectReportRecordUrgentModify.jsp
  8. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModify.jsp
  9. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/record/cost/recordTwo/projectReportRecordUrgentModifyApply.jsp
  10. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp
  11. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp
  12. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp
  13. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementForm.jsp
  14. 3 3
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp
  15. 5 5
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageModify.jsp
  16. 1 1
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp
  17. 1 26
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp
  18. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModify.jsp
  19. 0 30
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp
  20. 1 26
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp
  21. 3 3
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp
  22. 4 4
      src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageModify.jsp

+ 8 - 8
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -5886,7 +5886,7 @@ public class WorkProjectNotifyController extends BaseController {
 						}
 						if ("1".equals(ruralProjectRecords.getProjectType())){
 							model.addAttribute("identifications","consultReferenceRemarks");
-							model.addAttribute("identification", "consultProjectPaperFiling");
+							model.addAttribute("identification", "consultProjectcontentinfoFile");
 						}
 //						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
@@ -6449,11 +6449,11 @@ public class WorkProjectNotifyController extends BaseController {
 						projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
 						projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 						projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
-						if ("1".equals(ruralProjectRecords.getProjectType())){
+						if ("2".equals(ruralProjectRecords.getProjectType())){
 							model.addAttribute("identification", "projectcontentinfoFile");
 						}
-						if ("2".equals(ruralProjectRecords.getProjectType())){
-							model.addAttribute("identification", "consultProjectPaperFiling");
+						if ("1".equals(ruralProjectRecords.getProjectType())){
+							model.addAttribute("identification", "consultProjectcontentinfoFile");
 						}
 //						model.addAttribute("identification","projectcontentinfoFile");
 						model.addAttribute("identificationName","归档审核意见");
@@ -8826,10 +8826,10 @@ public class WorkProjectNotifyController extends BaseController {
 				projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 				projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 				if ("1".equals(ruralProjectRecords.getProjectType())){
-					model.addAttribute("identification", "projectcontentinfoFile");
+					model.addAttribute("identification", "caseBase");
 				}
 				if ("2".equals(ruralProjectRecords.getProjectType())){
-					model.addAttribute("identification", "consultProjectPaperFiling");
+					model.addAttribute("identification", "caseBase");
 				}
 //				model.addAttribute("identification", "projectcontentinfoFile");
 				model.addAttribute("identificationName", "归档审核意见");
@@ -8844,10 +8844,10 @@ public class WorkProjectNotifyController extends BaseController {
 				projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
 				projectReportRecord.setFileOtherList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileOtherList()));
 				if ("1".equals(ruralProjectRecords.getProjectType())){
-					model.addAttribute("identification", "projectcontentinfoFile");
+					model.addAttribute("identification", "caseBase");
 				}
 				if ("2".equals(ruralProjectRecords.getProjectType())){
-					model.addAttribute("identification", "consultProjectPaperFiling");
+					model.addAttribute("identification", "caseBase");
 				}
 //				model.addAttribute("identification", "projectcontentinfoFile");
 				model.addAttribute("identificationName", "归档审核意见");

+ 15 - 3
src/main/resources/mappings/modules/workprojectnotify/WorkProjectNotifyDao.xml

@@ -20,7 +20,7 @@
 		a.status AS "status",
 		a.kind AS "kind",
 		a.officeId AS "officeId",
-		count(*) AS "countNum"
+		count(a.content) AS "countNum"
 	</sql>
 
 
@@ -144,7 +144,12 @@
 			</choose>
 		</where>
 
-		GROUP BY a.title
+		<if test="remarks !=null and remarks != '' and remarks == '待审批'">
+			GROUP BY a.content
+		</if>
+		<if test="remarks !=null and remarks != '' and remarks == '待通知'">
+			GROUP BY a.title
+		</if>
 		ORDER BY a.update_date DESC
 		<choose>
 			<!--<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -163,7 +168,13 @@
 	</select>
 
 	<select id="queryCount" resultType="Integer">
-		SELECT count(distinct a.title)
+		SELECT
+		<if test="remarks !=null and remarks != '' and remarks == '待审批'">
+			count(distinct a.content)
+		</if>
+		<if test="remarks !=null and remarks != '' and remarks == '待通知'">
+			count(distinct a.title)
+		</if>
 		FROM work_project_notify a
 		LEFT JOIN sys_user u ON u.id = a.create_by
 		LEFT JOIN sys_user su ON su.id = a.create_by
@@ -525,6 +536,7 @@
 			group by process_instance_id)
 
 		</where>
+		group by a.content
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
 				ORDER BY ${page.orderBy}

+ 2 - 2
src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineView.jsp

@@ -1729,7 +1729,7 @@
 			}
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1737,7 +1737,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 0 - 26
src/main/webapp/webpage/modules/bzshbExamin/bzshbExamineform.jsp

@@ -1786,32 +1786,6 @@
 			}
 		}
 	}
-	function openInfo(id,value) {
-		console.log(id);
-		top.layer.open({
-			type: 2,
-			area: ['80%','65%'],
-			title:"意见",
-			name:'friend',
-			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
-			btn: ['确定', '关闭'],
-			yes: function(index, layero){
-				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
-				var item = iframeWin.getSelectedItem();
-				console.log(item);
-				if(item == "-1"){
-					return;
-				}
-				var items = item.split('_item_');
-				console.log(items)
-				$("#"+id+"_auditOpinion").val(items[1]);
-				top.layer.close(index);//关闭对话框。
-			},
-			cancel: function(index){
-			}
-		});
-	}
 	function readOpenInfo(value) {
 		layer.open({
 			title: '内容',

+ 12 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/adminReportEditForm.jsp

@@ -1752,7 +1752,15 @@
 											<input id="reportedConsultantList${status.index+1}_wordnr"  placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control "/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control "/>
+											<c:choose>
+												<c:when test="${info.role == '咨询员'}">
+													<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderConsultant')" class="form-control "/>
+												</c:when>
+												<c:otherwise>
+													<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeaderPrincipal')" class="form-control "/>
+												</c:otherwise>
+											</c:choose>
+
 										</td>
 										<td class="reportedConsultantList${status.index+1}_caozuo  text-center op-td"  width="10">
 
@@ -1791,7 +1799,7 @@
 											<input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value)" class="form-control required"/>
+											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
 										</td>
 
 										<td class="text-center op-td" width="10">
@@ -2813,7 +2821,7 @@
 			}
 		});
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -2821,7 +2829,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -1114,7 +1114,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1152,7 +1152,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -2124,7 +2124,7 @@
 		}
 	}
 
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -2132,7 +2132,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -578,7 +578,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -616,7 +616,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1202,7 +1202,7 @@
 			addRow(id, workClientBankRowIdx, workClientBankTpl, "");
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1210,7 +1210,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -578,7 +578,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -616,7 +616,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1231,7 +1231,7 @@
 			addRow(id, workClientBankRowIdx, workClientBankTpl, "");
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1239,7 +1239,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -552,7 +552,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -590,7 +590,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1131,7 +1131,7 @@
 			addRow(id, workClientBankRowIdx, workClientBankTpl, "");
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1139,7 +1139,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -567,7 +567,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -605,7 +605,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1103,7 +1103,7 @@
 			addRow(id, workClientBankRowIdx, workClientBankTpl, "");
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1111,7 +1111,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/adminReportEditFormAlls.jsp

@@ -1737,7 +1737,7 @@
 											<input id="reportedConsultantList${status.index+1}_wordnr"  placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control"/>
+											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'')" class="form-control"/>
 										</td>
 										<td class="reportedConsultantList${status.index+1}_caozuo  text-center op-td"  width="10">
 
@@ -1776,7 +1776,7 @@
 											<input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value)" class="form-control required"/>
+											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value,'')" class="form-control required"/>
 										</td>
 
 										<td class="text-center op-td" width="10">
@@ -2798,7 +2798,7 @@
 			}
 		});
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -2806,7 +2806,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 4 - 4
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/adminReportEditForms.jsp

@@ -1733,7 +1733,7 @@
 											<input id="reportedConsultantList${status.index+1}_wordnr"  placeholder="" name="reportedConsultantList[${status.index+1}].wordnr" value="${info.wordnr}" class="form-control"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control"/>
+											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder=""  name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" title="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'')" class="form-control"/>
 										</td>
 										<td class="reportedConsultantList${status.index+1}_caozuo  text-center op-td"  width="10">
 
@@ -1772,7 +1772,7 @@
 											<input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
 										</td>
 										<td>
-											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value)" class="form-control"/>
+											<input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo('reportedConsultantList{{idx}}',this.value,'')" class="form-control"/>
 										</td>
 
 										<td class="text-center op-td" width="10">
@@ -2794,7 +2794,7 @@
 			}
 		});
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -2802,7 +2802,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -645,7 +645,7 @@
 				}
 			});
 		}
-		function openInfo(id,value) {
+		function openInfo(id,value,identification) {
         	console.log(id);
 			top.layer.open({
 				type: 2,
@@ -653,7 +653,7 @@
 				title:"意见",
 				name:'friend',
 				skin:"two-btns",
-				content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+				content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 				btn: ['确定', '关闭'],
 				yes: function(index, layero){
 					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
@@ -1023,7 +1023,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1061,7 +1061,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control judgment"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">

+ 3 - 3
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/judgementReport/projectRecordsJudgementMessageAudit.jsp

@@ -1322,7 +1322,7 @@
 											<td>
 												<c:choose>
 													<c:when test="${consultantCount == status.index+1}">
-														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control"/>
+														<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'projectReportDataLeader')" class="form-control"/>
 													</c:when>
 													<c:otherwise>
 														<input id="reportedConsultantList${status.index+1}_auditOpinion" title="${info.auditOpinion}"  placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="readOpenInfo(this.value)" class="form-control"/>
@@ -2113,7 +2113,7 @@
 			}
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -2121,7 +2121,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -890,7 +890,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -928,7 +928,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -965,7 +965,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control judgment"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeader')" class="form-control judgment"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1791,7 +1791,7 @@
         }
     }
 
-    function openInfo(id,value) {
+    function openInfo(id,value,identification) {
         console.log(id);
         top.layer.open({
             type: 2,
@@ -1799,7 +1799,7 @@
             title:"意见",
             name:'friend',
             skin:"two-btns",
-            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
             btn: ['确定', '关闭'],
             yes: function(index, layero){
                 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 1 - 1
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAudit.jsp

@@ -1969,7 +1969,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?="+value+"&identification=${identifications}"),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+"&identification=${identifications}"),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 1 - 26
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageAuditTwo.jsp

@@ -1991,32 +1991,7 @@
 			}
 		}
 	}
-	function openInfo(id,value) {
-		console.log(id);
-		top.layer.open({
-			type: 2,
-			area: ['80%','65%'],
-			title:"意见",
-			name:'friend',
-			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
-			btn: ['确定', '关闭'],
-			yes: function(index, layero){
-				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
-				var item = iframeWin.getSelectedItem();
-				console.log(item);
-				if(item == "-1"){
-					return;
-				}
-				var items = item.split('_item_');
-				console.log(items)
-				$("#"+id+"_auditOpinion").val(items[1]);
-				top.layer.close(index);//关闭对话框。
-			},
-			cancel: function(index){
-			}
-		});
-	}
+
 	function openDeductInfo(value,id,obj) {
 		top.layer.open({
 			type: 2,

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

@@ -846,7 +846,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -884,7 +884,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1534,7 +1534,7 @@
         }
     }
 
-    function openInfo(id,value) {
+    function openInfo(id,value,identification) {
         console.log(id);
         top.layer.open({
             type: 2,
@@ -1542,7 +1542,7 @@
             title:"意见",
             name:'friend',
             skin:"two-btns",
-            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
             btn: ['确定', '关闭'],
             yes: function(index, layero){
                 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

+ 0 - 30
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/projectRecordsMessageModifyTwo.jsp

@@ -1124,36 +1124,6 @@
         });
     })
 </script>
-<script type="text/javascript">
-
-
-    function openInfo(id,value) {
-        console.log(id);
-        top.layer.open({
-            type: 2,
-            area: ['80%','65%'],
-            title:"意见",
-            name:'friend',
-            skin:"two-btns",
-            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
-            btn: ['确定', '关闭'],
-            yes: function(index, layero){
-                var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
-                var item = iframeWin.getSelectedItem();
-                console.log(item);
-                if(item == "-1"){
-                    return;
-                }
-                var items = item.split('_item_');
-                console.log(items)
-                $("#"+id.id+"_auditOpinion").val(items[1]);
-                top.layer.close(index);//关闭对话框。
-            },
-            cancel: function(index){
-            }
-        });
-    }
-</script>
 <script>
     $(document).ready(function() {
         $("#clearOpinon").click(function(){

+ 1 - 26
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/new/reportFormTwo.jsp

@@ -546,32 +546,7 @@
 				$(span).find("span").eq(0).attr("class","default_open")
 			});
 		}
-		function openInfo(id,value) {
-			console.log(id);
-			top.layer.open({
-				type: 2,
-				area: ['80%','65%'],
-				title:"意见",
-				name:'friend',
-				skin:"two-btns",
-				content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
-				btn: ['确定', '关闭'],
-				yes: function(index, layero){
-					var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();
-					var item = iframeWin.getSelectedItem();
-					console.log(item);
-					if(item == "-1"){
-						return;
-					}
-					var items = item.split('_item_');
-					console.log(items)
-					$("#"+id.id+"_auditOpinion").val(items[1]);
-					top.layer.close(index);//关闭对话框。
-				},
-				cancel: function(index){
-				}
-			});
-		}
+
 
 		function readOpenInfo(value) {
 			layer.open({

+ 3 - 3
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/projectRecordsMessageAudit.jsp

@@ -851,7 +851,7 @@
 								<td>
 									<c:choose>
 										<c:when test="${consultantCount == status.index+1}">
-											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value)" class="form-control judgment"/>
+											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" onclick="openInfo('reportedConsultantList${status.index+1}',this.value,'')" class="form-control judgment"/>
 										</c:when>
 										<c:otherwise>
 											<input id="reportedConsultantList${status.index+1}_auditOpinion" placeholder="请输入审核意见" readonly="true" name="reportedConsultantList[${status.index+1}].auditOpinion" value="${info.auditOpinion}" class="form-control judgment"/>
@@ -1561,7 +1561,7 @@
 			}
 		}
 	}
-	function openInfo(id,value) {
+	function openInfo(id,value,identification) {
 		console.log(id);
 		top.layer.open({
 			type: 2,
@@ -1569,7 +1569,7 @@
 			title:"意见",
 			name:'friend',
 			skin:"two-btns",
-			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+			content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value+ "&identification="+ identification),
 			btn: ['确定', '关闭'],
 			yes: function(index, layero){
 				var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();

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

@@ -816,7 +816,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderConsultant')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -854,7 +854,7 @@
                                         <input id="reportedConsultantList{{idx}}_wordnr" placeholder="请输入本人负责内容" name="reportedConsultantList[{{idx}}].wordnr" value="{{row.wordnr}}" class="form-control required"/>
                                     </td>
                                     <td>
-                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value)" class="form-control required"/>
+                                        <input id="reportedConsultantList{{idx}}_auditOpinion" placeholder="请输入审核意见" readonly="true" style="background-color: #FFFFFF;" name="reportedConsultantList[{{idx}}].auditOpinion" value="{{row.auditOpinion}}" onclick="openInfo(reportedConsultantList{{idx}},this.value,'projectReportDataLeaderPrincipal')" class="form-control required"/>
                                     </td>
 
                                     <td class="text-center op-td" width="10">
@@ -1310,7 +1310,7 @@
         }
     }
 
-    function openInfo(id,value) {
+    function openInfo(id,value,identification) {
         console.log(id);
         top.layer.open({
             type: 2,
@@ -1318,7 +1318,7 @@
             title:"意见",
             name:'friend',
             skin:"two-btns",
-            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value),
+            content: encodeURI("${ctx}/ruralProject/ruralCostProjectMessageNew/selectReproject?auditOpinion="+value + "&identification="+ identification),
             btn: ['确定', '关闭'],
             yes: function(index, layero){
                 var iframeWin = layero.find('iframe')[0].contentWindow; //得到iframe页的窗口对象,执行iframe页的方法:iframeWin.method();