Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/oa/web/OaNotifyController.java

@@ -111,13 +111,27 @@ public class OaNotifyController extends BaseController {
 		}
 		model.addAttribute("isSelf", isSelf);
 		model.addAttribute("oaNotify", oaNotify);
-        if(oaNotify.getTitle().contains("缺货")){
-			OaNotifyMaterial oaNotifyMaterial = new OaNotifyMaterial();
-			oaNotifyMaterial.setParentId(oaNotify.getId());
-			List<OaNotifyMaterial> oaNotifyMaterialList = oaNotifyMaterialService.findList(oaNotifyMaterial);
-			model.addAttribute("oaNotifyMaterialList",oaNotifyMaterialList);
-            return "modules/oa/notify/oaNotifyFormMaterial";
-        }
+		String title = oaNotify.getTitle();
+		String type = oaNotify.getType();
+		if (null!=title) {
+			if(oaNotify.getTitle().contains("缺货")){
+				OaNotifyMaterial oaNotifyMaterial = new OaNotifyMaterial();
+				oaNotifyMaterial.setParentId(oaNotify.getId());
+				List<OaNotifyMaterial> oaNotifyMaterialList = oaNotifyMaterialService.findList(oaNotifyMaterial);
+				model.addAttribute("oaNotifyMaterialList",oaNotifyMaterialList);
+				return "modules/oa/notify/oaNotifyFormMaterial";
+			}
+		}
+		if (type != null) {
+			if (oaNotify.getType().equals("8")) {
+				OaNotifyMaterial oaNotifyMaterial = new OaNotifyMaterial();
+				oaNotifyMaterial.setParentId(oaNotify.getId());
+				List<OaNotifyMaterial> oaNotifyMaterialList = oaNotifyMaterialService.findList(oaNotifyMaterial);
+				model.addAttribute("oaNotifyMaterialList",oaNotifyMaterialList);
+				return "modules/oa/notify/oaNotifyFormDesign";
+			}
+		}
+
 		return "modules/oa/notify/oaNotifyForm";
 	}
 

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/entity/Disclose.java

@@ -62,6 +62,8 @@ public class Disclose  extends ActEntity<Disclose> {
     private String taskId;
     //其它问题描述
     private String otherProblem;
+    //已实施内容描述
+    private String implementedContent;
 
     public String getTaskId() {
         return taskId;
@@ -296,6 +298,14 @@ public class Disclose  extends ActEntity<Disclose> {
         this.otherProblem = otherProblem;
     }
 
+    public String getImplementedContent() {
+        return implementedContent;
+    }
+
+    public void setImplementedContent(String implementedContent) {
+        this.implementedContent = implementedContent;
+    }
+
     @Override
     public String toString() {
         return "Disclose{" +

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/ConstructionMapper.java

@@ -54,6 +54,6 @@ public interface ConstructionMapper extends BaseMapper<Construction> {
 
     List<String> insIdByName3(String projectName);
 
-
     void insertDisclose(Construction construction);
+
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/DiscloseMapper.java

@@ -22,4 +22,10 @@ public interface DiscloseMapper extends BaseMapper<Disclose> {
     int newInsert(@Param("disclose") List<Disclose> disclose);
 
     int updateById(Disclose disclose);
+
+    int findByProcInsId(String procInsId);
+
+    void updateDiscloseByProcInsId(Construction construction);
+
+    void insertDiscloseRole(Construction construction);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/UploadImagesMapper.java

@@ -18,4 +18,9 @@ import java.util.List;
 @MyBatisMapper
 public interface UploadImagesMapper extends BaseMapper<UploadImages> {
     List<UploadImages> findMaterialImg(UploadImages entity);
+
+    //根据流程定义号查询
+    String findPathByProcInsID(String procInsId);
+
+    String findProjectNameByProcInsId(String procInsId);
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/ConstructionMapper.xml

@@ -43,7 +43,8 @@
 		d.explanationOfNecessity AS "disclose.explanationOfNecessity",
 		d.inconsistentDescription AS "disclose.inconsistentDescription",
 		d.policyHandlingInstructions AS "disclose.policyHandlingInstructions",
-		d.otherProblem AS "disclose.otherProblem"
+		d.otherProblem AS "disclose.otherProblem",
+		d.implementedContent AS "disclose.implementedContent"
 	</sql>
 
 
@@ -274,6 +275,7 @@
 	<select id="idProjectName" resultType="string">
 		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
 	</select>
+	<!--施工流程记录表根据流程定义号获取项目名称-->
 	<select id="idProjectName3" resultType="string">
 		select project_name from sg_construction_process where proc_ins_id = #{procInsId};
 	</select>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/DiscloseMapper.xml

@@ -280,6 +280,7 @@
         needReplace,
         overallTransformation,
 		otherProblem,
+		implementedContent,
         create_by,
         create_date,
         update_by,
@@ -319,6 +320,7 @@
             #{item.needReplace},
             #{item.overallTransformation},
             #{item.otherProblem},
+            '',
             #{item.createBy.id},
             #{item.createDate},
             #{item.updateBy.id},
@@ -329,4 +331,53 @@
         </foreach>
 
     </insert>
+	<select id="findByProcInsId" resultType="java.lang.Integer">
+		select count(*) from xm_disclose_conclusion where proc_ins_id = #{procInsId};
+	</select>
+
+	<update id="updateDiscloseByProcInsId">
+		update xm_disclose_conclusion set
+			otherProblem = #{disclose.otherProblem},
+			inconsistentDescription = #{disclose.inconsistentDescription},
+			policyHandlingInstructions = #{disclose.policyHandlingInstructions},
+			implementedContent = #{disclose.implementedContent},
+			administrationType = #{administrationType}
+		where proc_ins_id = #{procInsId};
+	</update>
+
+	<insert id="insertDiscloseRole">
+		insert into xm_disclose_conclusion
+		(
+			id,
+			create_by,
+			create_date,
+			update_by,
+			update_date,
+			remarks,
+			del_flag,
+			proc_ins_id,
+			otherProblem,
+			inconsistentDescription,
+			policyHandlingInstructions,
+			implementedContent,
+			administrationType
+		)
+		values
+		(
+			#{id},
+			#{createBy.id},
+			#{createDate},
+			#{updateBy.id},
+			#{updateDate},
+			#{remarks},
+			#{delFlag},
+			#{procInsId},
+			#{disclose.otherProblem},
+			#{disclose.inconsistentDescription},
+			#{disclose.policyHandlingInstructions},
+			#{disclose.implementedContent},
+			#{administrationType}
+		);
+	</insert>
+
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/mapper/xml/UploadImagesMapper.xml

@@ -118,7 +118,13 @@
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
 
+	<select id="findPathByProcInsID" resultType="java.lang.String">
+		select path from xm_upolad_images where proc_ins_id = #{procInsId};
+	</select>
+
+	<select id="findProjectNameByProcInsId" resultType="java.lang.String">
+		select project_name from xm_construction_clarificaiton where proc_ins_id = #{procInsId};
+	</select>
 	
 </mapper>

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/service/DiscloseService.java

@@ -67,4 +67,18 @@ public class DiscloseService extends CrudService<DiscloseMapper, Disclose> {
 		disclose.preUpdate();
 		return discloseMapper.updateById(disclose);
 	}
+
+	public int findByProcInsId(String procInsId) {
+		return discloseMapper.findByProcInsId(procInsId);
+	}
+
+	@Transactional(readOnly = false)
+	public void updateDiscloseByProcInsId(Construction construction) {
+		discloseMapper.updateDiscloseByProcInsId(construction);
+	}
+
+	@Transactional(readOnly = false)
+	public void insertDiscloseRole(Construction construction) {
+		discloseMapper.insertDiscloseRole(construction);
+	}
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/utils/MyImportUtils.java

@@ -228,7 +228,7 @@ public class MyImportUtils {
                 if (null!=construction.getDisclose().getInconsistentDescription()){//图纸现场不一致说明
                     if ("不一致".equals(construction.getDisclose().getLineName())||//线路名称一致性
                             "否".equals(construction.getDisclose().getQuantities())||//工程量是否一致
-                            "不一致".equals(construction.getDisclose().getRodNumber())){//设备开关杠杆一致性
+                            !"".equals(construction.getDisclose().getImplementedContent())){//已实施内容描述不为空
                         model.addAttribute("pass_construction2","0");
                     }else {
                         if (construction.getDisclose().getAdministrationType().equals("1.无")){//政处类型
@@ -294,7 +294,7 @@ public class MyImportUtils {
         boolean flag = true;
         String[] split = disclose.getAdministrationType().split(";");
         for (String str : split){
-            if (!str.equals("2.农村政处")&&!str.equals("3.民事政处/行政政处（公路/水利）")&&!str.equals("4.行政政处（城区道路）")&&!str.equals("1.无")){
+            if (!str.contains("农村政处")&&!str.contains("民事政处/行政政处（公路/水利）")&&!str.contains("行政政处（城区道路）")&&!str.contains("无")){
                 tips+="政处类型填写有误";
                 flag = false;
                 break;
@@ -303,7 +303,7 @@ public class MyImportUtils {
         if (flag){
             if (!disclose.getAdministrationType().contains("1.无")){
                 if ("".equals(disclose.getPolicyHandlingInstructions()) || disclose.getPolicyHandlingInstructions() == null) {
-                    tips += "政策处理说明填写有误;";
+                    tips += "政策处理说明填不能为空;";
                 }
             }
         }
@@ -315,7 +315,7 @@ public class MyImportUtils {
         if ("".equals(disclose.getRequireName()) || disclose.getRequireName() == null) {
             tips +="项目名称不能为空;";
         }
-        if ("".equals(disclose.getCapacity()) || disclose.getCapacity() == null||(!"是".equals(disclose.getCapacity())&&!"否".equals(disclose.getCapacity()))) {
+        if ("".equals(disclose.getCapacity()) || disclose.getCapacity() == null||(!"有".equals(disclose.getCapacity())&&!"无".equals(disclose.getCapacity()))) {
             tips += "设备基础是否可以扩容填写有误;";
         }else {
             if ("是".equals(disclose.getCapacity())){

src/main/java/com/jeeplus/modules/sg/managementcenter/activiti/web/ConstructionController.java

@@ -92,6 +92,7 @@ public class ConstructionController extends BaseController {
 //        String pInId = construction.getProcInsId();
 //        ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
 //        RepositoryService rs = processEngine.getRepositoryService();
+        MyImportUtils.getTheEcho(construction,model);
         //根据流程定义号获取所有的定义流程
         model.addAttribute("construction", construction);
         return "modules/sg/managementcenter/activiti/artificialJudgment";
@@ -337,7 +338,7 @@ public class ConstructionController extends BaseController {
                         vars.put("processer", user.getLoginName());
                         String id = each.getId();
                         construction.setApplyName(constructionUnitRole);
-                        construction.setProjectId(id);
+                        construction.setProjectId(each.getProjectNumber());
                         construction.setProjectName(each.getRequireName());
                         construction.setAcceptDate(new Date());
                         constructionService.newSave(construction);//保存

src/main/webapp/webpage/modules/oa/notify/oaNotifyFormDesign.js

@@ -0,0 +1,145 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<script >
+$(document).ready(function () {
+	var procInsId = $('#files').val();
+    $('#table').bootstrapTable({
+        //请求方法
+        method: 'post',
+        //类型json
+        dataType: "json",
+        contentType: "application/x-www-form-urlencoded",
+        //显示检索按钮
+        showSearch: false,
+        //显示刷新按钮
+        showRefresh: false,
+        //显示切换手机试图按钮
+        showToggle: false,
+        //显示 内容列下拉框
+        showColumns: false,
+        //显示到处按钮
+        showExport: false,
+        //显示切换分页按钮
+        showPaginationSwitch: false,
+        //最低显示2行
+        minimumCountColumns: 2,
+        //是否显示行间隔色
+        striped: true,
+        //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+        cache: false,
+        //是否显示分页（*）
+        pagination: false,
+        //排序方式
+        sortOrder: "asc",
+        //初始化加载第一页，默认第一页
+        pageNumber: 1,
+        //每页的记录行数（*）
+        pageSize: 10,
+        //可供选择的每页的行数（*）
+        pageList: [10, 25, 50, 100],
+        //这个接口需要处理bootstrap table传递的固定参数,并返回特定格式的json数据
+        url: "${ctx}/managementcenter/upload/data?procInsId=" + procInsId,
+        //默认值为 'limit',传给服务端的参数为：limit, offset, search, sort, order Else
+        //queryParamsType:'',
+        ////查询参数,每次调用是会带上这个参数，可自定义
+        queryParams: function (params) {
+            var searchParam = $("#searchForm").serializeJSON();
+            searchParam.pageNo = params.limit === undefined ? "1" : params.offset / params.limit + 1;
+            searchParam.pageSize = params.limit === undefined ? -1 : params.limit;
+            searchParam.orderBy = params.sort === undefined ? "" : params.sort + " " + params.order;
+            return searchParam;
+        },
+        //分页方式：client客户端分页，server服务端分页（*）
+        sidePagination: "server",
+        contextMenuTrigger: "right",//pc端 按右键弹出菜单
+        contextMenuTriggerMobile: "press",//手机端 弹出菜单，click：单击， press：长按。
+        contextMenu: '#context-menu',
+        onContextMenuItem: function (row, $el) {
+            if ($el.data("item") == "edit") {
+                edit(row.id);
+            } else if ($el.data("item") == "view") {
+                view(row.id);
+            } else if ($el.data("item") == "delete") {
+                jp.confirm('确认要删除该图片管理记录吗？', function () {
+                    jp.loading();
+                    jp.get("${ctx}/test/pic/testPic/delete?id=" + row.id, function (data) {
+                        if (data.success) {
+                            $('#testPicTable').bootstrapTable('refresh');
+                            jp.success(data.msg);
+                        } else {
+                            jp.error(data.msg);
+                        }
+                    })
+
+                });
+
+            }
+        },
+
+        onClickRow: function (row, $el) {
+        },
+        onShowSearch: function () {
+            $("#search-collapse").slideToggle();
+        },
+        columns: [{
+            field: 'path',
+            title: '图片路径',
+            sortable: true,
+            sortName: 'path',
+            formatter: function (value, row, index) {
+                var valueArray = value.split("|");
+                var labelArray = [];
+                for (var i = 0; i < valueArray.length; i++) {
+                    if (!/\.(gif|jpg|jpeg|png|GIF|JPG|PNG)$/.test(valueArray[i])) {
+                        labelArray[i] = "<a href=\"" + valueArray[i] + "\" url=\"" + valueArray[i] + "\" target=\"_blank\">" + decodeURIComponent(valueArray[i].substring(valueArray[i].lastIndexOf("/") + 1)) + "</a>"
+                    } else {
+                        labelArray[i] = '<img   onclick="jp.showPic(\'' + valueArray[i] + '\')"' + ' height="50px" src="' + valueArray[i] + '">';
+                    }
+                }
+                return labelArray.join(" ");
+            }
+        }, {
+            field: 'imgName',
+            title: '上传用途',
+            sortable: true,
+            sortName: 'imgName',
+        }, {
+            field: 'uId',
+            title: '上传人员',
+            sortable: true,
+            sortName: 'uId',
+        }]
+    });
+
+
+    if (navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {//如果是移动端
+
+
+        $('#table').bootstrapTable("toggleView");
+    }
+
+    $('#table').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
+        'check-all.bs.table uncheck-all.bs.table', function () {
+        $('#remove').prop('disabled', !$('#table').bootstrapTable('getSelections').length);
+        $('#edit').prop('disabled', $('#table').bootstrapTable('getSelections').length != 1);
+    });
+
+    $("#search").click("click", function () {// 绑定查询按扭
+        $('#table').bootstrapTable('refresh');
+    });
+    $("#export").click(function () {//导出Excel文件
+        jp.downloadFile('${ctx}/oa/oaNotify/export?parentId=' + parentId);
+    });
+    $("#reset").click("click", function () {// 绑定查询按扭
+        $("#searchForm  input").val("");
+        $("#searchForm  select").val("");
+        $('#table').bootstrapTable('refresh');
+    });
+});
+
+function getIdSelections() {
+    return $.map($("#table").bootstrapTable('getSelections'), function (row) {
+        return row.id
+    });
+}
+
+</script>

src/main/webapp/webpage/modules/oa/notify/oaNotifyFormDesign.jsp

@@ -0,0 +1,132 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/bootstraptable.jsp"%>
+<%@include file="/webpage/include/treeview.jsp" %>
+<html>
+<head>
+	<title>通知管理</title>
+	<meta name="decorator" content="ani"/>
+	<script type="text/javascript">
+		$(document).ready(function() {
+			jp.ajaxForm("#inputForm",function(data){
+				if(data.success){
+					jp.success(data.msg);
+					jp.go("${ctx}/oa/oaNotify");
+				}else{
+					jp.error(data.msg);
+				}
+			})
+			
+		});
+	</script>
+</head>
+<body>
+<div class="wrapper wrapper-content">				
+<div class="row">
+	<div class="col-md-12">
+	<div class="panel panel-primary">
+		<div class="panel-heading">
+			<h3 class="panel-title"> 
+				<a class="panelButton" href="${ctx}/oa/oaNotify${isSelf?'/self':'' }"><i class="ti-angle-left"></i> 返回</a>
+			</h3>
+		</div>
+		<div class="panel-body">
+		<form:form id="inputForm" modelAttribute="oaNotify" action="${ctx}/oa/oaNotify/save" method="post" class="form-horizontal">
+		<form:hidden path="id"/>
+			<input type="hidden" id="files" value="${oaNotify.files}">
+			<input  type="hidden" id="parentId"  readonly="readonly" value="${oaNotify.id}">
+				<div class="form-group">
+					<label class="col-sm-2 control-label"><font color="red">*</font>类型1：</label>
+					<div class="col-sm-10">
+						<form:select path="type" class="form-control required">
+						<form:option value="" label=""/>
+						<form:options items="${fns:getDictList('oa_notify_type')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+						</form:select>
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-sm-2 control-label"><font color="red">*</font>标题：</label>
+					<div class="col-sm-10">
+						<form:input path="title" htmlEscape="false" maxlength="200" class="form-control required"/>
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label class="col-sm-2 control-label"><font color="red">*</font>内容：</label>
+					<div class="col-sm-10">
+						<form:textarea path="content" htmlEscape="false" rows="6" maxlength="2000" class="form-control required"/>
+					</div>
+				</div>
+
+			<%@ include file="oaNotifyFormDesign.js"%>
+			<div>
+				<table id="table"   data-toolbar="#toolbar"></table>
+			</div>
+				<c:if test="${oaNotify.status ne '1'}">
+				<div class="form-group">
+					<label class="col-sm-2 control-label"><font color="red">*</font>状态：</label>
+					<div class="col-sm-10">
+					<form:radiobuttons path="status" items="${fns:getDictList('oa_notify_status')}" itemLabel="label" itemValue="value" htmlEscape="false" class="i-checks required"/>
+					</div>
+				</div>
+				</c:if>
+			  <c:if test="${oaNotify.status eq '1'}">
+				<div class="form-group">
+				<table>
+					  <tr>
+				         <td  class="width-15 active">	<label class="pull-right">接受人：</label></td>
+				         <td class="width-35" colspan="3"><table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
+								<thead>
+									<tr>
+										<th>接受人</th>
+										<th>接受部门</th>
+										<th>阅读状态</th>
+										<th>阅读时间</th>
+									</tr>
+								</thead>
+								<tbody>
+								<c:forEach items="${oaNotify.oaNotifyRecordList}" var="oaNotifyRecord">
+									<tr>
+										<td>
+											${oaNotifyRecord.user.name}
+										</td>
+										<td>
+											${oaNotifyRecord.user.office.name}
+										</td>
+										<td>
+											${fns:getDictLabel(oaNotifyRecord.readFlag, 'oa_notify_read', '')}
+										</td>
+										<td>
+											<fmt:formatDate value="${oaNotifyRecord.readDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+										</td>
+									</tr>
+								</c:forEach>
+								</tbody>
+							</table>
+							已查阅：${oaNotify.readNum} &nbsp; 未查阅：${oaNotify.unReadNum} &nbsp; 总共：${oaNotify.readNum + oaNotify.unReadNum}</td>
+				      </tr>
+				  </table>
+				  </div>
+				</c:if>
+				<c:if test="${oaNotify.status ne '1'}">
+				<shiro:hasPermission name="oa:oaNotify:edit">
+						<div class="col-lg-3"></div>
+				        <div class="col-lg-6">
+				             <div class="form-group text-center">
+				                 <div>
+				                     <button class="btn btn-primary btn-block btn-lg btn-parsley" data-loading-text="正在提交...">提 交</button>
+				                 </div>
+				             </div>
+				        </div>
+				</shiro:hasPermission>
+				</c:if>
+		</form:form>
+		</div>
+
+	</div>
+	</div>
+</div>
+</div>
+</body>
+</html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/artificialJudgment.jsp

@@ -99,11 +99,17 @@
 							<tr>
 								<td class="width-15 active"><label class="pull-right">问题类型：</label></td>
 								<td class="width-35">
-									<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
+		<%--							<input type="checkbox" name="favorite" value="pass1"> 设计变更 &nbsp;
 									<input type="checkbox" name="favorite" value="pass2"> 项目关闭 &nbsp;
 									<input type="checkbox" name="favorite" value="pass3"> 行政政处（城区道路）
 									<input type="checkbox" name="favorite" value="pass5"> 农村政处
 									<input type="checkbox" name="favorite" value="pass6"> 民事政处/行政政处（公路/水利）
+--%>								<input type="checkbox" name="favorite" value="pass8"  <c:if test="${pass_construction7=='0'}">checked="checked"</c:if>/> 无问题 &nbsp;
+									<input type="checkbox" name="favorite" value="pass1" <c:if test="${pass_construction2=='0'}">checked="checked"</c:if>/> 设计变更 &nbsp;
+									<input type="checkbox" name="favorite" value="pass2" <c:if test="${pass_construction1=='0'}">checked="checked"</c:if>/> 项目关闭 &nbsp;
+									<input type="checkbox" name="favorite" value="pass3"  <c:if test="${pass_construction5=='0'}">checked="checked"</c:if>/> 行政政处（城区道路）
+									<input type="checkbox" name="favorite" value="pass5"  <c:if test="${pass_construction3=='0'}">checked="checked"</c:if>/> 农村政处
+									<input type="checkbox" name="favorite" value="pass6"  <c:if test="${pass_construction4=='0'}">checked="checked"</c:if>/> 民事政处/行政政处（公路/水利）
 								</td>
 							</tr>
 							<tr>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/designUpload.jsp

@@ -13,14 +13,8 @@
 
 			$("#agree").click(function () {
 				var currentFileValues = $("input[name='pic']").val();
-				var currentFileValues1 = $("input[name='pic1']").val();
-				var currentFileValues2 = $("input[name='pic2']").val();
 			 if (currentFileValues==""||currentFileValues==null) {
 					jp.error("请上传变更后图纸");
-				}else if (currentFileValues1==""||currentFileValues1==null) {
-					jp.error("请上传预算书");
-				}else if (currentFileValues2 == "" || currentFileValues2 == null) {
-					jp.error("请上传物资清册");
 				} else {
 				// alert(design);
 				jp.prompt("审核意见", function (message) {
@@ -33,8 +27,6 @@
 						"procDefId":"${uploadImages.act.procDefId}",
 						"flag":"yes",
 						"pic":currentFileValues,
-						"pic1":currentFileValues1,
-						"pic2": currentFileValues2,
 						"comment":window.encodeURI(message)
 					},
 					function (data) {
@@ -73,12 +65,6 @@
 						<table class="table table-bordered">
 							<tbody>
 							<tr>
-<%--
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>配网运行人员：</label></td>
-								<td class="width-35">
-								</td>
---%>
-
 <%--								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>申请人：</label></td>
 								<td class="width-35">
 									<input type='text'  name="userName" class="form-control required"  value="${construction.userName}"/>
@@ -88,16 +74,6 @@
 									<sys:fileUpload  path="pic" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
 								</td>
 							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>预算书：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic1" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>物资清册：</label></td>
-								<td class="width-35">
-									<sys:fileUpload  path="pic2" fileNumLimit="50" fileSizeLimit="50" value="${testPic.pic}" type="file" uploadPath="/list"></sys:fileUpload>
-								</td>
-							</tr>
 							</tbody>
 						</table>
 						<div class="form-group">

src/main/webapp/webpage/modules/sg/managementcenter/activiti/divideAudit.jsp

@@ -1,249 +1,354 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/webpage/include/taglib.jsp"%>
+<%@ include file="/webpage/include/taglib.jsp" %>
 <html>
 <head>
-	<title>施工单位交底界面</title>
-	<meta name="decorator" content="ani"/>
-	<!-- SUMMERNOTE -->
-	<%@include file="/webpage/include/summernote.jsp" %>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			jp.ajaxForm("#inputForm",function(data){
-				if(data.success){
-					jp.success(data.msg);
-					jp.go("${ctx}/managementcenter/divide");
-				}else{
-					jp.error(data.msg);
-					$("#inputForm").find("button:submit").button("reset");
-				}
-			});
+    <title>施工单位交底界面</title>
+    <meta name="decorator" content="ani"/>
+    <!-- SUMMERNOTE -->
+    <%@include file="/webpage/include/summernote.jsp" %>
+    <style type="text/css">
+        input::-webkit-input-placeholder {
+            color: red !important;
+        }
 
+        input::-moz-placeholder { /* Mozilla Firefox 19+ */
+            color: red !important;
+        }
 
-			$("#agree").click(function () {
-				jp.prompt("没有问题, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit2",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"flag":"yes",
-						"comment":window.encodeURI(message)
+        input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+            color: red !important;
+        }
 
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				})
-			})
+        input:-ms-input-placeholder { /* Internet Explorer 10-11 */
+            color: red !important;
+        }
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            jp.ajaxForm("#inputForm", function (data) {
+                if (data.success) {
+                    jp.success(data.msg);
+                    jp.go("${ctx}/managementcenter/divide");
+                } else {
+                    jp.error(data.msg);
+                    $("#inputForm").find("button:submit").button("reset");
+                }
+            });
 
+            $('select').change(function () {
+                var administrationType = $('#administrationType').val();
+                if (administrationType != '1.无') {
+                    $('#policyHandlingInstructions').attr('placeholder', '政策处理描述不能为空');
+                } else {
+                    $('#policyHandlingInstructions').removeAttr('placeholder');
+                }
+            })
 
-			$("#reject").click(function () {
-			var cId = $("#cId").val();
-				jp.prompt("存在问题, 审批意见", function (message) {
-					jp.post("${ctx}/act/task/audit2",
-					{
-						"taskId":"${construction.act.taskId}",
-						"taskName":"${construction.act.taskName}",
-						"taskDefKey":"${construction.act.taskDefKey}",
-						"procInsId":"${construction.act.procInsId}",
-						"procDefId":"${construction.act.procDefId}",
-						"cId":cId,
-						"flag":"no",
-						"comment":window.encodeURI(message)
-					},
-					function (data) {
-						if(data.success){
-							jp.success(data.msg);
-							jp.go("${ctx}/act/task/todo")
-						}
-					})
-				});
-			})
+            $('input').change(function () {
+                var implementedContent = $('#implementedContent').val();
+                if (implementedContent != '') {
+                    $('#inconsistentDescription').attr('placeholder', '图纸现场不一致描述不能为空');
+                } else {
+                    $('#inconsistentDescription').removeAttr('placeholder');
+                }
+            });
 
+            $("#agree").click(function () {
+                jp.prompt("没有问题, 审批意见", function (message) {
+                    jp.post("${ctx}/act/task/audit2",
+                    {
+                        "taskId": "${construction.act.taskId}",
+                        "taskName": "${construction.act.taskName}",
+                        "taskDefKey": "${construction.act.taskDefKey}",
+                        "procInsId": "${construction.act.procInsId}",
+                        "procDefId": "${construction.act.procDefId}",
+                        "flag": "yes",
+                        "comment": window.encodeURI(message)
 
-			$('#startTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			$('#endTime').datetimepicker({
-				format: "YYYY-MM-DD HH:mm:ss"
-			});
-			//富文本初始化
-			$('#reason').summernote({
-				height: 300,
-				lang: 'zh-CN',
-				readonly: true,
-				callbacks: {
-					onChange: function(contents, $editable) {
-						$("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
-					}
-				}
-			});
-		});
-	</script>
+                    },
+                    function (data) {
+                        if (data.success) {
+                            jp.success(data.msg);
+                            jp.go("${ctx}/act/task/todo")
+                        }
+                    })
+                });
+            })
+
+
+            $("#reject").click(function () {
+                var administrationType = $('#administrationType').val();
+                var implementedContent = $('#implementedContent').val();
+                var policyHandlingInstructions = $('#policyHandlingInstructions').val();
+                var inconsistentDescription = $('#inconsistentDescription').val();
+                var otherProblem = $('#otherProblem').val();
+                if (administrationType != '1.无') {
+                    if (policyHandlingInstructions == '') {
+                        jp.error('政策处理说明不能为空')
+                        return false;
+                    }
+                }
+                if (implementedContent != '') {
+                    if (inconsistentDescription == '') {
+                        jp.error('图纸现场不一致描述：');
+                        return false;
+                    }
+                }
+                var cId = $("#cId").val();
+                jp.prompt("存在问题, 审批意见", function (message) {
+                    jp.post("${ctx}/act/task/audit2",
+                        {
+                            "taskId": "${construction.act.taskId}",
+                            "taskName": "${construction.act.taskName}",
+                            "taskDefKey": "${construction.act.taskDefKey}",
+                            "procInsId": "${construction.act.procInsId}",
+                            "procDefId": "${construction.act.procDefId}",
+                            "disclose.otherProblem":otherProblem,
+                            "disclose.inconsistentDescription":inconsistentDescription,
+                            "disclose.policyHandlingInstructions":policyHandlingInstructions,
+                            "disclose.implementedContent":implementedContent,
+                            "administrationType":administrationType,
+                            "cId": cId,
+                            "flag": "no",
+                            "comment": window.encodeURI(message)
+                        },
+                        function (data) {
+                            if (data.success) {
+                                jp.success(data.msg);
+                                jp.go("${ctx}/act/task/todo")
+                            }
+                        })
+                });
+            })
+
+
+            $('#startTime').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+            $('#endTime').datetimepicker({
+                format: "YYYY-MM-DD HH:mm:ss"
+            });
+            //富文本初始化
+            $('#reason').summernote({
+                height: 300,
+                lang: 'zh-CN',
+                readonly: true,
+                callbacks: {
+                    onChange: function (contents, $editable) {
+                        $("input[name='reason']").val($('#reason').summernote('code'));//取富文本的值
+                    }
+                }
+            });
+        });
+    </script>
 </head>
 <body>
 <div class="wrapper wrapper-content">
-	<div class="row">
-		<div class="col-md-12">
-			<div class="panel panel-primary">
-				<div class="panel-heading">
-					<h3 class="panel-title">
-						<a class="panelButton"  href="#"  onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
-					</h3>
-				</div>
-				<div class="panel-body">
-					<div class="form-group text-center">
-						<%--<h3>${oALeave.act.taskName}</h3>--%>
-					</div>
-					<form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save" method="post" class="form-horizontal">
-						<form:hidden path="id"/>
-						<input id="cId" type="hidden" value="${construction.id}">
-<%--						<input type="text" value="${construction.disclose.channel}">--%>
-						<table class="table table-bordered">
-							<tbody>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目号：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectId)}
-								</td>
-								<td class="width-15 active"><label class="pull-right">项目名称：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectName)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
-								<td class="width-35">
-									<fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">停电线路：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerLine)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.blackoutArea)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">项目类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.projectType)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.preliminaryJudgment)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.civilEngineering)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.baseType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.planApproval)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationType)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.transformationEquipment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.newNamed)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.putInto)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.electricalConstruction)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.theAssignment)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.automation)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.remote)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>通信方式：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.communicationMode)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.inSitu)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.networkCabinet)}
-								</td>
-							</tr>
-							<tr>
-								<td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.station)}
-								</td>
-								<td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label></td>
-								<td class="width-35">
-										${fns:unescapeHtml(construction.powerFailure)}
-								</td>
-							</tr>
-							</tbody>
-						</table>
-					</form:form>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <h3 class="panel-title">
+                        <a class="panelButton" href="#" onclick="history.go(-1)"><i class="ti-angle-left"></i> 返回</a>
+                    </h3>
+                </div>
+                <div class="panel-body">
+                    <div class="form-group text-center">
+                        <%--<h3>${oALeave.act.taskName}</h3>--%>
+                    </div>
+                    <form:form id="inputForm" modelAttribute="construction" action="${ctx}/managementcenter/divide/save"
+                               method="post" class="form-horizontal">
+                        <form:hidden path="id"/>
+                        <input id="cId" type="hidden" value="${construction.id}">
+                        <%--						<input type="text" value="${construction.disclose.channel}">--%>
+                        <table class="table table-bordered">
+                            <tbody>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目号：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectId)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">项目名称：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectName)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">接收图纸时间：</label></td>
+                                <td class="width-35">
+                                    <fmt:formatDate value="${construction.acceptDate}" pattern="yyyy-MM-dd HH:mm:ss"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">其他问题描述：</label></td>
+                                <td class="width-35">
+                                    <form:input id="otherProblem" path="disclose.otherProblem" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">政处类型：</label></td>
+                                <td class="width-35">
+                                    <form:select id="administrationType" path="disclose.administrationType"
+                                                 cssClass="form-control">
+                                        <form:option value="1.无"/>
+                                        <form:option value="2.农村政处"/>
+                                        <form:option value="3.民事政处/行政政处（公路/水利）"/>
+                                        <form:option value="4.行政政处（城区道路）"/>
+                                        <form:option value="5.农村政处;民事政处/行政政处（公路/水利）"/>
+                                        <form:option value="6.农村政处;行政政处（城区道路）"/>
+                                        <form:option value="7.民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
+                                        <form:option value="8.农村政处;民事政处/行政政处（公路/水利）;行政政处（城区道路）"/>
+                                    </form:select>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right">政策处理描述：</label></td>
+                                <td class="width-35">
+                                    <form:input id="policyHandlingInstructions"
+                                                path="disclose.policyHandlingInstructions" cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">已实施内容描述</label></td>
+                                <td class="width-35">
+									<form:input id="implementedContent" path="disclose.implementedContent" cssClass="form-control"/>
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"> 图纸现场不一致描述：</label></td>
+                                <td class="width-35">
+                                    <form:input id="inconsistentDescription" path="disclose.inconsistentDescription"
+                                                cssClass="form-control"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">停电线路：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.powerLine)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>停电范围（中间统一用中文分号）：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.blackoutArea)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">项目类型：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.projectType)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>政处初步判断：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.preliminaryJudgment)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否含土建（不含钢管杆）：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.civilEngineering)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>钢管杆基础类型：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.baseType)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否需要规划报批（150米及以上土建）：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.planApproval)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>设备改造类型：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.transformationType)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">改造设备尺寸及间隔数：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.transformationEquipment)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含新设备命名：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.newNamed)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">是否含变电站新间隔投运：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.putInto)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含非涉电电气施工：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.electricalConstruction)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">图纸标注的带电作业情况：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.theAssignment)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否含自动化：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.automation)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">二遥或三遥：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.remote)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font
+                                        color="red">*</font>通信方式：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.communicationMode)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">柱开集中或就地：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.inSitu)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>环网柜DTU户外或户内：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.networkCabinet)}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="width-15 active"><label class="pull-right">站房DTU：</label></td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.station)}
+                                </td>
+                                <td class="width-15 active"><label class="pull-right"><font color="red">*</font>是否为停电打包项目：</label>
+                                </td>
+                                <td class="width-35">
+                                        ${fns:unescapeHtml(construction.powerFailure)}
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </form:form>
 
-						<div class="row">
-							<div class="col-sm-3"></div>
-							<div class="col-sm-6">
-								<div class="form-group text-center">
-									<input id="reject" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="存在问题" />
-									<input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit" value="没有问题" />&nbsp;
-								</div>
-							</div>
-						</div>
+                    <div class="row">
+                        <div class="col-sm-3"></div>
+                        <div class="col-sm-6">
+                            <div class="form-group text-center">
+                                <input id="reject" class="btn  btn-primary btn-lg btn-danger" type="submit"
+                                       value="存在问题"/>
+                                <input id="agree" class="btn  btn-primary btn-lg btn-parsley" type="submit"
+                                       value="没有问题"/>&nbsp;
+                            </div>
+                        </div>
+                    </div>
 
-					<c:if test="${not empty construction.id}">
-						<act:flowChart procInsId="${construction.act.procInsId}"/>
-						<act:histoicFlow procInsId="${construction.act.procInsId}" />
-					</c:if>
-				</div>
-			</div>
-		</div>
-	</div>
+                    <c:if test="${not empty construction.id}">
+                        <act:flowChart procInsId="${construction.act.procInsId}"/>
+                        <act:histoicFlow procInsId="${construction.act.procInsId}"/>
+                    </c:if>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </body>
 </html>

src/main/webapp/webpage/modules/sg/managementcenter/activiti/uploadList.js

@@ -84,27 +84,7 @@ $(document).ready(function() {
 				   {
 					checkbox: true
 					},
-				   /*{
-				   field: 'uId',
-				   title: '标题',
-				   sortable: true,
-				   sortName: 'uId'
-				   ,formatter:function(value, row , index){
-					   value = jp.unescapeHTML(value);
-				   <c:choose>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:edit')}">
-					   return "<a href='javascript:edit(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:when test="${fns:hasPermission('test:pic:testPic:view')}">
-					   return "<a href='javascript:view(\""+row.id+"\")'>"+value+"</a>";
-				   </c:when>
-					   <c:otherwise>
-					   return value;
-				   </c:otherwise>
-					   </c:choose>
-				   }
-
-			   },*/{
+				   {
 		        field: 'path',
 		        title: '图片路径',
 		        sortable: true,
@@ -129,10 +109,10 @@ $(document).ready(function() {
 				   sortable: true,
 				   sortName: 'uId',
 			   },{
-					   field: 'procInsId',
-					   title: '流程id',
+					   field: 'imgName',
+					   title: '文件用途',
 					   sortable: true,
-					   sortName: 'procInsId',
+					   sortName: 'imgName',
 				   },{
 					   field: 'projectName',
 					   title: '项目名称',