From ca87ddf0dcce92418060eb2f97344589492f7035 Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 13 Dec 2020 20:57:32 +0800 Subject: [PATCH] finish outstore and instore details jump to detail --- zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java | 9 +++++++++ zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml | 2 ++ zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html | 33 ++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java b/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java index 12f25bd..3e84fff 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/pojo/StoreInOutRecordVO.java @@ -84,6 +84,15 @@ private Long goodsSortId; + private Long id; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } public Date getCreateTime() { return createTime; diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml index 1af5845..df354d5 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml @@ -657,6 +657,7 @@ FROM ( SELECT + b.id id, b.create_time as createTime, e.CODE, e.NAME, @@ -708,6 +709,7 @@ UNION ALL SELECT + t2_b.id id, t2_b.create_time, t2_e.CODE, t2_e.NAME, diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html index 224124e..04ef257 100644 --- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html +++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html @@ -77,7 +77,7 @@ <th data-field="amount" data-footer-formatter="countColumn">出库数量</th> <th data-field="goodsPrice" >出库单价</th> <th data-field="totalPrice" data-footer-formatter="countColumn">出库金额</th> - <th data-field="orderNo">单据编号</th> + <th data-field="orderNo" data-formatter="buildJumpToDetailInfo" >单据编号</th> <th data-field="orderType">单据类型</th> <th data-field="batch">库存批次</th> <th data-field="userName">操作人</th> @@ -162,7 +162,38 @@ }); } + function buildJumpToDetailInfo(value, row, index) { + console.log(row) + var html = []; + if (row.orderType.indexOf("入库") > 0) { + html[0] = '<a onClick="lookInstore( \'' + row.id +'\')" class="text-primary " >'+value+'</a>'; + } else { + html[0] = '<a onClick="lookOutstore( \'' + row.id +'\')" class="text-primary " >'+value+'</a>'; + } + return html; + } + function lookInstore(id) { + layer.full( + layer.open({ + type: 2, + title: "查看入库单", + area: [MUI.SIZE_L, '400px'], + maxmin: true, + content: [basePath+'/admin/instore/lookInfo?id=' + id] + })); + } + + function lookOutstore(id){ + layer.full( + layer.open({ + type : 2, + title : "查看出库单", + area : [ MUI.SIZE_L, '400px' ], + maxmin : true, + content : [ basePath+'/admin/outstore/lookForm?id=' + id] + })); + } </script> </body> -- Gitblit v1.9.1