user5 пре 5 година
родитељ
комит
32f1fbfdc8

+ 1 - 1
src/main/java/com/jeeplus/modules/wexintheorder/Utils/TheOrderExportExcel.java

@@ -1,4 +1,4 @@
-package com.jeeplus.modules.wexintheorder.Utils;
+package com.jeeplus.modules.wexintheorder.exportUtils;
 
 import com.google.common.collect.Lists;
 import com.jeeplus.common.utils.Encodes;

+ 1 - 1
src/main/java/com/jeeplus/modules/wexintheorder/web/TheOrderWebController.java

@@ -6,8 +6,8 @@ import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.common.web.BaseController;
 import com.jeeplus.modules.wexintheorder.entity.TheOrder;
 import com.jeeplus.modules.wexintheorder.entity.TheOrderLeadership;
+import com.jeeplus.modules.wexintheorder.exportUtils.TheOrderExportExcel;
 import com.jeeplus.modules.wexintheorder.service.TheOrderWebService;
-import com.jeeplus.modules.wexintheorder.Utils.TheOrderExportExcel;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

+ 10 - 5
src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/ruralProjectMessageList.jsp

@@ -282,11 +282,16 @@
                     }}
                 ,{field:'createDate',align:'center', title: '创建日期',  width:80}
                 ,{align:'center', title: '状态',  width:70,templet:function(d){
-                        var st = getAuditState(d.projectReportStatus);
-                        if(st.action)
-                            var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','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>";
+                        if(d.projectReportStatus !=5){
+                            var st = getAuditState(d.projectReportStatus);
+                            if(st.action)
+                                var xml = "<span onclick=\"openDialogView('流程追踪', '${ctx}/ruralProject/ruralProjectMessage/getProcessOne?id=" + d.id + "&projectReportData.id=" + d.bid + "&type=2','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>";
+
+                        }else {
+
+                        }
                         return xml;
                     }}
                 ,{field:'op',align:'center',title:"操作",width:130,templet:function(d){