报表添加选择食堂，报表修改
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 90e2544..d348bac 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -29,16 +29,16 @@
payapi.url=https://yy.dlsmk.cn/payapi
-cron.offlinedtl=0/10 * * * * ?
+cron.offlinedtl=-
# 对账任务
-restaurant.chkdtltask.cron=27 3/10 * * * ?
+restaurant.chkdtltask.cron=-
# 统计任务
-restaurant.statement.cron=0 7/10 * * * ?
+restaurant.statement.cron=-
# 客户信息校对任务
-restaurant.customercheck.cron=0 0/1 * * * ?
+restaurant.customercheck.cron=-
# 流水入账任务
-restaurant.submitofflinedtl.cron=0 0/1 * * * ?
+restaurant.submitofflinedtl.cron=-
# 查询流水状态任务
-restaurant.querydtlresult.cron=0 0/2 * * * ?
+restaurant.querydtlresult.cron=-
diff --git a/src/main/resources/static/libs/custom.js b/src/main/resources/static/libs/custom.js
index a0177b3..aad7b9d 100644
--- a/src/main/resources/static/libs/custom.js
+++ b/src/main/resources/static/libs/custom.js
@@ -65,6 +65,7 @@
.addNewDict("transtatusList")
.addNewDict("idtypeList")
.addNewDict("sexList")
+ .addNewDict("mealtypeList")
.addNewDict("accountStatusList")
},
getDict: function (dictType) {
diff --git a/src/main/resources/templates/restaurant/custtypereport/index.html b/src/main/resources/templates/restaurant/custtypereport/index.html
index acafee3..edb8a17 100644
--- a/src/main/resources/templates/restaurant/custtypereport/index.html
+++ b/src/main/resources/templates/restaurant/custtypereport/index.html
@@ -24,6 +24,14 @@
</div>
<div class="layui-inline">
+ <label class="layui-form-label">选择设备组</label>
+ <div class="layui-input-block">
+ <input type="text" name="groupid" id="custtypereport-search-devgroup"
+ autocomplete="off" class="layui-input"/>
+ </div>
+ </div>
+
+ <div class="layui-inline">
<button id="custtypereport-search-btn" class="layui-btn icon-btn" data-type="search"><i
class="layui-icon"></i>搜索
</button>
@@ -65,7 +73,7 @@
</tr>
</thead>
- <tbody id="shopreport-custtypereport-tbody" th:data-startdate="${searchBean.startdate}" th:data-enddate="${searchBean.enddate}" th:data-opercode="${opercode}">
+ <tbody id="shopreport-custtypereport-tbody" th:data-startdate="${searchBean.startdate}" th:data-enddate="${searchBean.enddate}" th:data-opercode="${opercode}">
<tr th:if="${null==showlist || showlist.size()==0}">
<td colspan="16">无数据</td>
</tr>
@@ -98,10 +106,35 @@
<script>
- layui.use(['form', 'layer', 'element', 'laydate'], function () {
+ layui.use(['form', 'layer', 'element', 'laydate','treeSelect'], function () {
var laydate = layui.laydate;
var layer = layui.layer;
var $ = layui.jquery;
+ var treeSelect = layui.treeSelect;
+
+ treeSelect.render({
+ elem: '#custtypereport-search-devgroup',
+ data: '[[@{/discountrule/devgroupbranchtree}]]',
+ type: 'get',
+ placeholder: '选择食堂',
+ search: false,
+ style: {
+ folder: {
+ enable: false
+ },
+ line: {
+ enable: true
+ }
+ },
+ // 点击回调
+ click: function (d) {
+ return true;
+ },
+ success: function (d) {
+ console.log(d); // 加载完成后的回调函数
+ }
+ });
+
laydate.render({
elem: '#custtypereport-search-startdate',
@@ -117,6 +150,7 @@
$('#custtypereport-search-btn').click(function () {
var startdate = $("#custtypereport-search-startdate").val();
var enddate = $("#custtypereport-search-enddate").val();
+ var groupid = $("#custtypereport-search-devgroup").val();
if (null == startdate || "" == $.trim(startdate)) {
layer.msg('请选择起始日期', {icon: 2, time: 1500});
return;
@@ -132,6 +166,7 @@
data: {
startdate: startdate,
enddate: enddate,
+ groupid: groupid,
_csrf: $("meta[name='_csrf_token']").attr("value")
},
success: function (data) {
@@ -148,8 +183,9 @@
$("#shopreport-custtypereport-export-excel").click(function(){
var startdate= $("#shopreport-custtypereport-tbody").attr("data-startdate");
var enddate= $("#shopreport-custtypereport-tbody").attr("data-enddate");
+ var groupid = $("#custtypereport-search-devgroup").val();
- var dataUrl='[[@{/custtypereport/excelexport}]]?startdate='+startdate+'&enddate='+enddate;
+ var dataUrl='[[@{/custtypereport/excelexport}]]?startdate='+startdate+'&enddate='+enddate+'&groupid='+groupid;
var xhr = new XMLHttpRequest();
xhr.responseType = "blob"; //设置响应类型为blob类型
xhr.onload = function () {
@@ -182,8 +218,10 @@
$("#shopreport-custtypereport-print-table").click(function(){
var startdate= $("#shopreport-custtypereport-tbody").attr("data-startdate");
var enddate= $("#shopreport-custtypereport-tbody").attr("data-enddate");
+ var groupid = $("#custtypereport-search-devgroup").val();
+
var opercode = $("#shopreport-custtypereport-tbody").attr("data-opercode");
- var url = '/custtypereport/print/printcusttypereport?startdate=' + startdate + '&enddate=' + enddate + '&opercode=' + opercode;
+ var url = '/custtypereport/print/printcusttypereport?startdate=' + startdate + '&enddate=' + enddate +'&groupid=' + groupid+ '&opercode=' + opercode;
LODOP = getLodop();
LODOP.PRINT_INIT("客户类别消费报表");
diff --git a/src/main/resources/templates/restaurant/dailyreport/print/printdailyreport.html b/src/main/resources/templates/restaurant/dailyreport/print/printdailyreport.html
index f5ca33d..e9908e1 100644
--- a/src/main/resources/templates/restaurant/dailyreport/print/printdailyreport.html
+++ b/src/main/resources/templates/restaurant/dailyreport/print/printdailyreport.html
@@ -136,29 +136,16 @@
<div class="layui-card-body" style="margin-top: 25px;">
<table class="sw-print-sign">
<tr>
- <td width="50%">银行方审核盖章：</td>
+ <td width="50%">大理州公安局警务保障处审核盖章：</td>
<td width="50%">苍山饭店审核盖章：</td>
</tr>
<tr>
- <td>审核人：</td>
+ <td>经办人：</td>
<td>审核人：</td>
</tr>
<tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td>市民卡公司审核盖章：</td>
- <td>建桥园审核盖章：</td>
- </tr>
- <tr>
<td>审核人：</td>
- <td>审核人：</td>
+
</tr>
</table>
</div>
diff --git a/src/main/resources/templates/restaurant/deptreport/print/printdeptreport.html b/src/main/resources/templates/restaurant/deptreport/print/printdeptreport.html
index 0dda404..6bb83cd 100644
--- a/src/main/resources/templates/restaurant/deptreport/print/printdeptreport.html
+++ b/src/main/resources/templates/restaurant/deptreport/print/printdeptreport.html
@@ -136,29 +136,16 @@
<div class="layui-card-body" style="margin-top: 25px;">
<table class="sw-print-sign">
<tr>
- <td width="50%">银行方审核盖章：</td>
+ <td width="50%">大理州公安局警务保障处审核盖章：</td>
<td width="50%">苍山饭店审核盖章：</td>
</tr>
<tr>
- <td>审核人：</td>
+ <td>经办人：</td>
<td>审核人：</td>
</tr>
<tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td>市民卡公司审核盖章：</td>
- <td>建桥园审核盖章：</td>
- </tr>
- <tr>
<td>审核人：</td>
- <td>审核人：</td>
+
</tr>
</table>
</div>
diff --git a/src/main/resources/templates/restaurant/report/laborcount.html b/src/main/resources/templates/restaurant/report/laborcount.html
index c5826be..a1dc870 100644
--- a/src/main/resources/templates/restaurant/report/laborcount.html
+++ b/src/main/resources/templates/restaurant/report/laborcount.html
@@ -41,6 +41,16 @@
</div>
</div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 0;">
+ <div class="layui-inline">
+ <label class="layui-form-label">食堂</label>
+ <div class="layui-input-block">
+ <input type="text" name="groupid" id="labercount-search-devgroup"
+ autocomplete="off" class="layui-input"/>
+ </div>
+ </div>
+
<div class="layui-inline">
<button id="shopreport-labercount-search-btn" class="layui-btn icon-btn" data-type="search"><i
class="layui-icon"></i>搜索
@@ -130,13 +140,21 @@
</table>
</div>
</div>
+<style>
+ .layui-form-select{
+ width: 290px !important;
+ }
+</style>
<script>
- layui.use(['form', 'layer', 'laydate', 'admin'], function () {
+ layui.use(['form', 'layer', 'laydate', 'admin', 'treeSelect'], function () {
var form = layui.form;
var laydate = layui.laydate;
var layer = layui.layer;
var $ = layui.jquery;
+ var form = layui.form;
+ var treeSelect = layui.treeSelect;
+ form.render("select");
form.render("checkbox");
laydate.render({
@@ -160,10 +178,34 @@
trigger: 'click'
});
+ treeSelect.render({
+ elem: '#labercount-search-devgroup',
+ data: '[[@{/discountrule/devgroupbranchtree}]]',
+ type: 'get',
+ placeholder: '选择设备组',
+ search: false,
+ style: {
+ folder: {
+ enable: false
+ },
+ line: {
+ enable: true
+ }
+ },
+ // 点击回调
+ click: function (d) {
+ return true;
+ },
+ success: function (d) {
+ console.log(d); // 加载完成后的回调函数
+ }
+ });
+
$("#shopreport-labercount-search-btn").click(function(){
var startdate=$("#shopreport-labercount-search-startdate").val();
var enddate = $("#shopreport-labercount-search-enddate").val();
var yearmonth=$("#shopreport-labercount-search-yearmonth").val();
+ var groupid = $("#labercount-search-devgroup").val();
var dtype = $("#shopreport-labercount-datetype").is(":checked")?"month":"days";
if ("month" == dtype) {
if (isempty(yearmonth)) {
@@ -184,6 +226,7 @@
data: {
startdate: startdate,
enddate: enddate,
+ groupid: groupid,
datetype: dtype,
yearmonth: yearmonth,
_csrf: $("meta[name='_csrf_token']").attr("value")
@@ -207,7 +250,9 @@
var datetype= $("#shopreport-labercount-tbody").attr("data-datetype");
var yearmonth= $("#shopreport-labercount-tbody").attr("data-yearmonth");
var opercode = $("#shopreport-labercount-tbody").attr("data-opercode");
- var url = '/report/print/printlaborcnt?startdate=' + startdate + '&enddate=' + enddate + '&datetype=' + datetype + '&yearmonth=' + yearmonth + '&opercode=' + opercode;
+ var groupid = $("#labercount-search-devgroup").val();
+
+ var url = '/report/print/printlaborcnt?startdate=' + startdate + '&enddate=' + enddate + '&datetype=' + datetype + '&groupid=' + groupid + '&yearmonth=' + yearmonth + '&opercode=' + opercode;
LODOP = getLodop();
LODOP.PRINT_INIT("商户劳务费报表");
@@ -228,8 +273,8 @@
var enddate= $("#shopreport-labercount-tbody").attr("data-enddate");
var datetype= $("#shopreport-labercount-tbody").attr("data-datetype");
var yearmonth= $("#shopreport-labercount-tbody").attr("data-yearmonth");
-
- var dataUrl='[[@{/report/excelexportlaborcnt}]]?startdate='+startdate+'&enddate='+enddate+'&datetype='+datetype+'&yearmonth='+yearmonth;
+ var groupid = $("#labercount-search-devgroup").val();
+ var dataUrl='[[@{/report/excelexportlaborcnt}]]?startdate='+startdate+'&enddate='+enddate+'&groupid='+groupid+'&datetype='+datetype+'&yearmonth='+yearmonth;
var xhr = new XMLHttpRequest();
xhr.responseType = "blob"; //设置响应类型为blob类型
xhr.onload = function () {
diff --git a/src/main/resources/templates/restaurant/report/laborfee.html b/src/main/resources/templates/restaurant/report/laborfee.html
index ac93c25..4636477 100644
--- a/src/main/resources/templates/restaurant/report/laborfee.html
+++ b/src/main/resources/templates/restaurant/report/laborfee.html
@@ -40,6 +40,15 @@
title="按月份查询"/>
</div>
</div>
+ </div>
+ <div class="layui-form-item" style="margin-bottom: 0; ">
+ <div class="layui-inline">
+ <label class="layui-form-label">食堂</label>
+ <div class="layui-input-block">
+ <input type="text" name="groupid" id="laborfee-search-devgroup"
+ autocomplete="off" class="layui-input"/>
+ </div>
+ </div>
<div class="layui-inline">
<button id="shopreport-laborfee-search-btn" class="layui-btn icon-btn" data-type="search"><i
@@ -83,7 +92,7 @@
<th rowspan="2" style="text-align: center;min-width: 60px;">应支付劳<br/>务费小计</th>
</tr>
</thead>
- <tbody id="shopreport-laborfee-tbody" th:data-startdate="${searchBean.startdate}" th:data-enddate="${searchBean.enddate}" th:data-datetype="${searchBean.datetype}" th:data-yearmonth="${searchBean.yearmonth}" th:data-opercode="${opercode}">
+ <tbody id="shopreport-laborfee-tbody" th:data-startdate="${searchBean.startdate}" th:data-enddate="${searchBean.enddate}" th:data-groupid="${searchBean.groupid}" th:data-datetype="${searchBean.datetype}" th:data-yearmonth="${searchBean.yearmonth}" th:data-opercode="${opercode}">
<tr th:if="${null==showlist || showlist.size()==0}">
<td colspan="13">无数据</td>
</tr>
@@ -150,12 +159,20 @@
</div>
</div>
+<style>
+ .layui-form-select{
+ width: 290px !important;
+ }
+
+</style>
+
<script>
- layui.use(['form', 'layer', 'laydate', 'admin'], function () {
- var form = layui.form;
+ layui.use(['form', 'layer', 'laydate', 'admin','treeSelect'], function () {
var laydate = layui.laydate;
var layer = layui.layer;
var $ = layui.jquery;
+ var form = layui.form;
+ var treeSelect = layui.treeSelect;
form.render("checkbox");
laydate.render({
@@ -179,10 +196,36 @@
trigger: 'click'
});
+
+
+ treeSelect.render({
+ elem: '#laborfee-search-devgroup',
+ data: '[[@{/discountrule/devgroupbranchtree}]]',
+ type: 'get',
+ placeholder: '选择食堂',
+ search: false,
+ style: {
+ folder: {
+ enable: false
+ },
+ line: {
+ enable: true
+ }
+ },
+ // 点击回调
+ click: function (d) {
+ return true;
+ },
+ success: function (d) {
+ console.log(d); // 加载完成后的回调函数
+ }
+ });
+
$("#shopreport-laborfee-search-btn").click(function(){
var startdate=$("#shopreport-laborfee-search-startdate").val();
var enddate = $("#shopreport-laborfee-search-enddate").val();
var yearmonth=$("#shopreport-laborfee-search-yearmonth").val();
+ var groupid = $("#laborfee-search-devgroup").val();
var dtype = $("#shopreport-laborfee-datetype").is(":checked")?"month":"days";
if ("month" == dtype) {
if (isempty(yearmonth)) {
@@ -204,6 +247,7 @@
startdate: startdate,
enddate: enddate,
datetype: dtype,
+ groupid:groupid,
yearmonth: yearmonth,
_csrf: $("meta[name='_csrf_token']").attr("value")
},
@@ -226,7 +270,8 @@
var datetype= $("#shopreport-laborfee-tbody").attr("data-datetype");
var yearmonth= $("#shopreport-laborfee-tbody").attr("data-yearmonth");
var opercode = $("#shopreport-laborfee-tbody").attr("data-opercode");
- var url = '/report/print/printlaborfee?startdate=' + startdate + '&enddate=' + enddate + '&datetype=' + datetype + '&yearmonth=' + yearmonth + '&opercode=' + opercode;
+ var groupid = $("#laborfee-search-devgroup").val();
+ var url = '/report/print/printlaborfee?startdate=' + startdate + '&enddate=' + enddate + '&datetype=' + datetype + '&groupid=' + groupid + '&yearmonth=' + yearmonth + '&opercode=' + opercode;
LODOP = getLodop();
LODOP.PRINT_INIT("商户劳务费报表");
@@ -247,8 +292,8 @@
var enddate= $("#shopreport-laborfee-tbody").attr("data-enddate");
var datetype= $("#shopreport-laborfee-tbody").attr("data-datetype");
var yearmonth= $("#shopreport-laborfee-tbody").attr("data-yearmonth");
-
- var dataUrl='[[@{/report/excelexportlaborfee}]]?startdate='+startdate+'&enddate='+enddate+'&datetype='+datetype+'&yearmonth='+yearmonth;
+ var groupid = $("#laborfee-search-devgroup").val();
+ var dataUrl='[[@{/report/excelexportlaborfee}]]?startdate='+startdate+'&enddate='+enddate + '&groupid=' + groupid+ '&datetype='+datetype+'&yearmonth='+yearmonth;
var xhr = new XMLHttpRequest();
xhr.responseType = "blob"; //设置响应类型为blob类型
xhr.onload = function () {
diff --git a/src/main/resources/templates/restaurant/report/print/printlaborcount.html b/src/main/resources/templates/restaurant/report/print/printlaborcount.html
index 255777f..3b34ca7 100644
--- a/src/main/resources/templates/restaurant/report/print/printlaborcount.html
+++ b/src/main/resources/templates/restaurant/report/print/printlaborcount.html
@@ -98,29 +98,16 @@
<div class="layui-card-body" style="margin-top: 25px;">
<table class="sw-print-sign">
<tr>
- <td width="50%">银行方审核盖章：</td>
+ <td width="50%">大理州公安局警务保障处审核盖章：</td>
<td width="50%">苍山饭店审核盖章：</td>
</tr>
<tr>
- <td>审核人：</td>
+ <td>经办人：</td>
<td>审核人：</td>
</tr>
<tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td>市民卡公司审核盖章：</td>
- <td>建桥园审核盖章：</td>
- </tr>
- <tr>
<td>审核人：</td>
- <td>审核人：</td>
+
</tr>
</table>
</div>
diff --git a/src/main/resources/templates/restaurant/transdtl/index.html b/src/main/resources/templates/restaurant/transdtl/index.html
index 2b3ca6f..b5d8973 100644
--- a/src/main/resources/templates/restaurant/transdtl/index.html
+++ b/src/main/resources/templates/restaurant/transdtl/index.html
@@ -222,6 +222,16 @@
return getTempDictValue('transtypeList',item.transtype);
}
},
+ {
+ field: 'transtype',
+ title: '流水类型',
+ width:100,
+ sort: true,
+ align: 'center',
+ templet: function (item) {
+ return getTempDictValue('transtypeList',item.mealtype);
+ }
+ },
]
]
});