增加报表中单据点击后展示的功能

src/main/java/com/jsh/action/materials/AccountHeadAction.java

@@ -282,6 +282,44 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
         }
     }
 
+    /**
+     * 根据编号查询单据信息
+     */
+    public void getDetailByNumber(){
+        try {
+            PageUtil<AccountHead> pageUtil = new  PageUtil<AccountHead>();
+            pageUtil.setPageSize(0);
+            pageUtil.setCurPage(0);
+            pageUtil.setAdvSearch(getConditionByNumber());
+            accountHeadService.find(pageUtil);
+            List<AccountHead> dataList = pageUtil.getPageList();
+            JSONObject item = new JSONObject();
+            if(dataList!=null && dataList.get(0)!=null) {
+                AccountHead accountHead = dataList.get(0);
+                item.put("Id", accountHead.getId());
+                item.put("OrganId", accountHead.getOrganId()==null?"":accountHead.getOrganId().getId());
+                item.put("OrganName", accountHead.getOrganId()==null?"":accountHead.getOrganId().getSupplier());
+                item.put("HandsPersonId", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getId());
+                item.put("HandsPersonName", accountHead.getHandsPersonId()==null?"":accountHead.getHandsPersonId().getName());
+                item.put("AccountId", accountHead.getAccountId()==null?"":accountHead.getAccountId().getId());
+                item.put("AccountName", accountHead.getAccountId()==null?"":accountHead.getAccountId().getName());
+                item.put("BillNo", accountHead.getBillNo());
+                item.put("BillTime", Tools.getCenternTime(accountHead.getBillTime()));
+                item.put("ChangeAmount", accountHead.getChangeAmount()==null?"":Math.abs(accountHead.getChangeAmount()));
+                item.put("TotalPrice", accountHead.getTotalPrice()==null?"":Math.abs(accountHead.getTotalPrice()));
+                item.put("Remark", accountHead.getRemark());
+            }
+            //回写查询结果
+            toClient(item.toString());
+        }
+        catch (DataAccessException e) {
+            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
+        }
+        catch (IOException e) {
+            Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
+        }
+    }
+    
     /**
      * 查询单位的累计应收和累计应付，收预付款不计入此处
      * @return
@@ -353,6 +391,12 @@ public class AccountHeadAction extends BaseAction<AccountHeadModel>
 		return allMoney;    	     
     }
 
+    private Map<String,Object> getConditionByNumber() {
+        Map<String,Object> condition = new HashMap<String,Object>();
+        condition.put("BillNo_s_eq",model.getBillNo());
+        return condition;
+    }
+
     /**
      * 拼接搜索条件
      * @return

src/main/java/com/jsh/action/materials/DepotHeadAction.java

@@ -476,6 +476,63 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
         }
 	}
 
+	/**
+	 * 根据编号查询单据信息
+	 */
+	public void getDetailByNumber(){
+		try {
+			PageUtil<DepotHead> pageUtil = new  PageUtil<DepotHead>();
+			pageUtil.setPageSize(0);
+			pageUtil.setCurPage(0);
+			pageUtil.setAdvSearch(getConditionByNumber());
+			depotHeadService.find(pageUtil);
+			List<DepotHead> dataList = pageUtil.getPageList();
+			JSONObject item = new JSONObject();
+			if(dataList!=null && dataList.get(0)!=null) {
+				DepotHead depotHead = dataList.get(0);
+				item.put("Id", depotHead.getId());
+				item.put("ProjectId", depotHead.getProjectId()==null?"":depotHead.getProjectId().getId());
+				item.put("ProjectName", depotHead.getProjectId()==null?"":depotHead.getProjectId().getName());
+				item.put("Number", depotHead.getNumber());
+				item.put("OperPersonName", depotHead.getOperPersonName());
+				item.put("CreateTime", Tools.getCenternTime(depotHead.getCreateTime()));
+				item.put("OperTime", Tools.getCenternTime(depotHead.getOperTime()));
+				item.put("OrganId", depotHead.getOrganId()==null?"":depotHead.getOrganId().getId());
+				item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier());
+				item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId());
+				item.put("Salesman", depotHead.getSalesman().toString());
+				item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName());
+				item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId());
+				item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName());
+				item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount()));
+				item.put("AccountIdList", depotHead.getAccountIdList());
+				item.put("AccountMoneyList", depotHead.getAccountMoneyList());
+				item.put("Discount", depotHead.getDiscount());
+				item.put("DiscountMoney", depotHead.getDiscountMoney());
+				item.put("DiscountLastMoney", depotHead.getDiscountLastMoney());
+				item.put("OtherMoney", depotHead.getOtherMoney());
+				item.put("OtherMoneyList", depotHead.getOtherMoneyList()); //id列表
+				item.put("OtherMoneyItem", depotHead.getOtherMoneyItem()); //money列表
+				item.put("AccountDay", depotHead.getAccountDay()); //结算天数
+				item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId());
+				item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName());
+				item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice()));
+				item.put("payType", depotHead.getPayType()==null?"":depotHead.getPayType());
+				item.put("Status", depotHead.getStatus());
+				item.put("Remark", depotHead.getRemark());
+				item.put("MaterialsList", findMaterialsListByHeaderId(depotHead.getId()));
+			}
+			//回写查询结果
+			toClient(item.toString());
+		}
+		catch (DataAccessException e) {
+			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
+		}
+		catch (IOException e) {
+			Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
+		}
+	}
+    
 	/**
 	 * 查找单据_根据月份(报表)
 	 * @return
@@ -837,6 +894,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
 		}
 	}
 
+	private Map<String,Object> getConditionByNumber() {
+		Map<String,Object> condition = new HashMap<String,Object>();
+		condition.put("Number_s_eq",model.getNumber());
+		return condition;
+	}
+    
 	/**
 	 * 拼接搜索条件
 	 * @return

src/main/webapp/css/bill_detail.css

+#bill {
+	width: 100%;
+}
+#bill .retail_out{
+	display: none;
+}
+#bill .retail_back{
+	display: none;
+}
+#bill .purchase_in{
+	display: none;
+}
+#bill .purchase_back{
+	display: none;
+}
+#bill .sale_out{
+	display: none;
+}
+#bill .sale_back{
+	display: none;
+}
+#bill .other_in{
+	display: none;
+}
+#bill .other_out{
+	display: none;
+}
+#bill .allocation_out{
+	display: none;
+}
+#bill .gift_recharge{
+	display: none;
+}
+#bill .gift_out{
+	display: none;
+}
+#bill .item_in{
+	display: none;
+}
+#bill .item_out{
+	display: none;
+}
+#bill .money_in{
+	display: none;
+}
+#bill .money_out{
+	display: none;
+}
+#bill .giro{
+	display: none;
+}
+#bill .advance_in{
+	display: none;
+}
\ No newline at end of file

src/main/webapp/css/common.css

@@ -32,3 +32,9 @@
 	padding: 10px 0px 10px 10px;
 
 }
+
+#accountDetailListDlg .n-link{
+	color:blue;
+	text-decoration:underline;
+	cursor:pointer;
+}
\ No newline at end of file

src/main/webapp/js/common/outlook_in.js

+$(function () {
+    //	InitLeftMenu();
+    tabClose();
+    tabCloseEven();
+
+
+    //	$('#tabs').tabs('add',{
+    //		title:'title',
+    //		content:createFrame('http://www.xjz365.com')
+    //	}).tabs({
+    //        onSelect: function (title) {
+    //            var currTab = $('#tabs').tabs('getTab', title);
+    //            var iframe = $(currTab.panel('options').content);
+
+    //			var src = iframe.attr('src');
+    //			if(src)
+    //				$('#tabs').tabs('update', { tab: currTab, options: { content: createFrame(src)} });
+
+    //        }
+    //    });
+})
+
+//初始化左侧
+function InitLeftMenu() {
+    $("#nav").accordion({ animate: false });
+
+    $.each(_menus.menus, function (i, n) {
+        var menulist = '';
+        menulist += '<ul>';
+        $.each(n.menus, function (j, o) {
+            menulist += '<li><div><a ref="' + o.menuid + '" href="#" rel="' + o.url + '" ><span class="icon ' + o.icon + '" >&nbsp;</span><span class="nav">' + o.menuname + '</span></a></div></li> ';
+        })
+        menulist += '</ul>';
+
+        $('#nav').accordion('add', {
+            title: n.menuname,
+            content: menulist,
+            iconCls: 'icon ' + n.icon
+        });
+
+    });
+
+    $('.easyui-accordion li a').click(function () {
+        var tabTitle = $(this).children('.nav').text();
+
+        var url = $(this).attr("rel");
+        var menuid = $(this).attr("ref");
+        var icon = getIcon(menuid, icon);
+
+        addTab(tabTitle, url, icon);
+        $('.easyui-accordion li div').removeClass("selected");
+        $(this).parent().addClass("selected");
+    }).hover(function () {
+        $(this).parent().addClass("hover");
+    }, function () {
+        $(this).parent().removeClass("hover");
+    });
+
+    //选中第一个
+    var panels = $('#nav').accordion('panels');
+    var t = panels[0].panel('options').title;
+    $('#nav').accordion('select', t);
+}
+//获取左侧导航的图标
+function getIcon(menuid) {
+    var icon = 'icon ';
+    $.each(_menus.menus, function (i, n) {
+        $.each(n.menus, function (j, o) {
+            if (o.menuid == menuid) {
+                icon += o.icon;
+            }
+        })
+    })
+
+    return icon;
+}
+
+function addTabIn(subtitle, url, icon) {
+    var dom = window.parent.jQuery('#tabs');
+    if (!dom.tabs('exists', subtitle)) {
+        dom.tabs('add', {
+            title: subtitle,
+            content: createFrame(url),
+            closable: true,
+            icon: icon
+        });
+    } else {
+        dom.tabs('select', subtitle);
+        $('#mm-tabupdate').click();
+    }
+    tabClose();
+}
+
+function newTab(name, url, funId) {
+    window.funId = funId;
+    addTabIn(name, url, '');
+}
+
+function createFrame(url) {
+    var s = '<iframe scrolling="auto" frameborder="0" src="' + url + '" style="width:100%;height:99%"></iframe>';
+    return s;
+}
+function tabClose() {
+    var dom = window.parent.jQuery('#tabs');
+    /*双击关闭TAB选项卡*/
+    $(".tabs-inner").dblclick(function () {
+        var subtitle = $(this).children(".tabs-closable").text();
+        dom.tabs('close', subtitle);
+    })
+    /*为选项卡绑定右键*/
+    $(".tabs-inner").bind('contextmenu', function (e) {
+        $('#mm').menu('show', {
+            left: e.pageX,
+            top: e.pageY
+        });
+
+        var subtitle = $(this).children(".tabs-closable").text();
+
+        $('#mm').data("currtab", subtitle);
+        dom.tabs('select', subtitle);
+        return false;
+    });
+}
+//绑定右键菜单事件
+function tabCloseEven() {
+    //刷新
+    $('#mm-tabupdate').click(function () {
+        var currTab = $('#tabs').tabs('getSelected');
+        var url = $(currTab.panel('options').content).attr('src');
+        $('#tabs').tabs('update', {
+            tab: currTab,
+            options: {
+                content: createFrame(url)
+            }
+        })
+    })
+    //关闭当前
+    $('#mm-tabclose').click(function () {
+        var currtab_title = $('#mm').data("currtab");
+        $('#tabs').tabs('close', currtab_title);
+    })
+    //全部关闭
+    $('#mm-tabcloseall').click(function () {
+        $('.tabs-inner span').each(function (i, n) {
+            var t = $(n).text();
+            $('#tabs').tabs('close', t);
+        });
+    });
+    //关闭除当前之外的TAB
+    $('#mm-tabcloseother').click(function () {
+        $('#mm-tabcloseright').click();
+        $('#mm-tabcloseleft').click();
+    });
+    //关闭当前右侧的TAB
+    $('#mm-tabcloseright').click(function () {
+        var nextall = $('.tabs-selected').nextAll();
+        if (nextall.length == 0) {
+            //msgShow('系统提示','后边没有啦~~','error');
+            //alert('后边没有啦~~');
+            return false;
+        }
+        nextall.each(function (i, n) {
+            var t = $('a:eq(0) span', $(n)).text();
+            $('#tabs').tabs('close', t);
+        });
+        return false;
+    });
+    //关闭当前左侧的TAB
+    $('#mm-tabcloseleft').click(function () {
+        var prevall = $('.tabs-selected').prevAll();
+        if (prevall.length == 0) {
+            //alert('到头了，前边没有啦~~');
+            return false;
+        }
+        prevall.each(function (i, n) {
+            var t = $('a:eq(0) span', $(n)).text();
+            $('#tabs').tabs('close', t);
+        });
+        return false;
+    });
+
+    //显示版权信息
+    $("#mm-version").click(function () {
+        window.open("https://gitee.com/jishenghua/JSH_ERP");
+    })
+}
+
+//弹出信息窗口 title:标题 msgString:提示信息 msgType:信息类型 [error,info,question,warning]
+function msgShow(title, msgString, msgType) {
+    $.messager.alert(title, msgString, msgType);
+}

src/main/webapp/pages/manage/account.jsp

@@ -18,6 +18,7 @@
         <script type="text/javascript" src="<%=path %>/js/jquery-1.8.0.min.js"></script>
         <script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
         <script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+        <script type="text/javascript" src="<%=path %>/js/common/outlook_in.js"></script>
         <script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
     </head>
     <body>
@@ -564,7 +565,12 @@
                     pageSize: initPageSize,
                     pageList: initPageNum,
                     columns:[[
-                        { title: '单据编号',field: 'number',width:150},
+                        { title: '单据编号',field: 'number',width:150,
+                            formatter: function (value, row) {
+                                return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.jsp?n=" + row.number + "&type=" + row.type + "','')\">"
+                                    + row.number + "</a>";
+                            }
+                        },
                         { title: '类型', field: 'type',width:100},
                         { title: '单位信息', field: 'supplierName',width:150},
                         { title: '金额', field: 'changeAmount',width:80,

src/main/webapp/pages/reports/account_report.jsp

@@ -19,6 +19,7 @@
 		<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+		<script type="text/javascript" src="<%=path %>/js/common/outlook_in.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script type="text/javascript" src="<%=path %>/js/common/common.js"></script>
   	</head>
@@ -227,7 +228,12 @@
 					pageSize: initPageSize,
 					pageList: initPageNum,
 					columns:[[
-						{ title: '单据编号',field: 'number',width:150},
+						{ title: '单据编号',field: 'number',width:150,
+							formatter: function (value, row) {
+								return "<a class='n-link' onclick=\"newTab('" + row.number + "','../materials/bill_detail.jsp?n=" + row.number + "&type=" + row.type + "','')\">"
+									+ row.number + "</a>";
+                            }
+						},
 						{ title: '类型', field: 'type',width:100},
 						{ title: '单位信息', field: 'supplierName',width:150},
 						{ title: '金额', field: 'changeAmount',width:80,