Forráskód Böngészése

外部单位-项目调整

sangwenwei 9 hónapja
szülő
commit
16fea5ee18
20 módosított fájl, 154 hozzáadás és 45 törlés
  1. 9 0
      src/main/java/com/jeeplus/modules/act/web/ActTaskController.java
  2. 28 0
      src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitProjectRecordsService.java
  3. 1 0
      src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitCapitalDemandController.java
  4. 1 1
      src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitFeedbackController.java
  5. 14 0
      src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitProjectRecordsController.java
  6. 1 0
      src/main/java/com/jeeplus/modules/workactivity/dao/WorkActivityProcessDao.java
  7. 3 0
      src/main/java/com/jeeplus/modules/workactivity/service/WorkActivityProcessService.java
  8. 4 1
      src/main/resources/mappings/modules/externalUnit/ExternalUnitProjectRecordsDao.xml
  9. 28 0
      src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml
  10. 1 1
      src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAdd.jsp
  11. 1 1
      src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAudit.jsp
  12. 10 1
      src/main/webapp/webpage/modules/externalUnit/capitalDemandFormModify.jsp
  13. 1 1
      src/main/webapp/webpage/modules/externalUnit/capitalDemandFormView.jsp
  14. 4 4
      src/main/webapp/webpage/modules/externalUnit/externalUnitCapitalDemandList.jsp
  15. 4 4
      src/main/webapp/webpage/modules/externalUnit/externalUnitFeedbackList.jsp
  16. 0 3
      src/main/webapp/webpage/modules/externalUnit/externalUnitFileForm.jsp
  17. 26 18
      src/main/webapp/webpage/modules/externalUnit/externalUnitProjectFile.jsp
  18. 7 8
      src/main/webapp/webpage/modules/externalUnit/externalUnitProjectRecordsList.jsp
  19. 9 0
      src/main/webapp/webpage/modules/externalUnit/feedbackFormModify.jsp
  20. 2 2
      src/main/webapp/webpage/modules/externalUnit/feedbackFormView.jsp

+ 9 - 0
src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -138,6 +138,15 @@ public class ActTaskController extends BaseController {
 			List<Act> histoicFlowList = actTaskService.histoicFlowList(act.getProcInsId(), startAct, endAct);
 			histoicFlows = getList(histoicFlowList);*/
 			List<WorkActivityProcess> list = workActivityProcessService.findByProcInsId(workActivityProcess);
+			//当为外部单位-意见反馈的时候,需要将全部的流程节点信息查出
+			if (list.size()>0){
+				WorkActivityProcess process = list.get(0);
+				if (process.getProcessKey().equals("feedback")){
+					list = workActivityProcessService.findExterByProcInsId(workActivityProcess);
+				}
+			}
+
+
 			workActivityProcess.setIsApproval("0");
 			List<WorkActivityProcess> lists = workActivityProcessService.findByProcInsIdAudit(workActivityProcess);
 			List<WorkActivityProcess> beginList = workActivityProcessService.findByProcInsIdAndIsApproval(workActivityProcess);

+ 28 - 0
src/main/java/com/jeeplus/modules/externalUnit/service/ExternalUnitProjectRecordsService.java

@@ -262,4 +262,32 @@ public class ExternalUnitProjectRecordsService extends CrudService<ExternalUnitP
         List<User> members = unitProjectRecordsDao.isDelFalg(projectId, "");
         return members;
     }
+
+    /**
+     * 删除
+     * @param projectRecords
+     * @return
+     */
+    public String deleteById(ExternalUnitProjectRecords projectRecords) {
+        //根据id查询项目下午其他关联
+        //文件信息
+        WorkClientAttachment workClientAttachment = new WorkClientAttachment();
+        workClientAttachment.setAttachmentId(projectRecords.getId());
+        workClientAttachment.setAttachmentFlag("160");
+        workClientAttachment.setDivIdType("_exterNoProcess");
+        List<WorkClientAttachment> attachmentList = workattachmentService.getAttachmentListExter(workClientAttachment);
+        //提资需求
+        ExternalUnitCapitalDemand capitalDemand = new ExternalUnitCapitalDemand();
+        capitalDemand.setProjectId(projectRecords.getId());
+        List<ExternalUnitCapitalDemand> demandDaoByProId = capitalDemandDao.findByProId(capitalDemand);
+        //意见反馈
+        ExternalUnitFeedback feedback = new ExternalUnitFeedback();
+        feedback.setProjectId(projectRecords.getId());
+        List<ExternalUnitFeedback> byProId = feedbackDao.findByProId(feedback);
+        if (byProId != null || demandDaoByProId != null || attachmentList != null){
+            return "该项目下存在信息,无法删除";
+        }
+        unitProjectRecordsDao.delete(projectRecords);
+        return "删除成功";
+    }
 }

+ 1 - 0
src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitCapitalDemandController.java

@@ -136,6 +136,7 @@ public class ExternalUnitCapitalDemandController extends BaseController {
 
         model.addAttribute("capitalDemand", capitalDemand);
         model.addAttribute("projectMembers", users);
+        model.addAttribute("processInstanceId", capitalDemand.getProcessInstanceId());
         return "modules/externalUnit/" + view;
     }
 

+ 1 - 1
src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitFeedbackController.java

@@ -115,7 +115,7 @@ public class ExternalUnitFeedbackController extends BaseController {
         ExternalUnitProjectRecords externalUnitProjectRecords = unitProjectRecordsService.get(feedback.getProjectId());
         feedback.setProject(externalUnitProjectRecords);
 
-
+        model.addAttribute("processInstanceId", feedback.getProcessInstanceId());
         model.addAttribute("feedback", feedback);
         return "modules/externalUnit/" + view;
     }

+ 14 - 0
src/main/java/com/jeeplus/modules/externalUnit/web/ExternalUnitProjectRecordsController.java

@@ -16,6 +16,7 @@ import com.jeeplus.modules.externalUnit.entity.ExternalUnitProjectRecords;
 import com.jeeplus.modules.externalUnit.service.ExternalUnitCapitalDemandService;
 import com.jeeplus.modules.externalUnit.service.ExternalUnitProjectRecordsService;
 
+import com.jeeplus.modules.modules.entity.ModuleChoose;
 import com.jeeplus.modules.ruralprojectrecords.entity.SubProjectInfo;
 import com.jeeplus.modules.signatureManagement.electronicSignature.entity.DistrictDirectorApplication;
 import com.jeeplus.modules.sys.entity.MainDictDetail;
@@ -304,6 +305,19 @@ public class ExternalUnitProjectRecordsController extends BaseController {
         return ajaxJson;
     }
 
+    /**
+     * 删除
+     * @param projectRecords
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "delete")
+    public String delete(ExternalUnitProjectRecords projectRecords, RedirectAttributes redirectAttributes) {
+        String data = unitProjectRecordsService.deleteById(projectRecords);
+        addMessage(redirectAttributes, data);
+        return "redirect:"+Global.getAdminPath()+"/externalUnit/externalUnit/?repage";
+    }
+
 
 
 

+ 1 - 0
src/main/java/com/jeeplus/modules/workactivity/dao/WorkActivityProcessDao.java

@@ -20,6 +20,7 @@ public interface WorkActivityProcessDao extends CrudDao<WorkActivityProcess> {
 
     List<WorkActivityProcess> findByKeyAndCount(WorkActivityProcess workActivityProcess);
     List<WorkActivityProcess> findByProcInsId(WorkActivityProcess workActivityProcess);
+    List<WorkActivityProcess> findExterByProcInsId(WorkActivityProcess workActivityProcess);
     List<WorkActivityProcess> findByProcInsIdAudit(WorkActivityProcess workActivityProcess);
     List<WorkActivityProcess> findByProcInsIdAndIsApproval(WorkActivityProcess workActivityProcess);
     List<WorkActivityProcess> findByProcInsIdAndIsApprovalOnList(WorkActivityProcess workActivityProcess);

+ 3 - 0
src/main/java/com/jeeplus/modules/workactivity/service/WorkActivityProcessService.java

@@ -40,6 +40,9 @@ public class WorkActivityProcessService extends CrudService<WorkActivityProcessD
 	public List<WorkActivityProcess> findByProcInsId(WorkActivityProcess workActivityProcess) {
 		return dao.findByProcInsId(workActivityProcess);
 	}
+	public List<WorkActivityProcess> findExterByProcInsId(WorkActivityProcess workActivityProcess) {
+		return dao.findExterByProcInsId(workActivityProcess);
+	}
 	public List<WorkActivityProcess> findByProcInsIdAudit(WorkActivityProcess workActivityProcess) {
 		return dao.findByProcInsIdAudit(workActivityProcess);
 	}

+ 4 - 1
src/main/resources/mappings/modules/externalUnit/ExternalUnitProjectRecordsDao.xml

@@ -187,7 +187,10 @@
 		where id = #{id}
 	</update>
 
-
+	<update id="delete">
+		DELETE FROM external_unit_project_records
+		WHERE id = #{id}
+	</update>
 
 
 

+ 28 - 0
src/main/resources/mappings/modules/workactivity/WorkActivityProcessDao.xml

@@ -156,6 +156,34 @@
 		</where>
 	</select>
 
+	<select id="findExterByProcInsId" resultType="WorkActivityProcess" >
+		SELECT
+		<include refid="workActivityProcessColumns"/>,
+		w.name AS "activity.name",
+		w.user_id AS "activity.user.id",
+		w.role_enname AS "activity.role.enname",
+		w.is_approval AS "activity.isApproval"
+		FROM work_activity_process a
+		LEFT JOIN work_activity w ON w.process_key = a.process_key
+		<include refid="workActivityProcessJoins"/>
+		<where>
+			a.del_flag = #{DEL_FLAG_NORMAL} and w.del_flag = #{DEL_FLAG_NORMAL}
+			<if test="processInstanceId != null and processInstanceId != ''">
+				and a.process_instance_id = #{processInstanceId}
+			</if>
+			<choose>
+				<when test="isApproval != null and isApproval != ''">
+					AND a.is_approval = 0
+					ORDER BY  a.count ASC
+				</when>
+				<otherwise>
+					AND a.is_approval != 0
+					ORDER BY a.update_date ASC
+				</otherwise>
+			</choose>
+		</where>
+	</select>
+
 	<select id="findByProcInsIdAudit" resultMap="workActivityProcessResult" >
 		SELECT
 		<include refid="workActivityProcessColumns"/>,

+ 1 - 1
src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAdd.jsp

@@ -88,7 +88,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label ">备注:</label>
+					<label class="layui-form-label ">项目备注:</label>
 					<div class="layui-input-block">
 						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>

+ 1 - 1
src/main/webapp/webpage/modules/externalUnit/capitalDemandFormAudit.jsp

@@ -162,7 +162,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label ">备注:</label>
+					<label class="layui-form-label ">项目备注:</label>
 					<div class="layui-input-block">
 						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>

+ 10 - 1
src/main/webapp/webpage/modules/externalUnit/capitalDemandFormModify.jsp

@@ -87,7 +87,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label ">备注:</label>
+					<label class="layui-form-label ">项目备注:</label>
 					<div class="layui-input-block">
 						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
@@ -110,6 +110,15 @@
 					</div>
 				</div>
 			</div>
+			<div>
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<act:flowChart procInsId="${processInstanceId}"/>
+						<act:histoicFlow procInsId="${processInstanceId}"/>
+					</div>
+				</div>
+			</div>
 	</form:form>
 	</div>
 </div>

+ 1 - 1
src/main/webapp/webpage/modules/externalUnit/capitalDemandFormView.jsp

@@ -162,7 +162,7 @@
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
-					<label class="layui-form-label ">备注:</label>
+					<label class="layui-form-label ">项目备注:</label>
 					<div class="layui-input-block">
 						<form:textarea disabled="true" placeholder="请输入备注" readonly="true" path="project.remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>

+ 4 - 4
src/main/webapp/webpage/modules/externalUnit/externalUnitCapitalDemandList.jsp

@@ -296,11 +296,11 @@
 						return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/externalUnit/capitalDemand/detail?id=" + d.id +"','95%', '95%')\">" + d.projectName + "</a>";
 					}}
 				,{field:'remarks',align:'center', title: '备注', minWidth:150}
-				,{field:'createName',align:'center', title: '创建人', minWidth:150,templet:function(d){
+				,{field:'createName',align:'center', title: '创建人', width:150,templet:function(d){
 						return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
 					}}
-				,{field:'packTime',align:'center', title: '创建时间', minWidth:150}
-				,{field:'status',align:'center', title: '状态', minWidth:150,templet:function(d){
+				,{field:'packTime',align:'center', title: '创建时间', width:150}
+				,{field:'status',align:'center', title: '状态', width:120,templet:function(d){
 						var st = directorApplicationState(d.status);
 						if(st.action)
 							var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/externalUnit/capitalDemand/getDemandProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -308,7 +308,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{field:'op',align:'center',title:"操作",minWidth:130,templet:function(d){
+				,{field:'op',align:'center',title:"操作",width:130,templet:function(d){
 						////对操作进行初始化
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedits != undefined && d.canedits =="1")

+ 4 - 4
src/main/webapp/webpage/modules/externalUnit/externalUnitFeedbackList.jsp

@@ -268,11 +268,11 @@
 				,{field:'projectName',align:'center', title: '项目名称',minWidth:200,templet:function(d){
 						return "<a class=\"attention-info\" title=\"" + d.projectName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看意见反馈信息', '${ctx}/externalUnit/feedback/detail?id=" + d.id +"','95%', '95%','inputForm',' layui-border-box')\">" + d.projectName + "</a>";
 					}}
-				,{field:'createName',align:'center', title: '创建人', minWidth:150,templet:function(d){
+				,{field:'createName',align:'center', title: '创建人', width:200,templet:function(d){
 						return "<span title=\"" + d.createName + "\">" + d.createName + "</span>";
 					}}
-				,{field:'packTime',align:'center', title: '创建时间', minWidth:150}
-				,{field:'status',align:'center', title: '状态', minWidth:150,templet:function(d){
+				,{field:'packTime',align:'center', title: '创建时间', width:200}
+				,{field:'status',align:'center', title: '状态', width:150,templet:function(d){
 						var st = directorApplicationState(d.status);
 						if(st.action)
 							var xml ="<span onclick=\"openDialogView('流程追踪', '${ctx}/externalUnit/feedback/getProcess?id=" + d.id + "','95%','95%')\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
@@ -280,7 +280,7 @@
 							var xml = "<span style=\"cursor:default;\" class=\"status-label status-label-" + st.label + "\" >" + st.status + "</span>";
 						return xml;
 					}}
-				,{field:'op',align:'center',title:"操作",minWidth:130,templet:function(d){
+				,{field:'op',align:'center',title:"操作",width:180,templet:function(d){
 						////对操作进行初始化
 						var xml="<div class=\"layui-btn-group\">";
 						if(d.canedits != undefined && d.canedits =="1")

+ 0 - 3
src/main/webapp/webpage/modules/externalUnit/externalUnitFileForm.jsp

@@ -252,9 +252,6 @@
 										   onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"
 										   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
 									</c:if>
-									<c:if test="${workClientAttachment.collectFlag != 1}">
-										<a href="javascript:void(0)" onclick="collectingAccessory(this,'${ctx}/projectAccessory/projectAccessory/saveCollectAccessory','${workClientAttachment.url}','${workClientAttachment.createBy.id}','${workClientAttachment.fileSize}')" class="op-btn layui-btn-warm" >&nbsp;收藏</a>
-									</c:if>
 								</div>
 							</td>
 						</tr>

+ 26 - 18
src/main/webapp/webpage/modules/externalUnit/externalUnitProjectFile.jsp

@@ -115,7 +115,7 @@
 						top.layer.close(index);//关闭对话框。
 						setTimeout(function(){top.layer.close(index)}, 100);//延时0.1秒,对应360 7.1版本bug
 					}
-					window.location.reload();
+					search()
 				},
 				btn2: function(index){
 				}
@@ -179,7 +179,7 @@
 						</div>
 						<div class="layui-item query athird ">
 							<label class="layui-form-label">提交人:</label>
-							<div class="layui-input-block">
+							<div class="layui-input-block with-icon">
 								<sys:inquireselectUserNotReadolny id="create" name="fileSubmiter" value="${externalUnitProjectRecords.fileSubmiter}" labelName="fileSubmiterName" labelValue="${externalUnitProjectRecords.fileSubmiterName}"
 																  title="用户" url="/sys/office/treeDataAll?type=3" cssClass="form-control required layui-input" allowClear="true" notAllowSelectParent="true"/>
 							</div>
@@ -227,20 +227,20 @@
 				<table id="listAttachment" class="table table-bordered table-condensed details">
 					<thead>
 					<tr>
-						<%-- <th>序号</th>--%>
-						<th width="25%">文件名称</th>
-						<th width="25%">文件类型</th>
-						<th width="25%">上传人</th>
-						<th width="25%">上传时间</th>
-						<th width="25%">备注</th>
-						<th width="25%">状态</th>
+						 <th width="80px">序号</th>
+						<th minWidth="200px">文件名称</th>
+						<th width="100px">文件类型</th>
+						<th width="150px">上传人</th>
+						<th width="150px">上传时间</th>
+						<th width="180px">备注</th>
+						<th width="130px">状态</th>
 						<th width="150px">操作</th>
 					</tr>
 					</thead>
 					<tbody id="file_attachment">
 					<c:forEach items="${page.list}" var = "workClientAttachment" varStatus="status">
 						<tr class="trIdAdds">
-								<%-- <td>${status.index + 1}</td>--%>
+								 <td>${status.index + 1}</td>
 							<c:choose>
 								<c:when test="${workClientAttachment.uploadMode == 2}">
 									<c:choose>
@@ -291,18 +291,26 @@
 							<td><fmt:formatDate value="${workClientAttachment.createDate}" type="both"/></td>
 							<td>${workClientAttachment.remarks}</td>
 							<td>
-								<c:choose>
-									<c:when test="${workClientAttachment.divIdType == '_exterNoProcess'}">
-										<span>无流程</span>
-									</c:when>
-									<c:otherwise>
-										<a  onclick="openDialogView('流程追踪', '${ctx}/externalUnit/capitalDemand/getDemandProcess?id=${workClientAttachment.attachmentId}','95%','95%')">有流程</a>
-									</c:otherwise>
-								</c:choose>
+								<div class="">
+									<c:choose>
+										<c:when test="${workClientAttachment.divIdType == '_exterNoProcess'}">
+											<span style="display: inline-block; border: 1px solid black; padding: 2px; border-radius: 5px; color: black; cursor: default;text-align: center;" class="status-label status-label-no-process">无流程</span>
+										</c:when>
+										<c:otherwise>
+											<span style="display: inline-block; border: 1px solid #2196f3; padding: 2px; border-radius: 5px; color: #2196f3; cursor: pointer;text-align: center;" class="status-label status-label-with-process" onclick="openDialogView('流程追踪', '${ctx}/externalUnit/capitalDemand/getDemandProcess?id=${workClientAttachment.attachmentId}','95%','95%')">有流程</span>
+										</c:otherwise>
+									</c:choose>
+								</div>
+
 							</td>
 							<td class="op-td">
 								<div class="op-btn-box" >
 									<a href="javascript:location.href='${ctx}/workfullmanage/workFullManage/downLoadAttach?file='+encodeURIComponent('${workClientAttachment.url}');" class="op-btn op-btn-download"><i class="fa fa-download"></i>&nbsp;下载</a>
+									<c:if test="${workClientAttachment.createBy.id eq fns:getUser().id}">
+										<a href="javascript:void(0)"
+										   onclick="deleteFileFromAliyun(this,'${ctx}/sys/workattachment/deleteFileFromAliyun?url=${workClientAttachment.url}&id=${workClientAttachment.id}&type=2','addFile')"
+										   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>&nbsp;删除</a>
+									</c:if>
 								</div>
 							</td>
 						</tr>

+ 7 - 8
src/main/webapp/webpage/modules/externalUnit/externalUnitProjectRecordsList.jsp

@@ -239,17 +239,17 @@
             ,elem: '#contentTable'
             ,page: false
             ,cols: [[
-                {field:'index',align:'center', title: '序号',minWidth:40}
+                {field:'index',align:'center', title: '序号',width:80}
                 ,{field:'name',align:'center', title: '项目名称',minWidth:150,templet:function(d){
                         var xml = "<a class=\"attention-info\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目信息', '${ctx}/externalUnit/externalUnit/detail?id=" + d.id +"','95%','95%')\">" +
                             "<span title=" + d.name + ">" + d.name + "</span></a>";
                         return xml;
                     }}
-                ,{field:'projectBuilder',align:'center', title: '建设方',minWidth:120}
-                ,{field:'buildPlace',align:'center', title: '建设地点', minWidth:120}
-                ,{field:'userName',align:'center', title: '创建人', minWidth:120}
-                ,{field:'createDate',align:'center', title: '创建时间', minWidth:120}
-                ,{field:'op',align:'center',title:"操作",minWidth:130,templet:function(d){
+                ,{field:'projectBuilder',align:'center', title: '建设方',width:180}
+                ,{field:'buildPlace',align:'center', title: '建设地点', width:180}
+                ,{field:'userName',align:'center', title: '创建人', width:100}
+                ,{field:'createDate',align:'center', title: '创建时间', width:100}
+                ,{field:'op',align:'center',title:"操作",width:150,templet:function(d){
                         ////对操作进行初始化
                         var xml = "<div class=\"layui-btn-group\">";
 
@@ -257,8 +257,7 @@
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialog('修改项目信息', '${ctx}/externalUnit/externalUnit/form?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>"
 
                         if(d.candelete != undefined && d.candelete == "1")
-                            xml +="<a href=\"javascript:void(0)\" onclick=\"deleteFun('${ctx}/workclientinfo/workClientInfo/delete?id=" + d.id + "')\"   class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
-
+                            xml+="<a href=\"${ctx}/externalUnit/externalUnit/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗?', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
                         if (d.isMember != undefined && d.isMember == "1")
                             xml +="<a href=\"javascript:void(0)\" onclick=\"openDialogNow('查看项目-"+d.name+"', '${ctx}/externalUnit/externalUnit/projectFile?id=" + d.id + "','95%','95%')\" class=\"layui-btn layui-btn-xs layui-bg-blue\" >项目文件</a>"
 

+ 9 - 0
src/main/webapp/webpage/modules/externalUnit/feedbackFormModify.jsp

@@ -339,6 +339,15 @@
 					</tbody>
 				</table>
 			</div>
+			<div>
+				<div class="form-group layui-row">
+					<div class="form-group-label"><h2>${projectNotifyType}审批流程</h2></div>
+					<div class="layui-item layui-col-xs12 form-table-container" >
+						<act:flowChart procInsId="${processInstanceId}"/>
+						<act:histoicFlow procInsId="${processInstanceId}"/>
+					</div>
+				</div>
+			</div>
 	</form:form>
 	</div>
 </div>

+ 2 - 2
src/main/webapp/webpage/modules/externalUnit/feedbackFormView.jsp

@@ -128,13 +128,13 @@
 				<div class="layui-item layui-col-sm6 lw7">
 					<label class="layui-form-label"><span class="require-item">*</span>审核人:</label>
 					<div class="layui-input-block">
-						<div id="shr"  style="pointer-events: none; background-color: #fff" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
+						<div id="shr" style="pointer-events: none; background-color: #fff" class="xm-select-demo" tabindex="0" contenteditable="true"></div>
 					</div>
 				</div>
 				<div class="layui-item layui-col-sm12 lw7 with-textarea">
 					<label class="layui-form-label ">备注:</label>
 					<div class="layui-input-block">
-						<form:textarea placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
+						<form:textarea disabled="true" placeholder="请输入备注" path="remarks" htmlEscape="false" rows="4"  maxlength="255"  class="form-control "/>
 					</div>
 				</div>
 			</div>