报告签章列表调整

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/controller/ProjectReportSignatureWorkController.java

@@ -576,10 +576,6 @@ public class ProjectReportSignatureWorkController extends BaseController {
         }
         try {
             String str = "";
-            if (StringUtils.isBlank(projectReportSignature.getSignatureType())){
-                addMessage(redirectAttributes, "签章类型未选择,无法保存");
-                return "redirect:"+Global.getAdminPath()+"/projectReport/projectReportSignature/?repage";
-            }
             if (!projectReportSignature.getIsNewRecord()) {//编辑表单保存
                 ProjectReportSignatureWork t = projectReportSignatureService.get(projectReportSignature.getId());//从数据库取出记录的值
                 ReportSignature approvalBySigId = projectReportSignatureService.getReportBySigId(t.getId());

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/dao/ProjectReportSignatureWorkDao.java

@@ -145,4 +145,6 @@ public interface ProjectReportSignatureWorkDao extends CrudDao<ProjectReportSign
     void updateReportSignatureSignature(ReportSignature signature);
     //修改审定单签章信息(签章参数)
     void updateApprovalSignatureSignature(ReportSignature signature);
+
+    List<User> getDutyPersons();
 }

src/main/java/com/jeeplus/modules/signature/projectReportSignatureWork/service/ProjectReportSignatureWorkService.java

@@ -207,12 +207,30 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
     }
 
     public Page<ProjectReportSignatureWork> findPage(Page<ProjectReportSignatureWork> page, ProjectReportSignatureWork projectReportSignature) {
+        User user = UserUtils.getUser();
         //设置数据权限
-        if(!UserUtils.getUser().isAdmin()) {
+        if(!user.isAdmin()) {
             String dataScopeSql = null;
-            dataScopeSql = dataScopeFilter(projectReportSignature.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PROJECT_REPORT_WORK.getValue());
-            projectReportSignature.getSqlMap().put("dsf", dataScopeSql);
+            //获取签章责任人列表
+            List<User> dutyPersons = dao.getDutyPersons();
+            //判断当前登录人是否是签章责任人
+            boolean isDutyPerson = false;
+            for (User dutyPerson : dutyPersons) {
+                if (dutyPerson.getId().equals(user.getId())){
+                    isDutyPerson = true;
+                    break;
+                }
+            }
+            if (isDutyPerson){
+                    projectReportSignature.getSqlMap().put("dutyPerson",user.getId());
+            }else {
+                dataScopeSql = dataScopeFilter(projectReportSignature.getCurrentUser(), "o", "u", "s", MenuStatusEnum.PROJECT_REPORT_WORK.getValue());
+                projectReportSignature.getSqlMap().put("dsf", dataScopeSql);
+
+            }
             projectReportSignature.getSqlMap().put("delFlag", "AND a.del_flag = 0");
+
+
         }
         if(null!= projectReportSignature.getOffice() && StringUtils.isNotBlank(projectReportSignature.getOffice().getId())){
             //查询该选择节点下所有的部门Id
@@ -2746,11 +2764,11 @@ public class ProjectReportSignatureWorkService extends CrudService<ProjectReport
         Integer projectRecords=dao.checkProject(id);
         return projectRecords;
     }
-
+    @Transactional(readOnly = false)
     public void deleteApproval(ReportSignature projectReportSignature) {
         dao.deleteApprovalSignature(projectReportSignature.getId());
     }
-
+    @Transactional(readOnly = false)
     public void deleteReport(ReportSignature projectReportSignature) {
         dao.deleteReportSignature(projectReportSignature.getId());
     }

src/main/resources/mappings/modules/signature/projectReport/ProjectReportSignatureDao.xml

@@ -213,6 +213,9 @@
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ( a.company_id = #{currentUser.company.id} ${sqlMap.dsf} )
 			</if>
+			<if test="sqlMap.dutyPerson !=null and sqlMap.dutyPerson!=''">
+				AND ( a.create_by = #{sqlMap.dutyPerson} or rsr.duty_person = #{sqlMap.dutyPerson} or rsa.duty_person = #{sqlMap.dutyPerson})
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -230,11 +233,22 @@
 		<include refid="dailyOfficeWorkLeftColumns"/>
 		left join rural_project_records rpr on a.project_id = rpr.id
 		left join project_report_data prd on prd.project_id = a.project_id
+		left join report_signature_report rsr on a.id = rsr.signature_id and rsr.del_flag = '0'
+		left join report_signature_approval rsa on a.id = rsa.signature_id and rsa.del_flag = '0'
 		<where>
 			a.del_flag = 0
 			<if test="signatureName != null and signatureName != ''">
 				AND a.signature_name like concat('%',#{signatureName},'%')
 			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.projectName != null and reportSignatureRelation.projectName != ''">
+				AND rpr.project_name like concat('%',#{reportSignatureRelation.projectName},'%')
+			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.projectNum != null and reportSignatureRelation.projectNum != ''">
+				AND rpr.project_id like concat('%',#{reportSignatureRelation.projectNum},'%')
+			</if>
+			<if test="reportSignatureRelation != null and reportSignatureRelation.reportDataNum != null and reportSignatureRelation.reportDataNum != ''">
+				AND prd.number like concat('%',#{reportSignatureRelation.reportDataNum},'%')
+			</if>
 			<if test="number != null and number != ''">
 				AND a.number like concat('%',#{number},'%')
 			</if>
@@ -267,6 +281,9 @@
 			<if test="sqlMap.dsf !=null and sqlMap.dsf!=''">
 				AND ( a.company_id = #{currentUser.company.id} ${sqlMap.dsf} )
 			</if>
+			<if test="sqlMap.dutyPerson !=null and sqlMap.dutyPerson!=''">
+				AND ( a.create_by = #{sqlMap.dutyPerson} or rsr.duty_person = #{sqlMap.dutyPerson} or rsa.duty_person = #{sqlMap.dutyPerson})
+			</if>
 		</where>
 	</select>
 
@@ -793,4 +810,16 @@
 		where project_id = #{id} and del_flag = '0'
 	</select>
 
+	<select id="getDutyPersons" resultType="com.jeeplus.modules.sys.entity.User">
+		SELECT
+				su.id,
+				su.NAME
+			FROM
+				sys_area_staff a
+				LEFT JOIN sys_user su ON su.id = a.area_leader_id
+				AND su.del_flag = '0'
+			where
+				a.del_flag = '0' and a.area_leader_id is not null and a.area_leader_id != ''
+	</select>
+
 </mapper>

src/main/webapp/webpage/modules/signature/projectRerpotSignatureWork/ProjectRerpotSignatureWorkList.jsp

@@ -36,6 +36,12 @@
                 type : 'date'
                 , trigger: 'click'
             });
+            layui.use(['form', 'layer'], function () {
+                var form = layui.form;
+            })
+            layui.use(['dropdown', 'util', 'layer'], function () {
+                var form = layui.form;
+            })
         });
 
         function reset() {
@@ -233,6 +239,101 @@
                 }
             });
         }
+        function show(d) {
+            ////对操作进行初始化
+            var xml="<div class=\"layui-btn-group\">";
+
+            if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
+            }
+
+            if(d.approvalCanedit2 != undefined && d.approvalCanedit2 =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/modifyApproval?id=" + d.approvalId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+            }
+            if(d.approvalCanrecall != undefined && d.approvalCanrecall =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+            }
+            if(d.approvalCanedit1 != undefined && d.approvalCanedit1 =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('修改审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
+            }
+            if(d.approvalCancancel != undefined && d.approvalCancancel =="1")
+            {
+                xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revokeApproval?id=" + d.approvalId + "&processInstanceId=" + d.approvalProcInsId + "&status="+d.approvalStatus+"\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"return confirmx('确认要撤回该审定单签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回审定单签章</a>";
+            }
+            if(d.approvalDelete != undefined && d.approvalDelete =="1")
+            {
+                xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteApproval?id=" + d.approvalId + "\" onclick=\"return confirmx('确认要作废该审定单签章申请信息吗？', this.href)\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除审定单签章</a>";
+            }
+            if(d.approvalCancancel2 != undefined && d.approvalCancancel2 =="1")
+            {
+                xml+="<a href=\"#\" onclick=\"openDialogre('报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-green\" > 报告签章</a>";
+            }
+            if(d.canedit1 != undefined && d.canedit1 =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+            }
+
+            if(d.canedit2 != undefined && d.canedit2 =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/modify?id=" + d.reportId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+            }
+            if(d.canrecall != undefined && d.canrecall =="1")
+            {
+                xml+="<a href=\"#\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
+            }
+            if(d.candel != undefined && d.candel =="1")
+            {
+                xml+="<a href=\"${ctx}/projectReport/projectReportSignature/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该签章申请信息吗？', this.href)\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
+            }
+            if(d.reportDelete != undefined && d.reportDelete =="1")
+            {
+                xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteReport?id=" + d.reportId + "\" onclick=\"return confirmx('确认要作废该报告签章申请信息吗？', this.href)\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除报告签章</a>";
+            }
+
+            if(d.cancancel != undefined && d.cancancel =="1")
+            {
+                xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revoke?id=" + d.reportId + "&processInstanceId=" + d.reportProcInsId + "&status="+d.reportStatus+"\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' onclick=\"return confirmx('确认要撤回该报告签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回报告签章</a>";
+            }
+
+
+            if(d.approvalStatus == 5){
+                //上传审定单进行签章
+
+                if(d.approvalSignatureUrlFlag == 1){
+                    xml+="<a href=\""+ d.approvalSignatureUrl +"\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn  layui-btn-xs layui-bg-orange\" >审定单签章文件下载</a>"
+                }else{
+                    if(d.approvalSignatureContractId){
+                        xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttachApproval?contractId="+ d.approvalSignatureContractId +"\" style='height: 32px;margin-top: 5px;margin-bottom: 5px;' class=\"layui-btn  layui-btn-xs layui-bg-orange\" >审定单签章文件下载</a>"
+                    }
+                }
+            }
+            if(d.reportStatus == 5){
+                //上传审定单进行签章
+
+                if(d.reportSignatureUrlFlag == 1){
+                    xml+="<a href=\""+ d.reportSignatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
+                }else{
+                    if(d.reportSignatureContractId){
+                        xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.reportSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
+                    }
+                }
+            }
+
+
+            /*if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
+            {
+                xml+="<a href=\"#\" onclick=\"openDialogre('修改签章申请', '${ctx}/projectReport/projectReportSignature/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
+                            xml+="<a href=\"#\" onclick=\"adminDelete('管理员删除', '${ctx}/projectReport/projectReportSignature/queryProjectIsUse?id=" + d.id +"','95%', '95%','','"+ d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 删除</a>";
+
+                        }*/
+            xml+="</div>"
+            return [xml].join('');
+
+        }
     </script>
     <style>
         body{
@@ -350,7 +451,7 @@
                     </div>
                     <div style="clear: both;"></div>
                 </div>
-                <table class="oa-table layui-table" id="contentTable1"></table>
+                <table class="oa-table layui-table" id="contentTable1" lay-filter="test"></table>
 
                 <!-- 分页代码 -->
                 <table:page page="${page}"></table:page>
@@ -359,7 +460,49 @@
         </div>
     </div>
 </div>
-
+<script type="text/html" id="barDemo">
+    <a class="layui-btn layui-btn-xs" lay-event="more" style="width: 75px">请选择<i class="layui-icon layui-icon-down"></i></a>
+</script>
+<script>
+    layui.use(function() { //亦可加载特定模块：layui.use(['layer', 'laydate', function(){
+        //得到各种内置组件
+        var table = layui.table //表格
+            ,dropdown = layui.dropdown //下拉菜单
+        table.on('tool(test)', function (obj) { //注：tool 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+            var data = obj.data //获得当前行数据
+                , layEvent = obj.event; //获得 lay-event 对应的值
+            if (layEvent === 'more' && (data.falg == 1 || data.reportStatus == 5 || data.approvalStatus == 5)) {
+                //下拉菜单
+                dropdown.render({
+                    elem: this //触发事件的 DOM 对象
+                    , show: true //外部事件触发即显示
+                    , data: [{
+                        title: ''
+                        , id: 'must' //此项为必填项
+                        // , href: '#'
+                        // , target: '_blank' 默认_self
+                        , templet: show(data)
+
+                    }]
+                    , align: 'center' //右对齐弹出（v2.6.8 新增）
+                    , style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                })
+            }else {
+                //下拉菜单
+                dropdown.render({
+                    elem: this
+                    , show: true
+                    , data: [{
+                        title: '当前已无可进行操作!'
+                        , id: 'no'
+                    }]
+                    , align: 'center' //右对齐弹出（v2.6.8 新增）
+                    , style: 'box-shadow: 5px 5px 10px rgb(0 0 0 / 12%);' //设置额外样式
+                })
+            }
+        });
+    })
+</script>
 <%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
 <script>
 
@@ -405,99 +548,7 @@
                         return xml;
                     }}
 
-                ,{field:'op',align:'center',title:"操作",minWidth:160,templet:function(d){
-                        ////对操作进行初始化
-                        var xml="<div class=\"layui-btn-group\">";
-                        if(d.approvalCancancel1 != undefined && d.approvalCancancel1 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 审定单签章</a>";
-                        }
-
-                        if(d.approvalCanedit2 != undefined && d.approvalCanedit2 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/modifyApproval?id=" + d.approvalId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
-                        }
-                        if(d.approvalCanrecall != undefined && d.approvalCanrecall =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
-                        }
-                        if(d.approvalCanedit1 != undefined && d.approvalCanedit1 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改审定单签章申请', '${ctx}/projectReport/projectReportSignature/approvalForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改审定单签章</a>";
-                        }
-                        if(d.approvalCancancel != undefined && d.approvalCancancel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revokeApproval?id=" + d.approvalId + "&processInstanceId=" + d.approvalProcInsId + "&status="+d.approvalStatus+"\" onclick=\"return confirmx('确认要撤回该审定单签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回审定单签章</a>";
-                        }
-                        if(d.approvalDelete != undefined && d.approvalDelete =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteApproval?id=" + d.approvalId + "\" onclick=\"return confirmx('确认要作废该审定单签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除审定单签章</a>";
-                        }
-                        if(d.approvalCancancel2 != undefined && d.approvalCancancel2 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 报告签章</a>";
-                        }
-                        if(d.canedit1 != undefined && d.canedit1 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
-                        }
-
-                        if(d.canedit2 != undefined && d.canedit2 =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/modify?id=" + d.reportId + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
-                        }
-                        if(d.canrecall != undefined && d.canrecall =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('调整报告签章申请', '${ctx}/projectReport/projectReportSignature/reportForm?id=" + d.id + "','95%', '95%','','送审,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改报告签章</a>";
-                        }
-                        if(d.candel != undefined && d.candel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要作废该签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除</a>";
-                        }
-                        if(d.reportDelete != undefined && d.reportDelete =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/deleteReport?id=" + d.reportId + "\" onclick=\"return confirmx('确认要作废该报告签章申请信息吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-red\"> 删除报告签章</a>";
-                        }
-
-                        if(d.cancancel != undefined && d.cancancel =="1")
-                        {
-                            xml+="<a href=\"${ctx}/projectReport/projectReportSignature/revoke?id=" + d.reportId + "&processInstanceId=" + d.reportProcInsId + "&status="+d.reportStatus+"\" onclick=\"return confirmx('确认要撤回该报告签章申请审批吗？', this.href)\" class=\"layui-btn layui-btn-xs layui-bg-blue\" > 撤回报告签章</a>";
-                        }
-
-                        if(d.approvalStatus == 5){
-                            //上传审定单进行签章
-
-                            if(d.approvalSignatureUrlFlag == 1){
-                                xml+="<a href=\""+ d.approvalSignatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >审定单签章文件下载</a>"
-                            }else{
-                                if(d.approvalSignatureContractId){
-                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttachApproval?contractId="+ d.approvalSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >审定单签章文件下载</a>"
-                                }
-                            }
-                        }
-                        if(d.reportStatus == 5){
-                            //上传审定单进行签章
-
-                            if(d.reportSignatureUrlFlag == 1){
-                                xml+="<a href=\""+ d.reportSignatureUrl +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
-                            }else{
-                                if(d.reportSignatureContractId){
-                                    xml+="<a href=\"${ctx}/ruralProject/signatureCallBack/downLoadAttach?contractId="+ d.reportSignatureContractId +"\" class=\"layui-btn  layui-btn-xs layui-bg-orange\" >报告签章文件下载</a>"
-                                }
-                            }
-                        }
-
-
-                        /*if(d.deleteAdmin != undefined && d.deleteAdmin =="1")
-                        {
-                            xml+="<a href=\"#\" onclick=\"openDialogre('修改签章申请', '${ctx}/projectReport/projectReportSignature/adminModify?id=" + d.id + "','95%', '95%','','提交,关闭')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 修改</a>";
-                            xml+="<a href=\"#\" onclick=\"adminDelete('管理员删除', '${ctx}/projectReport/projectReportSignature/queryProjectIsUse?id=" + d.id +"','95%', '95%','','"+ d.id + "')\" class=\"layui-btn layui-btn-xs layui-bg-green\" > 删除</a>";
-
-                        }*/
-                        xml+="</div>"
-                        return xml;
-
-                    }}
+                ,{field:'op',align:'center',title:"操作",minWidth:160,templet:'#barDemo'}
             ]]
             ,data: [
                 <c:if test="${ not empty page.list}">
@@ -553,8 +604,8 @@
                     </shiro:hasPermission>
                     ,"cancancel":<c:choose><c:when test="${projectReportSignature.reportStatus == 2 && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
                     ,"approvalCancancel":<c:choose><c:when test="${projectReportSignature.approvalStatus == 2 && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"approvalCancancel1":<c:choose><c:when test="${projectReportSignature.approvalStatus == null  && projectReportSignature.reportStatus != null  && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
-                    ,"approvalCancancel2":<c:choose><c:when test="${projectReportSignature.reportStatus == null && projectReportSignature.approvalStatus != null && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"approvalCancancel1":<c:choose><c:when test="${projectReportSignature.approvalStatus == null  && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
+                    ,"approvalCancancel2":<c:choose><c:when test="${projectReportSignature.reportStatus == null && fns:getUser().id == projectReportSignature.createBy.id}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose>
 
                     </c:when>
                     <c:otherwise>