2022/7/4 排序及列表展示修改

src/main/resources/mappings/modules/projectMaterialStorage/ProjectMaterialStorageDao.xml

@@ -79,7 +79,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY a.update_date DESC
+				ORDER BY r.create_date DESC,a.create_date DESC
 			</otherwise>
 		</choose>
 	</select>

src/main/webapp/webpage/modules/projectMaterialStorage/projectMaterialStorageList.jsp

@@ -416,25 +416,18 @@
             ,cols: [[
 				{checkbox: true, fixed: true},
                 {field:'index',align:'center', title: '序号',width:55}
-				,{field:'projectId',align:'center', title: '报告号',  width:150}
-				,{field:'materialName',align:'center', title: '材料名称',  width:150}
-				,{field:'unit',align:'center', title: '单位',  width:80}
-				,{field:'price',align:'center', title: '价格',  width:150}
-				// ,{field:'areaName',align:'center', title: '项目地点',  width:150}
-                ,{field:'projName',align:'center', title: '项目名称',minWidth:100,templet:function(d){
+				,{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:'projId',align:'center', title: '项目编号',minWidth:150,templet:function(d){
-                        return "<a class=\"attention-info\" title=\"" + d.projId + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.id + "','95%', '95%')\">" + d.projId + "</a>";
-                    }}*/
-
-
-
+					}}
+				,{field:'projectId',align:'center', title: '报告号',  width:150}
+				,{field:'materialName',align:'center', title: '材料名称',  width:150}
+				,{field:'unit',align:'center', title: '单位',  width:80}
+				,{field:'price',align:'center', title: '价格',  width:150}
+				// ,{field:'areaName',align:'center', title: '项目地点',  width:150}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:150}
                 ,{field:'op',align:'center',title:"操作",width:240,templet:function(d){
                         ////对操作进行初始化