Commit 86befca9 by mayunfei

侦查指令我辖区的侦察指令 的签收 回报信息展示

parent ce4a5b64
......@@ -21,6 +21,7 @@ public class TbYwZczl extends BaseModel{
private List ywbhList;//业务编号list
private String ifFirst;//是否首次查询 no表示非第一次查询
private String zlfpdwHtml = "";//指令分派单位拼接用的html
private String zlhbHtml = "";//指令回报拼接用html
private String zlqszt = null;//指令签收状态(0-未签收;1-超期未签收;2-已签收;3-超期签收;)
private String zlhbzt = null;//指令回报状态(0-未回报;1-超期未回报;2-已回报(评价等级);3-超期回报(评价等级);)
......@@ -894,4 +895,12 @@ public class TbYwZczl extends BaseModel{
public void setUsername(String username) {
this.username = username;
}
public String getZlhbHtml() {
return zlhbHtml;
}
public void setZlhbHtml(String zlhbHtml) {
this.zlhbHtml = zlhbHtml;
}
}
......@@ -9,6 +9,7 @@ import com.founder.zczl.service.IZczlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
......@@ -2547,6 +2548,7 @@ public class ZczlController {
String zlfpdwHtml = "";//指令分派单位所用html
String fpdwHtml = "";//分派单位html
String qsztHtml = "";//签收状态htmlhtml
String zlhbHtml = "";//签收状态htmlhtml
List<String> fpbhs = new ArrayList<>();
for(int n=0;n<fps.size();n++){
String sfqspdbz = fps.get(n).getSfqspdbz();
......@@ -2557,6 +2559,7 @@ public class ZczlController {
String qsrdwmc = zczlService.getUnitnameByUnitcode(fps.get(n).getQsrgajgdm());
fpdwHtml = "<tr><td>"+qsrdwmc+"</td>";
zlfpdwHtml = zlfpdwHtml+fpdwHtml;
zlhbHtml = zlhbHtml + fpdwHtml;
Date fpsj = fps.get(n).getFpsj();//分派时间
long qssjc = getTimesByFpsj(fpsj);//签收时间差
//拿到签收个数
......@@ -2579,12 +2582,17 @@ public class ZczlController {
}
}
zlfpdwHtml = zlfpdwHtml+qsztHtml;
}
//通过分派信息list拿到回报信息list
List<TbYwZczlHb> hbs = zczlService.getAllHbsByAllFps(fpbhs);
if(hbs!=null){
zlhbcs = hbs.size();
TbYwZczlHb hbxx = zczlService.getHbxxByFpbh(fpbh);
if(hbxx!=null&& !StringUtils.isEmpty(hbxx)){
zlhbHtml = zlhbHtml + "<td style='color:green;'>已回报</td></tr>";//已回报
zlhbcs ++;
}else{
zlhbHtml = zlhbHtml + "<td style='color:red;'>未回报</td></tr>";//为回报
}
}
zczl.setZlhbHtml(zlhbHtml);
zczl.setZlfpdwHtml(zlfpdwHtml);
zczl.setZlqsgs(zlqsgs);
zczl.setZlhbcs(zlhbcs);
......@@ -2600,6 +2608,7 @@ public class ZczlController {
objectMap.put("zlfpgs", zczl.getZlfpgs());//指令分派个数
objectMap.put("zlhbcs", zczl.getZlhbcs());//指令回报个数
objectMap.put("zlfpdwHtml", zczl.getZlfpdwHtml());//指令分派单位拼接用的html
objectMap.put("zlhbHtml",zczl.getZlhbHtml());//指令回报Html
objectMap.put("fbsj", zczl.getFbsj());//发布时间
objectMap.put("zlsy", zczl.getZlsy());//指令事由
objectMap.put("spsftg", zczl.getSpsftg());//审批状态 0-未通过 1-通过 2-待审批
......
......@@ -469,6 +469,11 @@ div.layout_yj{
a.re_hb{
background-color: #71a29e;
}
/* 试验添加右侧弹出框 */
.re_hb {
position: relative;
/*width: fit-content;*/
}
a.re_hb:hover{
background-color:#50a099;
color:#fff;
......@@ -505,6 +510,7 @@ a.re_qs:hover{
/*width: fit-content;*/
}
.right_po{
z-index:900;
width: fit-content;
border: 1px solid #ccc;
position: absolute;
......@@ -537,6 +543,40 @@ a.re_qs:hover{
padding: 3px 5px;
white-space: nowrap;
}
.left_pro{
width: fit-content;
border: 1px solid #ccc;
position: absolute;
display: none;
left: 59px;
top: 0px;
background:#d9f2ed;
box-shadow: 3px 3px 15px #666;
max-height: 400px;
overflow-y: auto;
}
.left_pro table{
width: 100%;
font-size: 12px;
}
.left_pro table tr{
border-bottom: 1px dashed #ccc;
}
.left_pro table tr:last-child{
border-bottom: none;
}
.left_pro table th{
background:-webkit-gradient(linear, 0 0, 0 100%, from(#a3dfe6), to(#d9f2ed));
min-width: 100px;
}
.left_pro table td,.left_pro table th{
text-align: center;
height: 30px;
line-height: 30px;
padding: 3px 5px;
white-space: nowrap;
}
table.datagrid-btable td[field="zlwh"] .datagrid-cell{
overflow: visible;
}
......
......@@ -5,7 +5,9 @@ $(function(){
title: false,
closeBtn: 0,
shadeClose: true,
area: ['500px', '120px'],
icon: 1,
btn: ['我明白了'],
skin: 'layer-ext-moon' //该皮肤由layer.seaning.com友情扩展。关于皮肤的扩展规则,去这里查阅
})
})
......@@ -46,27 +48,47 @@ function getZlwhzt(row){
}
//存在回报信息显示回报数
if(row.zlqsgs!=null&&row.zlqsgs!=0&&row.zlqsgs!=""){
str = str + "&nbsp;&nbsp;<a onclick=\"toHbDetail('"+row.zczlbh+"')\" class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span></a>";
str = str + "&nbsp;&nbsp;<a onclick='qs_hb(this,event)' class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span><div class=\"left_pro\"><table><tr><th width=\"60%\">单位名称</th><th width=\"40%\">回报状态</th></tr>"+row.zlhbHtml+"</table></div></a>";
/*str = str + "&nbsp;&nbsp;<a onclick=\"toHbDetail('"+row.zczlbh+"')\" class=\"re_hqzt re_hb\">报:<span class=\"n_hq\">"+row.zlhbcs+"</span>/<span class=\"n_totle\">"+row.zlfpgs+"</span></a>";*/
}
}
return str;
}
/* 添加右侧弹出框 */
function qs_tk(el,event) {
window.top.aa(el,event);
window.top.aa(el,event,'0');
// $('.right_po').dialog('open');
}
/* 添加右侧弹出框 */
function qs_hb(el,event) {
window.top.aa(el,event,'1');
// $('.right_po').dialog('open');
}
function aa(el,event) {
function aa(el,event,flag) {
var top = $(el).offset().top;
var height = $(window).height();
var bottom = height - top;
if(flag == '0'){
var div_height = $(el).find('.right_po').height();
$('.right_po').hide();
$('.left_pro').hide();
if (div_height < bottom) {
$(el).find('.right_po').show();
} else {
$(el).find('.right_po').show().css("top", -div_height + 'px');
}
}else{
var div_height = $(el).find('.left_pro').height();
$('.left_pro').hide();
$('.right_po').hide();
if (div_height < bottom) {
$(el).find('.left_pro').show();
} else {
$(el).find('.left_pro').show().css("top", -div_height + 'px');
}
}
// 解决easyui相应元素设置overflow:hidden属性导致定位的弹窗溢出不显示问题--待定
$('.datagrid-body').css({'overflow':'visible','overflow-x':'visible'});
$('.datagrid-view2').css('overflow','visible');
......@@ -82,6 +104,7 @@ function toHbDetail(zczlbh){
}
$(document).click(function (event) {
$('.right_po').slideUp(200);
$('.left_pro').slideUp(200);
});
var table_title = [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment