页面代码提交

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1257,9 +1257,7 @@
 		JOIN project_audit_user_info pau ON pau.user_id = a.id
 		JOIN sys_role r ON ur.role_id = r.id
 		WHERE a.office_id is not null and pau.real_flag=1
-		order by a.name = '郑炎基' desc
-				,a.name = '王年生' desc
-				,a.name = '秦美' desc
+		order by a.name desc
 	</select>
 
 	<select id="getAuditUserListByBzshbUserId" resultType="java.lang.String">

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -831,9 +831,9 @@
 					}
 				}
 				/*纸质归档*/
-				if(d.projectReportStatusTwo == 5){
+				/*if(d.projectReportStatusTwo == 5){
 					if(d.submitMoney == "2"){
-						/*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*/
+						/!*xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载模板', '${ctx}/ruralProject/ruralCostProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载模板</a>";*!/
 						if(d.paperFilingStatus == 0){
 							xml+="<a href=\"#\" onclick=\"openDialogre('新增纸质归档信息', '${ctx}/paperFiling/paperFiling/form?companyType=${companyType}&projectId=" + d.id +"&view=filing','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 纸质归档</a>";
 						}
@@ -848,7 +848,7 @@
 							xml+="<a href=\"#\" onclick=\"openDialogre('调整归档信息', '${ctx}/paperFiling/paperFiling/modify?companyType=${companyType}&id=" + d.ppfId + "&projectId=" + d.id + "&processInstanceId=" + d.ppfProcessInstanceId + "&view=filing ','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs  layui-bg-green\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;'> 纸质重新归档</a>";
 						}
 					}
-				}
+				}*/
 
 
 
@@ -961,7 +961,7 @@
 							</div>
 						</div>
 						<div class="layui-item query athird">
-							<label class="layui-form-label">部门:</label>
+							<label class="layui-form-label">部门：</label>
 							<div class="layui-input-block with-icon">
 								<sys:treeselect id="office" name="office.id" value="${ruralProjectRecords.office.id}" labelName="office.name" labelValue="${ruralProjectRecords.office.name}"
 												cssStyle="background-color:#fff" title="部门" url="/sys/office/treeDataAll?type=2" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="false"/>
@@ -976,7 +976,7 @@
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">委托方：</label>
 							<div class="layui-input-block">
-								<input id="workContractInfoClientName" name="workContractInfo.client.name" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
+								<input id="workContractInfoClientName" name="workContractInfo.clientName" value="${workContractInfoClientName}" htmlEscape="false" maxlength="255"  class=" form-control layui-input"/>
 							</div>
 						</div>
 						<div class="layui-item query athird ">
@@ -1000,7 +1000,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">签发状态：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="projectReportStatusTwo" class=" form-control  simple-select">
@@ -1008,9 +1008,9 @@
 									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird ">
-							<label class="layui-form-label">电子归档：</label>
+							<label class="layui-form-label">归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select id="projectReportRecordStatus" path="projectReportRecordStatus" class=" form-control  simple-select">
 									<form:option value="" label=""/>
@@ -1018,7 +1018,7 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label">线下归档：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="downProjectReportRecordStatus" class=" form-control  simple-select">
@@ -1026,10 +1026,10 @@
 									<form:option value="0" label="未归档"/>
 									<form:option value="2" label="归档中"/>
 									<form:option value="5" label="已归档"/>
-									<%--									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
+									&lt;%&ndash;									<form:options items="${fns:getDictList('rural_report_audit_state')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">上报状态：</label>
 							<div class="layui-input-block readOnlyFFF">
@@ -1039,18 +1039,18 @@
 								</form:select>
 							</div>
 						</div>
-						<div class="layui-item query athird ">
+						<%--<div class="layui-item query athird ">
 							<label class="layui-form-label double-line">项目等级：</label>
 							<div class="layui-input-block readOnlyFFF">
 								<form:select path="submitMoney" class="form-control simple-select">
 									<form:option value="" label=""/>
 									<form:option value="2" label="A级"/>
 									<form:option value="1" label="B级"/>
-									<%--<form:option value="3" label="B级紧急"/>
-									<form:option value="1" label="B级非紧急"/>--%>
+									&lt;%&ndash;<form:option value="3" label="B级紧急"/>
+									<form:option value="1" label="B级非紧急"/>&ndash;%&gt;
 								</form:select>
 							</div>
-						</div>
+						</div>--%>
 						<div style="clear:both;"></div>
 					</div>
 				</form:form>
@@ -1190,7 +1190,7 @@
 				,{field: 'submitMoneyStr', align:'center', title: '项目等级',width:100,templet: function(d){
 						return "<font style = 'font-size:14px;'>"+d.submitMoneyStr+"</font>";
 					}}
-                ,{align:'center', title: '质量复核',  width:70,templet:function(d){
+                ,{align:'center', title: '质量复核',  width:90,templet:function(d){
                         var st = getAuditState(d.projectReportStatus);
                         if(st.action)
                             var xml = "<span onclick=\"openDialogReportView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?companyType=${companyType}&id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -1198,15 +1198,15 @@
                             var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '报告签发',  width:90,templet:function(d){
+				/*,{align:'center', title: '报告签发',  width:90,templet:function(d){
 						var st = getAuditState(""+d.projectReportStatusTwo);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogReportTwoView('流程追踪', '${ctx}/ruralProject/ruralProjectMessageNewTwo/getProcessOne?companyType=${companyType}&id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','"+d.id+"','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						else
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
-					}}
-                ,{align:'center', title: '电子',  width:120,templet:function(d){
+					}}*/
+                ,{align:'center', title: '归档',  width:120,templet:function(d){
                         var st = getRuralProjectArchiveState(d.projectReportRecordStatus);
 						var de = getdefectRecordState(""+d.defectRecordStatus);
 						if(st.action){
@@ -1227,7 +1227,7 @@
 				<%--			var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";--%>
 				<%--		return xml;--%>
 				<%--	}}--%>
-                ,{align:'center', title: '线下',  width:70,templet:function(d){
+                /*,{align:'center', title: '线下',  width:70,templet:function(d){
 						if (d.submitMoney=="1"){
 							var st = getRuralProjectArchiveState(d.downProjectReportRecordStatus);
 						}else if (d.submitMoney=="2"){
@@ -1243,7 +1243,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						}
                         return xml;
-                    }}
+                    }}*/
                 ,{align:'center', title: '上报',  width:90,templet:function(d){
                         var st = getReportedState(d.reportedState);
                         if(st.action)
@@ -1252,7 +1252,7 @@
                             var xml = "<span style=\"cursor:default;\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status + "</span>";
                         return xml;
                     }}
-				,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
+				/*,{align:'center', title: '案例项目申报',  width:150,templet:function(d){
 						var st = getCaseBaseAuditState(d.caseStatus);
 						if(st.action)
 							var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.caseProcessId + "','95%','95%')\" class=\"new-status-label status-label-" + st.label + "\" >" + st.status+ "</span>";
@@ -1262,7 +1262,7 @@
 							xml+="<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralCostProjectMessage/getReportedProcess?companyType=${companyType}&processInstanceId=" + d.caseProcessId + "','95%','95%')\"  style='margin-left: 5px;' class=\"layui-badge layui-bg-orange\">是</span>";
 						}
 						return xml;
-					}}
+					}}*/
 				<%--,{align:'center', title: '纸质',  width:90,templet:function(d){--%>
 				<%--		var st = getRuralProjectArchiveState(d.paperFilingStatus);--%>
 				<%--		if(st.action)--%>

src/main/webapp/webpage/modules/sys/gridselectContractDetail.jsp

@@ -151,7 +151,7 @@
 										</c:if>
 									</c:forEach>
 									<td title="${fns:getMainDictLabel(obj.contractTypeDoc, 'contract_info_type', '')}" class="codelabel">${fns:getMainDictLabel(obj.contractTypeDoc, 'contract_info_type', '')}</td>
-									<td title="${obj.client.name}" class="codelabel">${obj.client.name}</td>
+									<td title="${obj.clientName}" class="codelabel">${obj.clientName}</td>
 									<td class="codelabel"><fmt:formatDate value="${obj.createDate}" pattern="yyyy-MM-dd"/></td>
 									<td title="${obj.createBy.name}" class="codelabel">${obj.createBy.name}</td>
 								</tr>