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

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

@@ -0,0 +1,54 @@
+#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;
+}

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;
+}

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

@@ -0,0 +1,191 @@
+$(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/js/pages/materials/bill_detail.js

@@ -0,0 +1,461 @@
+    var accountList; //账户列表
+    var listSubType = ""; //采购 销售等
+    var depotHeadID = 0; //主表id
+    var mPropertyList = ""; //商品属性列表
+    var outItemList; //支出项目列表
+    var otherColumns = true; //明细中的‘别名’列是否显示
+    var payTypeTitle = "";//收入 支出
+    var itemType = true; //隐藏当前列
+    var moneyType = true; //隐藏当前列
+    $(function() {
+        initSystemData_account(); //获取账户信息
+        initMProperty(); //初始化商品属性
+        initOutItemList(); //初始化支出项目
+        initialize();//初始化系统基础信息
+    });
+    //获取账户信息
+    function initSystemData_account(){
+        $.ajax({
+            type:"post",
+            url: path + "/account/getAccount.action",
+            //设置为同步
+            async:false,
+            dataType: "json",
+            success: function (systemInfo) {
+                accountList = systemInfo.showModel.map.accountList;
+                var msgTip = systemInfo.showModel.msgTip;
+                if(msgTip == "exceptoin") {
+                    $.messager.alert('提示','查找账户信息异常,请与管理员联系！','error');
+                    return;
+                }
+            }
+        });
+    }
+    //初始化商品属性
+    function initMProperty(){
+        $.ajax({
+            type: "post",
+            url: path + "/materialProperty/findBy.action",
+            dataType: "json",
+            //设置为同步
+            async:false,
+            success: function (res) {
+                if (res && res.rows) {
+                    var thisRows = res.rows;
+                    for(var i=0; i < thisRows.length; i++) {
+                        if(thisRows[i].enabled){
+                            mPropertyList += thisRows[i].nativeName +",";
+                        }
+                    }
+                    if(mPropertyList){
+                        mPropertyList = mPropertyList.substring(0,mPropertyList.length-1);
+                    }
+                }
+            },
+            //此处添加错误处理
+            error:function() {
+                $.messager.alert('查询提示','查询信息异常，请稍后再试！','error');
+                return;
+            }
+        });
+    }
+    //初始化收入项目列表
+    function initOutItemList(){
+        $.ajax({
+            type:"post",
+            url: path + "/inOutItem/findBySelect.action?type=out",
+            //设置为同步
+            async:false,
+            dataType: "json",
+            success: function (res){
+                if(res){
+                    outItemList = res;
+                }
+            },
+            error:function(){
+
+            }
+        });
+    }
+    function initialize() {
+    	var url = location.href; //获取浏览器地址
+    	var params = url.substring(url.indexOf("?")+1);
+    	var number = params.substring(params.indexOf("n=")+2, params.indexOf("&"));
+    	var billType = "";
+        var listSubType = params.substring(params.indexOf("&type=")+6);
+        if(listSubType) {
+            listSubType = decodeURI(listSubType);
+        }
+        if(listSubType == "采购入库") {
+            billType = "material";
+            $("#bill .purchase_in").show();
+        }
+        else if(listSubType == "采购退货") {
+            billType = "material";
+            $("#bill .purchase_back").show();
+        }
+        else if(listSubType == "销售出库") {
+            billType = "material";
+            $("#bill .sale_out").show();
+        }
+        else if(listSubType == "销售退货") {
+            billType = "material";
+            $("#bill .sale_back").show();
+        }
+        else if(listSubType == "零售出库") {
+            billType = "material";
+            $("#bill .retail_out").show();
+        }
+        else if(listSubType == "零售退货入库") {
+            billType = "material";
+            $("#bill .retail_back").show();
+        }
+        else if(listSubType == "其它入库") {
+            billType = "material";
+            $("#bill .other_in").show();
+        }
+        else if(listSubType == "其它出库") {
+            billType = "material";
+            $("#bill .other_out").show();
+        }
+        else if(listSubType == "调拨出库") {
+            billType = "material";
+            $("#bill .allocation_out").show();
+        }
+        else if(listSubType == "礼品充值") {
+            billType = "material";
+            $("#bill .gift_recharge").show();
+        }
+        else if(listSubType == "礼品销售") {
+            billType = "material";
+            $("#bill .gift_out").show();
+        }
+        else if(listSubType == "收入") {
+            billType = "account";
+            payTypeTitle = "收入项目";
+            itemType = false; //显示当前列
+            moneyType = true; //隐藏当前列
+            $("#bill .item_in").show();
+        }
+        else if(listSubType == "支出") {
+            billType = "account";
+            payTypeTitle = "支出项目";
+            itemType = false; //显示当前列
+            moneyType = true; //隐藏当前列
+            $("#bill .item_out").show();
+        }
+        else if(listSubType == "收款") {
+            billType = "account";
+            payTypeTitle = "无标题";
+            itemType = true; //隐藏当前列
+            moneyType = false; //显示当前列
+            $("#bill .money_in").show();
+        }
+        else if(listSubType == "付款") {
+            billType = "account";
+            payTypeTitle = "无标题";
+            itemType = true; //隐藏当前列
+            moneyType = false; //显示当前列
+            $("#bill .money_out").show();
+        }
+        else if(listSubType == "转账") {
+            billType = "account";
+            payTypeTitle = "无标题";
+            itemType = true; //隐藏当前列
+            moneyType = false; //显示当前列
+            $("#bill .giro").show();
+        }
+        else if(listSubType == "收预付款") {
+            billType = "account";
+            payTypeTitle = "无标题";
+            itemType = true; //隐藏当前列
+            moneyType = false; //显示当前列
+            $("#bill .advance_in").show();
+        }
+
+        //如果是进货、销售
+        if(billType == "material"){
+            $.ajax({
+                url: path + "/depotHead/getDetailByNumber.action",
+                data: {
+                    Number: number
+                },
+                type: "get",
+                success: function (res) {
+                    if(res){
+                        var data = JSON.parse(res);
+                        var manyAccountMoney = 0; //多账户合计-零售
+                        if(data.AccountName){
+                            $("#bill .AccountIdShow").text(data.AccountName); //结算账户
+                        }
+                        else if(data.AccountIdList && data.AccountMoneyList) {
+                            var accountArr = data.AccountIdList; //账户id列表
+                            var accountMoneyArr = data.AccountMoneyList; //账户金额列表
+                            var accountIdShow = "";
+                            for (var j = 0; j < accountArr.length; j++) {
+                                if (accountList != null) {
+                                    for (var i = 0; i < accountList.length; i++) {
+                                        var account = accountList[i];
+                                        if (accountArr[j] == account.id) {
+                                            var currentAccountMoney = accountMoneyArr[j] - 0;
+                                            if (currentAccountMoney < 0) {
+                                                currentAccountMoney = 0 - currentAccountMoney;
+                                            }
+                                            accountIdShow = accountIdShow + account.name + "(" + currentAccountMoney + "元) ";
+                                            manyAccountMoney += accountMoneyArr[j] - 0; //多账户合计-零售
+                                        }
+                                    }
+                                }
+                            }
+                            $("#bill .AccountIdShow").text(accountIdShow);
+                        }
+                        $("#bill .OrganIdShow").text(data.OrganName);
+                        $("#bill .OperTimeShow").text(data.OperTime);
+                        $("#bill .NumberShow").text(data.Number);
+                        $("#bill .RemarkShow").text(data.Remark);
+                        $("#bill .DiscountShow").text(data.Discount);
+                        $("#bill .DiscountMoneyShow").text(data.DiscountMoney);
+                        $("#bill .DiscountLastMoneyShow").text(data.DiscountLastMoney);
+                        $("#bill .ChangeAmountShow").text(data.ChangeAmount);
+                        $("#bill .DebtShow").text((data.DiscountLastMoney-data.ChangeAmount).toFixed(2));
+                        $("#bill .OtherMoneyShow").text(data.OtherMoney);
+                        $("#bill .AccountDayShow").text(data.AccountDay); //结算天数
+                        var otherMoney = data.OtherMoney + "";
+                        var otherMoneyList = data.OtherMoneyList + "";
+                        var otherMoneyItem = data.OtherMoneyItem + "";
+                        if(otherMoneyList && otherMoneyItem){
+                            var itemArr = otherMoneyList.split(","); //支出项目id列表
+                            var itemMoneyArr = otherMoneyItem.split(","); //支出项目金额列表
+                            var otherMoneyShow = "";
+                            for(var j =0;j<itemArr.length; j++) {
+                                if (outItemList != null) {
+                                    for (var i = 0; i < outItemList.length; i++) {
+                                        var money = outItemList[i];
+                                        if(itemArr[j] == money.Id) {
+                                            otherMoneyShow = otherMoneyShow + money.InOutItemName + "(" + itemMoneyArr[j] +"元) ";
+                                        }
+                                    }
+                                }
+                            }
+                            $("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ otherMoney.replace("undefined","0") + "元 "); //采购费用、销售费用
+                        }
+                        $("#bill .payTypeShow").text(data.payType);
+                        var TotalPrice = data.TotalPrice;
+                        depotHeadID = data.Id;
+                        initTableData_material_show(TotalPrice,listSubType); //商品列表-查看状态
+
+                        //零售单据展示数据
+                        if(listSubType == "零售出库" || listSubType == "零售退货入库"){
+                            $("#bill .change-amount-show").text(data.ChangeAmount);
+                            var changeAccount = $("#bill .change-amount-show:visible").text() - 0;
+                            if(manyAccountMoney!==0){
+                                $("#bill .get-amount-show").text((manyAccountMoney).toFixed(2));
+                                $("#bill .back-amount-show").text((manyAccountMoney -changeAccount).toFixed(2));
+                            }
+                            else {
+                                $("#bill .get-amount-show").text((changeAccount).toFixed(2));
+                                $("#bill .back-amount-show").text(0);
+                            }
+                        }
+                        if(listSubType === "销售出库" || listSubType === "销售退货"){
+                            var salesManInfo = data.Salesman;
+                            if(salesManInfo){
+                                var arr = salesManInfo.split(",");
+                                var salesmanStr = "";
+                                for(var i=0;i<arr.length;i++){
+                                    if(arr[i]){
+                                        if(i === arr.length-1){
+                                            salesmanStr += arr[i].replace("<","").replace(">","");
+                                        }
+                                        else {
+                                            salesmanStr += arr[i].replace("<","").replace(">","") + ",";
+                                        }
+                                    }
+                                }
+                                $.ajax({
+                                    type: "post",
+                                    url: path + "/person/getPersonByIds.action",
+                                    data: {
+                                        PersonIDs: salesmanStr
+                                    },
+                                    success:function(res){
+                                        if(res){
+                                            $("#bill .SalesmanShow").text(res); //销售人员列表
+                                        }
+                                    },
+                                    error:function(){
+
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+            });
+        }
+        //如果是财务单据
+        else if(billType == "account"){
+            $.ajax({
+                url: path + "/accountHead/getDetailByNumber.action",
+                data: {
+                    BillNo: number
+                },
+                type: "get",
+                success: function (res) {
+                    if (res) {
+                        var data = JSON.parse(res);
+                        $("#bill .BillNoShow").text(data.BillNo);
+                        $("#bill .BillTimeShow").text(data.BillTime);
+                        $("#bill .RemarkShow").text(data.Remark);
+                        $("#bill .AccountIdShow").text(data.AccountName);
+                        $('#bill .OrganIdShow').text(data.OrganName);
+                        $("#bill .HandsPersonIdShow").text(data.HandsPersonName);
+                        $("#bill .ChangeAmountShow").text(data.ChangeAmount);
+                        var TotalPrice = data.TotalPrice;
+                        var accountHeadID  = data.Id;
+                        initTableData_account_show(TotalPrice, accountHeadID); //明细列表-查看状态
+                    }
+                }
+            });
+        }
+    }
+
+    //初始化表格数据-商品列表-查看状态
+    function initTableData_material_show(TotalPrice,listSubType){
+        var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
+        var anotherDepotHeadName = ""; //对方仓库的列的标题
+        var depotHeadName = ""; //仓库的列的标题
+        if(listSubType == "调拨出库"){
+            isShowAnotherDepot = false; //调拨时候显示对方仓库
+            anotherDepotHeadName = "调入仓库";
+        }
+        if(listSubType == "礼品充值"){
+            isShowAnotherDepot = false; //礼品充值时候显示礼品卡
+            anotherDepotHeadName = "礼品卡";
+        }
+        if(listSubType == "礼品销售"){
+            depotHeadName = "礼品卡";
+        }
+        else {
+            depotHeadName = "仓库名称";
+        }
+        var isShowTaxColumn = false; //是否显示税率相关的列,true为隐藏,false为显示
+        if(listSubType == "调拨出库" || listSubType == "其它出库" || listSubType == "其它入库" || listSubType == "零售出库" || listSubType == "零售退货入库" || listSubType == "礼品充值" || listSubType == "礼品销售"){
+            isShowTaxColumn = true; //隐藏
+        }
+        var isShowMaterialTypeColumn = true; //是否显示商品类型相关的列,true为隐藏,false为显示
+        if(listSubType == "组装单" || listSubType == "拆卸单"){
+            isShowMaterialTypeColumn = false; //显示
+        }
+        $('#bill .materialDataShow').datagrid({
+            height:245,
+            rownumbers: true,
+            //动画效果
+            animate:false,
+            //选中单行
+            singleSelect : true,
+            collapsible:false,
+            selectOnCheck:false,
+            pagination: false,
+            //交替出现背景
+            striped : true,
+            showFooter: true,
+            columns:[[
+                { title: '商品类型',field: 'MType',width:80, hidden:isShowMaterialTypeColumn},
+                { title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
+                { title: '品名(型号)(扩展信息)(单位)',field: 'MaterialName',width:230},
+                { title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
+                { title: '单位',field: 'Unit',editor:'validatebox',width:60},
+                { title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
+                { title: '单价',field: 'UnitPrice',editor:'validatebox',width:60},
+                { title: '含税单价',field: 'TaxUnitPrice',editor:'validattebox',hidden:isShowTaxColumn,width:75},
+                { title: '金额',field: 'AllPrice',editor:'validatebox',width:75},
+                { title: '税率',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+                { title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+                { title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+                { title: '备注',field: 'Remark',editor:'validatebox',width:120},
+                { title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
+                { title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
+                { title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
+                { title: '备注1',field: 'OtherField4',editor:'validatebox',hidden:true,width:60},
+                { title: '备注2',field: 'OtherField5',editor:'validatebox',hidden:true,width:60}
+            ]],
+            onLoadError:function() {
+                $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+                return;
+            }
+        });
+        $.ajax({
+            type:"post",
+            url: path + '/depotItem/findBy.action?HeaderId=' + depotHeadID,
+            data: {
+                mpList: mPropertyList
+            },
+            dataType: "json",
+            success: function (res) {
+                var AllPrice = TotalPrice;
+                var DiscountMoney = $("#bill .DiscountMoneyShow:visible").text()-0; //优惠金额
+                var DiscountLastMoney = $("#bill .DiscountLastMoneyShow:visible").text()-0; //优惠后金额
+                var array = [];
+                array.push({
+                    "AllPrice": AllPrice,
+                    "TaxLastMoney": DiscountMoney + DiscountLastMoney
+                });
+                res.footer = array;
+                $("#bill .materialDataShow").datagrid('loadData',res);
+
+            },
+            error:function() {
+                $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+            }
+        });
+    }
+
+    //初始化表格数据-明细列表-查看状态
+    function initTableData_account_show(TotalPrice, accountHeadID){
+        $('#bill .accountDataShow').datagrid({
+            height:280,
+            rownumbers: true,
+            //动画效果
+            animate:false,
+            //选中单行
+            singleSelect : true,
+            collapsible:false,
+            selectOnCheck:false,
+            //单击行是否选中
+            checkOnSelect : false,
+            pagination: false,
+            //交替出现背景
+            striped : true,
+            showFooter: true,
+            columns:[[
+                { title: payTypeTitle, field: 'InOutItemName', width:230, hidden:itemType},
+                { title: '账户名称', field: 'AccountName', width:230, hidden:moneyType},
+                { title: '金额',field: 'EachAmount',width:70},
+                { title: '备注',field: 'Remark',width:150}
+            ]],
+            onLoadError:function()
+            {
+                $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
+                return;
+            }
+        });
+        $.ajax({
+            type:"post",
+            url: path + '/accountItem/findBy.action?HeaderId=' + accountHeadID,
+            dataType: "json",
+            success: function (res) {
+                var EachAmount = TotalPrice;
+                var array = [];
+                array.push({
+                    "EachAmount": EachAmount
+                });
+                res.footer = array;
+                $("#bill .accountDataShow").datagrid('loadData',res);
+            },
+            error:function() {
+                $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
+            }
+        });
+    }
+

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/materials/bill_detail.jsp

@@ -0,0 +1,904 @@
+<%@page import="com.jsh.util.Tools"%>
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+    String path = request.getContextPath();
+    String clientIp = Tools.getLocalIp(request);
+%>
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>单据明细</title>
+        <meta charset="utf-8">
+        <!-- 指定以IE8的方式来渲染 -->
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
+        <link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
+        <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
+        <link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
+        <link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
+        <link type="text/css" rel="stylesheet" href="<%=path %>/css/bill_detail.css" />
+        <script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
+        <script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
+        <script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+        <script src="<%=path %>/js/common/common.js"></script>
+        <script src="<%=path %>/js/pages/materials/bill_detail.js"></script>
+        <script>
+            var kid = ${sessionScope.user.id};
+            var path = "<%=path%>";
+            var clientIp = "<%=clientIp%>";
+        </script>
+    </head>
+<body>
+<div id="bill" class="easyui-panel" style="padding:10px;height:500px;" title="单据明细" iconCls="icon-list" collapsible="true" closable="false">
+    <%--零售出库--%>
+    <div class="retail_out" style="width:1100px;padding:10px 20px;top:50px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;height:50px;">会员卡号：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;">付款类型：</td>
+                <td style="padding:5px;width:150px;">
+                    <span class="payTypeShow"></span>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+                <td colspan="2" valign="top">
+                    <table width="100%" class="retail-amount-show">
+                        <tr>
+                            <td colspan="2">实收金额</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="change-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">收款金额</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="get-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">找零</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="back-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>收款账户：</td>
+                            <td align="left" style="width:110px;">
+                                <span class="AccountIdShow"></span>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="8" style="width: 1130px; height:35px;">
+                    <span class="RemarkShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--零售退货--%>
+    <div class="retail_back" style="width:1100px;padding:10px 20px;top:50px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;height:50px;">会员卡号：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:200px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:150px;">
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+                <td colspan="2" valign="top">
+                    <table width="100%" class="retail-amount-show">
+                        <tr>
+                            <td colspan="2">实付金额</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="change-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">付款金额</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="get-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">找零</td>
+                        </tr>
+                        <tr>
+                            <td colspan="2">
+                                <b><span class="back-amount-show"></span></b>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>付款账户：</td>
+                            <td align="left" style="width:110px;">
+                                <span class="AccountIdShow"></span>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="8" style="width: 1130px; height:35px;">
+                    <span class="RemarkShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--采购入库--%>
+    <div class="purchase_in" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">供应商：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠率：</td>
+                <td>
+                    <span class="DiscountShow" style="width: 110px;"></span>
+                    %
+                </td>
+                <td>付款优惠：</td>
+                <td>
+                    <span class="DiscountMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>优惠后金额：</td>
+                <td>
+                    <span class="DiscountLastMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>本次付款：</td>
+                <td style="padding:5px">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td>结算账户：</td>
+                <td style="padding:5px">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>本次欠款：</td>
+                <td style="padding:5px">
+                    <span class="DebtShow"></span>
+                </td>
+                <td>采购费用：</td>
+                <td style="padding:5px">
+                    <span class="OtherMoneyShow"></span>
+                </td>
+                <td>结算天数：</td>
+                <td style="padding:5px">
+                    <span class="AccountDayShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+        </table>
+    </div>
+    <%--采购退货--%>
+    <div class="purchase_back" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">供应商：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠率：</td>
+                <td>
+                    <span class="DiscountShow" style="width: 110px;"></span>
+                    %
+                </td>
+                <td>付款优惠：</td>
+                <td>
+                    <span class="DiscountMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>优惠后金额：</td>
+                <td>
+                    <span class="DiscountLastMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>本次付款：</td>
+                <td style="padding:5px">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td>结算账户：</td>
+                <td style="padding:5px">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>本次欠款：</td>
+                <td style="padding:5px">
+                    <span class="DebtShow"></span>
+                </td>
+                <td>采购费用：</td>
+                <td style="padding:5px">
+                    <span class="OtherMoneyShow"></span>
+                </td>
+                <td></td>
+                <td style="padding:5px">
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+        </table>
+    </div>
+    <%--销售出库--%>
+    <div class="sale_out" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">客户：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">销售人员：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="SalesmanShow"></span>
+                </td>
+                <td style="width:80px;">单据日期：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:70px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠率：</td>
+                <td>
+                    <span class="DiscountShow" style="width: 110px;"></span>
+                    %
+                </td>
+                <td>收款优惠：</td>
+                <td>
+                    <span class="DiscountMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>优惠后金额：</td>
+                <td>
+                    <span class="DiscountLastMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>本次收款：</td>
+                <td style="padding:5px">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td>结算账户：</td>
+                <td style="padding:5px">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>本次欠款：</td>
+                <td style="padding:5px">
+                    <span class="DebtShow"></span>
+                </td>
+                <td>销售费用：</td>
+                <td style="padding:5px">
+                    <span class="OtherMoneyShow"></span>
+                </td>
+                <td>结算天数：</td>
+                <td style="padding:5px">
+                    <span class="AccountDayShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+        </table>
+    </div>
+    <%--销售退货--%>
+    <div class="sale_back" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">客户：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">销售人员：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="SalesmanShow"></span>
+                </td>
+                <td style="width:80px;">单据日期：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:70px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠率：</td>
+                <td>
+                    <span class="DiscountShow" style="width: 110px;"></span>
+                    %
+                </td>
+                <td>退款优惠：</td>
+                <td>
+                    <span class="DiscountMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>优惠后金额：</td>
+                <td>
+                    <span class="DiscountLastMoneyShow" style="width: 120px;"></span>
+                </td>
+                <td>本次退款：</td>
+                <td style="padding:5px">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td>结算账户：</td>
+                <td style="padding:5px">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>本次欠款：</td>
+                <td style="padding:5px">
+                    <span class="DebtShow"></span>
+                </td>
+                <td>销售费用：</td>
+                <td style="padding:5px">
+                    <span class="OtherMoneyShow"></span>
+                </td>
+                <td></td>
+                <td style="padding:5px">
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+        </table>
+    </div>
+    <%--其它入库--%>
+    <div class="other_in" style="width:1100px;padding:10px 20px;top:70px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">供应商：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--其它出库--%>
+    <div class="other_out" style="width:1100px;padding:10px 20px;top:70px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">客户：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--调拨出库--%>
+    <div class="allocation_out" style="width:1100px;padding:10px 20px;top:70px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:70px;">单据编号：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td style="width:80px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:70px;"></td>
+                <td style="padding:5px;width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--礼品充值--%>
+    <div class="gift_recharge" style="width:1100px;padding:10px 20px;top:60px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:70px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--礼品销售--%>
+    <div class="gift_out" style="width:1100px;padding:10px 20px;top:60px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="OperTimeShow"></span>
+                </td>
+                <td style="width:70px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="NumberShow"></span>
+                </td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 商品列表table -->
+                    <table class="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--收入单--%>
+    <div class="item_in" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">往来单位：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">经手人：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="HandsPersonIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>收款账户：</td>
+                <td style="padding:5px;">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>收款金额：</td>
+                <td style="padding:5px;">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--支出单--%>
+    <div class="item_out" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">往来单位：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:70px;"></td>
+                <td style="width:140px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>付款账户：</td>
+                <td style="padding:5px;">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>付款金额：</td>
+                <td style="padding:5px;">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--收款单--%>
+    <div class="money_in" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">付款单位：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">经手人：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="HandsPersonIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠金额：</td>
+                <td style="padding:5px;width:120px;">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--付款单--%>
+    <div class="money_out" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">收款单位：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">经手人：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="HandsPersonIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠金额：</td>
+                <td style="padding:5px;width:120px;">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--转账单--%>
+    <div class="giro" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">经手人：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="HandsPersonIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:50px;"></td>
+                <td style="padding:5px;width:110px;"></td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>付款账户：</td>
+                <td style="padding:5px">
+                    <span class="AccountIdShow"></span>
+                </td>
+                <td>实付金额：</td>
+                <td style="padding:5px">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <%--收预付款--%>
+    <div class="advance_in" style="width:1100px;padding:10px 20px;top:20px"
+         closed="true" modal="true" cache="false" collapsible="false" closable="true">
+        <table>
+            <tr>
+                <td style="width:60px;">付款会员：</td>
+                <td style="padding:5px;width:140px;">
+                    <span class="OrganIdShow"></span>
+                </td>
+                <td style="width:70px;">经手人：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="HandsPersonIdShow"></span>
+                </td>
+                <td style="width:70px;">单据日期：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillTimeShow"></span>
+                </td>
+                <td style="width:80px;">单据编号：</td>
+                <td style="padding:5px;width:130px;">
+                    <span class="BillNoShow"></span>
+                </td>
+                <td style="width:100px;"></td>
+            </tr>
+            <tr>
+                <td colspan="9" style="width: 1130px;">
+                    <!-- 单据列表table -->
+                    <table class="accountDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
+                </td>
+            </tr>
+            <tr>
+                <td style="width:60px;">单据备注：</td>
+                <td colspan="8" style="height:35px;">
+                    <span class="RemarkShow" style="width: 1070px; height:35px;"></span>
+                </td>
+            </tr>
+            <tr>
+                <td>优惠金额：</td>
+                <td style="padding:5px;width:120px;">
+                    <span class="ChangeAmountShow"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+</div>
+</body>
+</html>

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,