列表中合同可查看详情

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -682,7 +682,7 @@ public class WorkInvoiceAllController extends BaseController {
 	 */
 	@RequestMapping(value = "selectclient")
 	public String selectclient(WorkClientInfo client, String url, String fieldLabels, String fieldKeys, String searchLabel, String searchKey, HttpServletRequest request, HttpServletResponse response, Model model) {
-		Page<WorkClientInfo> page = workClientInfoService.findPage(new Page<WorkClientInfo>(request, response), client);
+		Page<WorkClientInfo> page = workClientInfoService.findAllPage(new Page<WorkClientInfo>(request, response), client);
 		try {
 			fieldLabels = URLDecoder.decode(fieldLabels, "UTF-8");
 			fieldKeys = URLDecoder.decode(fieldKeys, "UTF-8");

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -317,7 +317,7 @@
 
                     <div style="clear: both;"></div>
                 </div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
                 <!-- 分页代码 -->
                 <table:page page="${page}"></table:page>
                 <div style="clear: both;"></div>

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanConsultingList.jsp

@@ -250,7 +250,8 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
 				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
@@ -287,6 +288,7 @@
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
+					,"conId":"${projectRecords.workContractInfo.id}"
 					,"client":"${projectRecords.workContractInfo.client.name}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/projectrecord/plan/projectPlanCostList.jsp

@@ -236,7 +236,7 @@
 			,page: false
 			,cols: [[
 				// {checkbox: true, fixed: true},
-				{field:'index',align:'center', title: '序号',width:40}
+				{field:'index',align:'center', title: '序号',width:50}
 				,{field:'projName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projName + "</a>";
@@ -250,7 +250,8 @@
 						if(null == d.contract || '' == d.contract){
 							return "<span style=\"color:red\" title='无合同'>无合同</span>";
 						}else{
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}
 					}}
 				,{field:'projMaster', align:'center',title: '责任人', width:100,templet:function(d){
@@ -287,6 +288,7 @@
 					,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
 					,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
 					,"contract":"${projectRecords.workContractInfo.name}"
+					,"conId":"${projectRecords.workContractInfo.id}"
 					,"client":"${projectRecords.workContractInfo.client.name}"
 					,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
 					,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/check/all/ruralProjectRecordsAllList.jsp

@@ -329,7 +329,8 @@
 					}}
 				,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -394,6 +395,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/check/ruralProjectRecordsList.jsp

@@ -421,7 +421,9 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contract + "</a>";
+
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -496,6 +498,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"contractId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"
                     ,"projectStatus":"${projectRecords.projectStatus}"

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectRecordsList.jsp

@@ -522,7 +522,7 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
 						if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -599,6 +599,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"conId":"${projectRecords.workContractInfo.id}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectRecordsList.jsp

@@ -487,7 +487,8 @@
 					}}
                 ,{field:'contract', align:'center',title: '合同名称',minWidth:200,templet:function(d){
                 		if(""!= d.contract){
-							return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
+							return "<a class=\"attention-info\" title=\""+d.contract+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.conId + "','95%', '95%')\">" + d.contract + "</a>";
+							// return "<span title='"+ d.contract +"'>" + d.contract + "</span>";
 						}else{
 							return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 						}
@@ -568,6 +569,7 @@
                     ,"projName":"<c:out value="${projectRecords.projectName}" escapeXml="true"/>"
                     ,"projMaster":"<c:forEach items="${projectRecords.projectLeaders}" var="leader" varStatus="status"><c:choose><c:when test="${status.last}">${leader.name}</c:when><c:otherwise>${leader.name},</c:otherwise></c:choose></c:forEach>"
                     ,"contract":"${projectRecords.workContractInfo.name}"
+                    ,"conId":"${projectRecords.workContractInfo.id}"
                     ,"projectReportNumber":"${projectRecords.projectReportNumber}"
                     ,"client":"${projectRecords.workContractInfo.client.name}"
                     ,"createDate":"<fmt:formatDate value="${projectRecords.createDate}" pattern="yyyy-MM-dd"/>"

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralCostProjectReportList.jsp

@@ -98,8 +98,12 @@
 					<div class="layui-item athird">
 						<div class="input-group">
 							<a href="#" id="moresee"><i class="glyphicon glyphicon-menu-down"></i></a>
-							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>
-							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>
+							<div class="layui-btn-group search-spacing">
+								<button id="searchQuery" class="layui-btn layui-btn-sm layui-bg-blue" onclick="search()">查询</button>
+								<button id="searchReset" class="layui-btn layui-btn-sm" onclick="resetSearch()">重置</button>
+							</div>
+<%--							<button id="searchReset" class="fixed-btn searchReset fr" onclick="resetSearch()">重置</button>--%>
+<%--							<button id="searchQuery" class="fixed-btn searchQuery fr" onclick="search()">查询</button>--%>
 						</div>
 					</div>
 					<div style="    clear:both;"></div>
@@ -167,8 +171,11 @@
 		<div class="full-width fl">
 			<div class="contentShadow layui-form contentDetails">
 				<div class="nav-btns">
-					<table:exportExcel url="${ctx}/ruralCostProjectReport/ruralCostProjectReport/export"></table:exportExcel><!-- 导出按钮 -->
-					<button class="nav-btn nav-btn-refresh" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"><i class="glyphicon glyphicon-repeat"></i> 刷新</button>
+					<div class="layui-btn-group">
+						<table:exportExcel url="${ctx}/ruralCostProjectReport/ruralCostProjectReport/export"></table:exportExcel><!-- 导出按钮 -->
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+					</div>
+
 
 					<div style="clear: both;"></div>
 				</div>

src/main/webapp/webpage/modules/ruralprojectrecords/ruralProjectReport/cost/ruralProjectCostRecordReportList.jsp

@@ -156,8 +156,8 @@
             ,cols: [[
                 // {checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:40}
-                ,{field:'year',align:'center', sort:true,title: '年份'}
-                ,{field:'month',align:'center', sort:true,title: '月份'}
+                ,{field:'year',align:'center', sort:true,title: '年份',width:100}
+                ,{field:'month',align:'center', sort:true,title: '月份',width:60}
                 ,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						if(1 == d.showView && d.showView != undefined){
 							return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/all/ruralProjectMessageAllLists.jsp

@@ -552,7 +552,7 @@
 		<div class="full-width fl">
 			<div class="layui-form contentDetails contentShadow shadowLBR">
 				<div class="nav-btns">
-					<div class="layui-btn-group" style="margin-left: 15px;">
+					<div class="layui-btn-group">
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-expand">全部展开</button>
 						<button class="layui-btn layui-btn-sm layui-bg-blue" id="btn-fold">全部折叠</button>
 						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
@@ -563,7 +563,7 @@
 
                     <div style="clear: both;"></div>
 				</div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -661,7 +661,8 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName && null!= d.contractName) {
-									return  d.contractName;
+									return "<a class=\"attention-info pid\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同信息', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+									// return  d.contractName;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";
 								}

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

@@ -555,7 +555,7 @@
 
                     <div style="clear: both;"></div>
 				</div>
-                <table id="permissionTable" class="layui-table" lay-filter="permissionTable"></table>
+                <table id="permissionTable" class="oa-table layui-table" lay-filter="permissionTable"></table>
 				<!-- 分页代码 -->
 				<table:page page="${page}"></table:page>
 				<div style="clear: both;"></div>
@@ -655,6 +655,8 @@
                     {field: 'contractName', align:'center', title: '合同名称',width:180,templet: function(d){
 							if(0 == d.pid){
 								if(""!= d.contractName && null!= d.contractName){
+									return "<a class=\"attention-info\" title=\""+d.contractName+"\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看合同管理', '${ctx}/workcontractinfo/workContractInfo/lookForm?id=" + d.contractId + "','95%', '95%')\">" + d.contractName + "</a>";
+
 									return  d.contractName ;
 								}else{
 									return "<span title='暂无合同'  style='color: #FF5722'>暂无合同</span>";

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -619,7 +619,7 @@
 					<%--此处按钮样式包括 nav-btn-add nav-btn-refresh nav-btn-import nav-btn-export nav-btn-query nav-btn-reset--%>
 					<div class="layui-btn-group">
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:add">
-							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">&nbsp;添加</button>
+							<button class="layui-btn layui-btn-sm layui-bg-blue" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')">添加</button>
 						</shiro:hasPermission>
 						<shiro:hasPermission name="workcontractinfo:workContractInfo:import">
 							<table:importExcel url="${ctx}/workcontractinfo/workContractInfo/import"></table:importExcel><!-- 导入按钮 -->
@@ -630,7 +630,7 @@
 							<table:exportExcel url="${ctx}/workcontractinfo/workContractInfo/export"></table:exportExcel><!-- 导出按钮 -->
 						</shiro:hasPermission>
 
-						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新"> 刷新</button>
+						<button class="layui-btn layui-btn-sm" data-toggle="tooltip" data-placement="left" onclick="sortOrRefresh()" title="刷新">刷新</button>
 					</div>
 <%--					<shiro:hasPermission name="workcontractinfo:workContractInfo:add">--%>
 <%--						<button class="nav-btn nav-btn-add" title="合同登记" onclick="openDialogre('合同登记','${ctx}/workcontractinfo/workContractInfo/form','95%','95%')"><i class="fa fa-plus"></i>&nbsp;添加</button>--%>