From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 17 Jul 2021 15:59:10 +0800 Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为,全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距,和收银人 6. PC端服务单新增划扣金额展示 --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/store-inout-list.html | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) 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