|
|
@@ -116,6 +116,13 @@
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ function newSetPNumber(obj,label,ids,isProject,details){
|
|
|
+ $("#projectId").val(obj)
|
|
|
+ $("#projectName").val(label)
|
|
|
+ }
|
|
|
+
|
|
|
//打开对话框(查看)
|
|
|
function openDialogReportView(title,url,id,width,height){
|
|
|
|
|
|
@@ -313,6 +320,7 @@
|
|
|
<div class="layui-input-block">
|
|
|
<sys:gridselectprojectmaterial url="${ctx}/project/projectMaterialStorage/selectproject" id="project" name="projectNumber" value="${projectMaterialStorage.projectName}" title="选择所属项目" labelName="projectName" cssStyle="background-color: #fff"
|
|
|
labelValue="${projectMaterialStorage.projectName}" cssClass="form-control required layui-input" fieldLabels="项目名称" fieldKeys="projectName" searchLabel="项目名称" searchKey="projectName" ></sys:gridselectprojectmaterial>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="commonQuery lw6">
|
|
|
@@ -434,13 +442,24 @@
|
|
|
,cols: [[
|
|
|
{checkbox: true, fixed: true},
|
|
|
{field:'index',align:'center', title: '序号',width:55}
|
|
|
- ,{field:'projName',align:'center', title: '项目名称',minWidth:100,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>";
|
|
|
- }else{
|
|
|
- return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";
|
|
|
- }
|
|
|
- }}
|
|
|
+ <%--,{field:'projName',align:'center', title: '项目名称',minWidth:100,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>";--%>
|
|
|
+ <%-- }else{--%>
|
|
|
+ <%-- return "<span title='"+ d.projName +"'>" +d.projName+ "</span>";--%>
|
|
|
+ <%-- }--%>
|
|
|
+ <%-- }}--%>
|
|
|
+ ,{field:'projectName',align:'center', title: '项目名称', minWidth:200,templet:function(d){
|
|
|
+ var xml="";
|
|
|
+ <shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
|
|
|
+ xml+="<a class=\"attention-info pid\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectView/view?id=" + d.projectNumber +"','95%', '95%')\">"
|
|
|
+ </shiro:hasPermission>
|
|
|
+ xml+=d.projectName
|
|
|
+ <shiro:hasPermission name="ruralProject:ruralProjectView:listAllView">
|
|
|
+ xml+="</a>";
|
|
|
+ </shiro:hasPermission>
|
|
|
+ return xml;
|
|
|
+ }}
|
|
|
,{field:'projectId',align:'center', title: '报告号', width:150}
|
|
|
,{field:'materialName',align:'center', title: '材料名称', width:150}
|
|
|
,{field:'unit',align:'center', title: '单位', width:80}
|
|
|
@@ -467,11 +486,12 @@
|
|
|
{
|
|
|
"index":"${index.index+1}"
|
|
|
,"id":"${projectMaterialStorage.id}"
|
|
|
+ ,"projectNumber":"${projectMaterialStorage.projectNumber}"
|
|
|
,"projectId":"${projectMaterialStorage.projectId}"
|
|
|
,"unit":"${projectMaterialStorage.unit}"
|
|
|
,"materialName":"${projectMaterialStorage.materialName}"
|
|
|
,"price":"${projectMaterialStorage.price}"
|
|
|
- ,"projName":"<c:out value="${projectMaterialStorage.projectName}" escapeXml="true"/>"
|
|
|
+ ,"projectName":"<c:out value="${projectMaterialStorage.projectName}" escapeXml="true"/>"
|
|
|
,"areaName":"${projectMaterialStorage.areaName}"
|
|
|
,"createDate":"<fmt:formatDate value="${projectMaterialStorage.createDate}" pattern="yyyy-MM-dd"/>"
|
|
|
<c:choose><c:when test="${flag == '1' or fns:getUser().id == projectRecords.createBy.id}">
|
guoxu