Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportForm.jsp

@@ -906,10 +906,30 @@
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control re "/>
+						<div class="layui-item layui-col-sm6 lw7 with-textarea">
+							<div class="layui-input-block" style="margin-left:0px;position: relative">
+								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+								<input type="file" name="upload_files" style="display: none;">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm4 lw6 with-textarea">
+							<div class="layui-input-block" style="margin-left:10px;">
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;">
+									<form:select path="projectReportData.consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
+										<form:option value=""/>
+										<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+									</form:select>
+								</div>
+							</div>
+						</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control re "/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 15px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
@@ -921,7 +941,27 @@
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<div class="layui-item layui-col-sm6 lw7 with-textarea">
+							<div class="layui-input-block" style="margin-left:0px;position: relative">
+								<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+								<input type="file" name="upload_files" style="display: none;">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm4 lw6 with-textarea">
+							<div class="layui-input-block" style="margin-left:10px;">
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;">
+									<form:select path="projectReportData.principalRemarks" id="auditOpinion" lay-filter="fuzerenOpinion" lay-verify="fuzerenOpinion" class="form-control simple-select">
+										<form:option value=""/>
+										<form:options items="${fns:getMainDictListOnProjectAdvent('person_audit_opinion')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+									</form:select>
+								</div>
+							</div>
+						</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>--%>
 					</div>
 				</div>
 			</div>
@@ -1298,6 +1338,58 @@
 		</form:form>
 	</div>
 </div>
+<script>
+	$(document).ready(function() {
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#zixunOpinion").val("");
+		})
+		$("#clearOpinons").click(function(){
+			var s=$("input[name='shs']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='shs']").attr("checked",false)
+			}
+			$("#fuzerenOpinion").val("");
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(zixunOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('select(fuzerenOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinions)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
 <script type="text/javascript">
 	var workClientBankRowIdx = 0,
 			workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");

src/main/webapp/webpage/modules/ruralprojectrecords/cost/projectcontentinfo/reportModify.jsp

@@ -818,20 +818,60 @@
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<div class="layui-item layui-col-sm6 lw7 with-textarea">
+							<div class="layui-input-block" style="margin-left:0px;position: relative">
+								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+								<input type="file" name="upload_files" style="display: none;">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm4 lw6 with-textarea">
+							<div class="layui-input-block" style="margin-left:10px;">
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;">
+									<form:select path="projectReportData.consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
+										<form:option value=""/>
+										<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+									</form:select>
+								</div>
+							</div>
+						</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 15px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
-						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${ruralProjectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
+						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectReportData.principal.id}" labelName="projectReportData.principal.name" labelValue="${projectReportData.principal.name}"
 									cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=4" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line">项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<div class="layui-item layui-col-sm6 lw7 with-textarea">
+							<div class="layui-input-block" style="margin-left:0px;position: relative">
+								<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+								<input type="file" name="upload_files" style="display: none;">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm4 lw6 with-textarea">
+							<div class="layui-input-block" style="margin-left:10px;">
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;">
+									<form:select path="projectReportData.principalRemarks" id="auditOpinion" lay-filter="fuzerenOpinion" lay-verify="fuzerenOpinion" class="form-control simple-select">
+										<form:option value=""/>
+										<form:options items="${fns:getMainDictListOnProjectAdvent('person_audit_opinion')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+									</form:select>
+								</div>
+							</div>
+						</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>--%>
 					</div>
 				</div>
 			</div>
@@ -1218,6 +1258,58 @@
 	</div>
 </div>
 <script>
+	$(document).ready(function() {
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#zixunOpinion").val("");
+		})
+		$("#clearOpinons").click(function(){
+			var s=$("input[name='shs']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='shs']").attr("checked",false)
+			}
+			$("#fuzerenOpinion").val("");
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(zixunOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('select(fuzerenOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinions)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
+<script>
 	function openBill2(title,url,width,height,target,formId,tableId){
 		var rows = $(this).parent().prevAll().length + 1;
 		var frameIndex = parent.layer.getFrameIndex(window.name);

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

@@ -473,9 +473,29 @@
 						</div>
 					</div>
 					<div class="layui-item layui-col-sm12 lw7 with-textarea">
-						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
+						<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见11：</label>
 						<div class="layui-input-block">
-							<form:textarea path="projectReportData.technicistRemarks" id="technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>
+							<div class="layui-item layui-col-sm6 lw7 with-textarea">
+								<div class="layui-input-block" style="margin-left:0px;position: relative">
+									<form:textarea placeholder="请输入审批意见" path="projectReportData.technicistRemarks" id="technicistRemarks" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+									<input type="file" name="upload_files" style="display: none;">
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm4 lw6 with-textarea">
+								<div class="layui-input-block" style="margin-left:10px;">
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;">
+										<form:select path="projectReportData.technicistRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
+											<form:option value=""/>
+											<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+										</form:select>
+									</div>
+								</div>
+							</div>
+<%--							<form:textarea path="projectReportData.technicistRemarks" id="technicistRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control"/>--%>
 						</div>
 					</div>
 				</c:if>
@@ -791,6 +811,13 @@
 			}
 			$("#opinion").val("");
 		})
+		$("#clearOpinons").click(function(){
+			var s=$("input[name='shs']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='shs']").attr("checked",false)
+			}
+			$("#technicistRemarks").val("");
+		})
 		layui.use(['form', 'layer'], function () {
 			var form = layui.form;
 			//下拉框监听器
@@ -808,6 +835,21 @@
 					$("#opinion").val(opinion);
 				}
 			});
+			layui.form.on('select(zixunOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#technicistRemarks").val()+span+";"
+					$("#technicistRemarks").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinions)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#technicistRemarks").val()+span+";"
+					$("#technicistRemarks").val(opinion);
+				}
+			});
 		});
 	})
 		function openBill2(title,url,width,height,target,formId,tableId){

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

@@ -651,7 +651,27 @@
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <div class="layui-item layui-col-sm6 lw7 with-textarea">
+                            <div class="layui-input-block" style="margin-left:0px;position: relative">
+                                <form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+                                <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+                                <input type="file" name="upload_files" style="display: none;">
+                            </div>
+                        </div>
+                        <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                            <div class="layui-input-block" style="margin-left:10px;">
+                                <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                                <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                                <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                                <div style="padding: 5px 0px;">
+                                    <form:select path="projectReportData.consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
+                                        <form:option value=""/>
+                                        <form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                                    </form:select>
+                                </div>
+                            </div>
+                        </div>
+<%--                        <form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -664,7 +684,27 @@
                 <div class="layui-item layui-col-sm12 lw7 with-textarea">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
                     <div class="layui-input-block">
-                        <form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+                        <div class="layui-item layui-col-sm6 lw7 with-textarea">
+                        <div class="layui-input-block" style="margin-left:0px;position: relative">
+                            <form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+                            <a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+                            <input type="file" name="upload_files" style="display: none;">
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm4 lw6 with-textarea">
+                        <div class="layui-input-block" style="margin-left:10px;">
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+                            <div style="padding: 5px 0px;">
+                                <form:select path="projectReportData.principalRemarks" id="auditOpinion" lay-filter="fuzerenOpinion" lay-verify="fuzerenOpinion" class="form-control simple-select">
+                                    <form:option value=""/>
+                                    <form:options items="${fns:getMainDictListOnProjectAdvent('person_audit_opinion')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                                </form:select>
+                            </div>
+                        </div>
+                    </div>
+<%--                        <form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
                     </div>
                 </div>
             </div>
@@ -917,29 +957,29 @@
                 </div>
             </div>
 
-            <div class="form-group layui-row">
-                <div class="form-group-label"><h2>审批意见</h2></div>
-                <div class="layui-item layui-col-sm8 lw6 with-textarea">
-                    <div class="layui-input-block" style="margin-left:10px;position: relative">
-                        <form:textarea path="projectReportData.act.comment"  placeholder="请输入意见"  id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />
-                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
-                        <input type="file" name="upload_files" style="display: none;">
-                    </div>
-                </div>
-                <div class="layui-item layui-col-sm4 lw6 with-textarea">
-                    <div class="layui-input-block" style="margin-left:10px;">
-                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
-                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
-                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
-                        <div style="padding: 5px 0px;">
-                            <form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">
-                                <form:option value=""/>
-                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                            </form:select>
-                        </div>
-                    </div>
-                </div>
-            </div>
+<%--            <div class="form-group layui-row">--%>
+<%--                <div class="form-group-label"><h2>审批意见</h2></div>--%>
+<%--                <div class="layui-item layui-col-sm8 lw6 with-textarea">--%>
+<%--                    <div class="layui-input-block" style="margin-left:10px;position: relative">--%>
+<%--                        <form:textarea path="projectReportData.act.comment"  placeholder="请输入意见"  id="opinion" class="form-control" rows="4" cssStyle="height: 200px;" maxlength="127" />--%>
+<%--                        <a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>--%>
+<%--                        <input type="file" name="upload_files" style="display: none;">--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--                <div class="layui-item layui-col-sm4 lw6 with-textarea">--%>
+<%--                    <div class="layui-input-block" style="margin-left:10px;">--%>
+<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>--%>
+<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>--%>
+<%--                        <div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>--%>
+<%--                        <div style="padding: 5px 0px;">--%>
+<%--                            <form:select path="projectReportData.act.comment" id="auditOpinion" lay-filter="opinion" lay-verify="opinion" class="form-control simple-select">--%>
+<%--                                <form:option value=""/>--%>
+<%--                                <form:options items="${fns:getMainDictListOnProjectAdvent('audit_opinion_template')}" itemLabel="label" itemValue="label" htmlEscape="false"/>--%>
+<%--                            </form:select>--%>
+<%--                        </div>--%>
+<%--                    </div>--%>
+<%--                </div>--%>
+<%--            </div>--%>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>审批流程</h2></div>
                 <div class="layui-item layui-col-xs12 form-table-container" >
@@ -951,6 +991,58 @@
     </div>
 
 </div>
+<script>
+    $(document).ready(function() {
+        $("#clearOpinon").click(function(){
+            var s=$("input[name='sh']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='sh']").attr("checked",false)
+            }
+            $("#zixunOpinion").val("");
+        })
+        $("#clearOpinons").click(function(){
+            var s=$("input[name='shs']").length;
+            for(var i=0;i<s;i++){
+                $("input[name='shs']").attr("checked",false)
+            }
+            $("#fuzerenOpinion").val("");
+        })
+        layui.use(['form', 'layer'], function () {
+            var form = layui.form;
+            //下拉框监听器
+            layui.form.on('select(zixunOpinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#zixunOpinion").val()+span+";"
+                    $("#zixunOpinion").val(opinion);
+                }
+            });
+            layui.form.on('checkbox(raopinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#zixunOpinion").val()+span+";"
+                    $("#zixunOpinion").val(opinion);
+                }
+            });
+            layui.form.on('select(fuzerenOpinion)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    var opinion=$("#fuzerenOpinion").val()+span+";"
+                    $("#fuzerenOpinion").val(opinion);
+                }
+            });
+            layui.form.on('checkbox(raopinions)', function(data){
+                var span=data.value;
+                if(span!=""){
+                    $(this).attr("checked",false)
+                    var opinion=$("#fuzerenOpinion").val()+span+";"
+                    $("#fuzerenOpinion").val(opinion);
+                }
+            });
+        });
+    })
+</script>
 <script type="text/javascript">
     var workClientBankRowIdx = 0,
         workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/projectcontentinfo/reportForm.jsp

@@ -872,13 +872,33 @@
 										cssStyle="background-color:#fff"	title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm12 lw7 with-textarea">
+				<div class="layui-item layui-col-sm12 lw7">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>专业咨询员审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+						<div class="layui-item layui-col-sm6 lw7 with-textarea">
+							<div class="layui-input-block" style="margin-left:0px;position: relative">
+								<form:textarea placeholder="请输入审批意见" path="projectReportData.consultantRemarks" id="zixunOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+								<a id="clearOpinon" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+								<input type="file" name="upload_files" style="display: none;">
+							</div>
+						</div>
+						<div class="layui-item layui-col-sm4 lw6 with-textarea">
+							<div class="layui-input-block" style="margin-left:10px;">
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinion" name="sh" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+								<div style="padding: 5px 0px;">
+									<form:select path="projectReportData.consultantRemarks" id="auditOpinion" lay-filter="zixunOpinion" lay-verify="zixunOpinion" class="form-control simple-select">
+										<form:option value=""/>
+										<form:options items="${fns:getMainDictListOnProjectAdvent('consultant_comments')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+									</form:select>
+								</div>
+							</div>
+						</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.consultantRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
 					</div>
 				</div>
-				<div class="layui-item layui-col-sm6 lw7">
+				<div class="layui-item layui-col-sm6 lw7" style="margin-top: 20px;">
 					<label class="layui-form-label"><span class="require-item">*</span>项目负责人：</label>
 					<div class="layui-input-block  with-icon">
 						<sys:reportedtreeselectUser id="principal" name="projectReportData.principal.id" value="${projectRecords.projectMasterId}" labelName="projectReportData.principal.name" labelValue="${projectRecords.projectMasterName}"
@@ -888,7 +908,27 @@
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label double-line"><span class="require-item">*</span>项目负责人审核意见：</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>
+							<div class="layui-item layui-col-sm6 lw7 with-textarea">
+								<div class="layui-input-block" style="margin-left:0px;position: relative">
+									<form:textarea placeholder="请输入审批意见" path="projectReportData.principalRemarks" id="fuzerenOpinion" class="form-control required" rows="4" cssStyle="height: 200px;" maxlength="255" />
+									<a id="clearOpinons" class="layui-btn" style="position: absolute;bottom: 10px;right: 20px;">清空</a>
+									<input type="file" name="upload_files" style="display: none;">
+								</div>
+							</div>
+							<div class="layui-item layui-col-sm4 lw6 with-textarea">
+								<div class="layui-input-block" style="margin-left:10px;">
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="同意" title="同意" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="不同意" title="不同意" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;"><input type="checkbox" lay-filter="raopinions" name="shs" value="请领导审核" title="请领导审核" style="cursor:pointer" class="apen"/></div>
+									<div style="padding: 5px 0px;">
+										<form:select path="projectReportData.principalRemarks" id="auditOpinion" lay-filter="fuzerenOpinion" lay-verify="fuzerenOpinion" class="form-control simple-select">
+											<form:option value=""/>
+											<form:options items="${fns:getMainDictListOnProjectAdvent('person_audit_opinion')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+										</form:select>
+									</div>
+								</div>
+							</div>
+<%--						<form:textarea placeholder="请输入审核意见" path="projectReportData.principalRemarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control required"/>--%>
 					</div>
 				</div>
 			</div>
@@ -1268,6 +1308,58 @@
 	</div>
 </div>
 <script>
+	$(document).ready(function() {
+		$("#clearOpinon").click(function(){
+			var s=$("input[name='sh']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='sh']").attr("checked",false)
+			}
+			$("#zixunOpinion").val("");
+		})
+		$("#clearOpinons").click(function(){
+			var s=$("input[name='shs']").length;
+			for(var i=0;i<s;i++){
+				$("input[name='shs']").attr("checked",false)
+			}
+			$("#fuzerenOpinion").val("");
+		})
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			//下拉框监听器
+			layui.form.on('select(zixunOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#zixunOpinion").val()+span+";"
+					$("#zixunOpinion").val(opinion);
+				}
+			});
+			layui.form.on('select(fuzerenOpinion)', function(data){
+				var span=data.value;
+				if(span!=""){
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+			layui.form.on('checkbox(raopinions)', function(data){
+				var span=data.value;
+				if(span!=""){
+					$(this).attr("checked",false)
+					var opinion=$("#fuzerenOpinion").val()+span+";"
+					$("#fuzerenOpinion").val(opinion);
+				}
+			});
+		});
+	})
+</script>
+<script>
 	function openBill2(title,url,width,height,target,formId,tableId){
 		var rows = $(this).parent().prevAll().length + 1;
 		var frameIndex = parent.layer.getFrameIndex(window.name);
@@ -1598,5 +1690,6 @@
 	});
 
 </script>
+
 </body>
 </html>