From 18d1683f12ad0b47116b33058672751a1277677a Mon Sep 17 00:00:00 2001 From: tdd Date: Mon, 17 Jun 2019 09:08:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/BootStrapUI/datas/nav.js | 4 +- WebContent/BootStrapUI/index.jsp | 6 + WebContent/BootStrapUI/js/index.js | 9 +- .../pages/hpf/projectInfo/projectInfoList.jsp | 24 +- WebContent/WEB-INF/pages/hy/clientlogbook.jsp | 2 +- WebContent/WEB-INF/pages/lz/invoiceList.jsp | 52 +- WebContent/WEB-INF/pages/lz/payableList.jsp | 187 +++--- WebContent/WEB-INF/pages/lz/paymentList.jsp | 60 +- .../WEB-INF/pages/lz/receivableList.jsp | 585 +++++++++--------- WebContent/WEB-INF/pages/zc/forMe.jsp | 8 +- WebContent/WEB-INF/pages/zc/form/ticket.jsp | 11 +- .../classes/com/sdry/entity/lz/PayPage.class | Bin 1308 -> 1308 bytes .../web/controller/lz/ReportController.class | Bin 28145 -> 28177 bytes .../web/controller/tdd/ArpsController$1.class | Bin 738 -> 738 bytes .../web/controller/tdd/ArpsController$2.class | Bin 743 -> 743 bytes .../web/controller/tdd/ArpsController$3.class | Bin 746 -> 746 bytes .../web/controller/tdd/ArpsController.class | Bin 13251 -> 13293 bytes build/classes/db.properties | 4 + config/db.properties | 4 + src/com/sdry/entity/hpf/ProjectInfo.java | 2 +- src/com/sdry/entity/lz/PayPage.java | 1 + .../web/controller/lz/ReportController.java | 8 +- .../web/controller/tdd/ArpsController.java | 5 +- 23 files changed, 574 insertions(+), 398 deletions(-) diff --git a/WebContent/BootStrapUI/datas/nav.js b/WebContent/BootStrapUI/datas/nav.js index 72521c1..31aa563 100644 --- a/WebContent/BootStrapUI/datas/nav.js +++ b/WebContent/BootStrapUI/datas/nav.js @@ -118,10 +118,10 @@ var navs = [{ "title": "发票列表", "icon": "", "href": "/BaseFrame/Report/invoiceList.do" - },{ + /*},{ "title": "管理预算", "icon": "", - "href": "/BaseFrame/Report/manageBudgetList.do" + "href": "/BaseFrame/Report/manageBudgetList.do"*/ },{ "title": "应收账款", "icon": "", diff --git a/WebContent/BootStrapUI/index.jsp b/WebContent/BootStrapUI/index.jsp index 200530c..a093989 100644 --- a/WebContent/BootStrapUI/index.jsp +++ b/WebContent/BootStrapUI/index.jsp @@ -1,4 +1,6 @@ +<%@page import="com.sdry.entity.tdd.Staff"%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<% Staff user = (Staff) session.getAttribute("staff"); %> @@ -40,6 +42,7 @@ ${staff.sname} +
<%--
@@ -110,7 +113,10 @@ + + + + +
diff --git a/WebContent/WEB-INF/pages/lz/payableList.jsp b/WebContent/WEB-INF/pages/lz/payableList.jsp index 66480c2..d243766 100644 --- a/WebContent/WEB-INF/pages/lz/payableList.jsp +++ b/WebContent/WEB-INF/pages/lz/payableList.jsp @@ -72,13 +72,17 @@ align : 'center', title : '供应商名称' }, { + field : 'number', + align : 'center', + title : '项目编号' + /* }, { field : '', align : 'center', - title : '账期' - }, { + title : '账期' */ + /* }, { field : '', align : 'center', - title : '税率' + title : '税率' */ }, { field : 'budget', align : 'center', @@ -99,99 +103,108 @@ field : 'difference', align : 'center', title : '未付金额' - }, { + /* }, { field : '', align : 'center', - title : '备注' + title : '备注' */ } ], onClickRow: function (row) { /* alert(row.proNum); */ + var supplier = row.supplier + var number = row.number /* 实例化第一个下表 */ - $('#tb_departments1').bootstrapTable({ - url : '${pageContext.request.contextPath }/Report/queryAllpayAbleList1.do', //请求后台的URL(*) - method : 'get', //请求方式(*) - /* toolbar : '#toolbar', */ //工具按钮用哪个容器 - striped : true, //是否显示行间隔色 - cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) - pagination : true, //是否显示分页(*) - sortable : false, //是否启用排序 - sortOrder : "asc", //排序方式 - sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) - // pageNumber : 1, //初始化加载第一页,默认第一页 - pageSize : 10, //每页的记录行数(*) - pageList : [10, 20, 30], //可供选择的每页的行数(*) - queryParams : function queryParams(params){ - - var temp = { - limit: params.limit, - offset: params.offset/params.limit + 1, - }; - return temp; - },//传递参数(*) - strictSearch : true, - clickToSelect : true, //是否启用点击选中行 - height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 - uniqueId : "ID", //每一行的唯一标识,一般为主键列 - detailView : false, //是否显示父子表 - // smartDisplay : false, - columns : [ { - checkbox : true - }, { - field : 'approvalTime', - align : 'center', - title : '采购日期' - }, { - field : 'remark02', - align : 'center', - title : '待付款项目名称' - }, { - field : 'budget', - align : 'center', - title : '金额' - }, { - field : 'approvalTime', - align : 'center', - title : '发票日期' - }, { - field : 'approver', - align : 'center', - title : '发票号' - }, { - field : 'enclosure', - align : 'center', - title : '发票金额' - }, { - field : 'invoiceType', - align : 'center', - title : '税率' - }, { - field : 'pay', - align : 'center', - title : '应付金额' - }, { - field : 'dept', - align : 'center', - title : '付款日期' - }, { - field : 'alreadyPaid', - align : 'center', - title : '结算金额' - }, { - field : 'supplier', - align : 'center', - title : '欠款金额' - }, { - field : 'remark03', - align : 'center', - title : '付款方式' - }, { - field : 'remark04', - align : 'center', - title : '备注' - }], + $("#tb_departments1").bootstrapTable('refresh',{ + url:'${pageContext.request.contextPath }/Report/queryAllpayAbleList1.do?key01='+supplier+"&key02="+number }); } }); + + //子表 + $('#tb_departments1').bootstrapTable({ + //url : '${pageContext.request.contextPath }/Report/queryAllpayAbleList1.do', //请求后台的URL(*) + method : 'get', //请求方式(*) + /* toolbar : '#toolbar', */ //工具按钮用哪个容器 + striped : true, //是否显示行间隔色 + cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) + pagination : true, //是否显示分页(*) + sortable : false, //是否启用排序 + sortOrder : "asc", //排序方式 + sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) + // pageNumber : 1, //初始化加载第一页,默认第一页 + pageSize : 10, //每页的记录行数(*) + pageList : [10, 20, 30], //可供选择的每页的行数(*) + queryParams : function queryParams(params){ + + var temp = { + limit: params.limit, + offset: params.offset/params.limit + 1, + }; + return temp; + },//传递参数(*) + strictSearch : true, + clickToSelect : true, //是否启用点击选中行 + height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 + uniqueId : "ID", //每一行的唯一标识,一般为主键列 + detailView : false, //是否显示父子表 + // smartDisplay : false, + columns : [ { + checkbox : true + }, { + field : 'approvalTime', + align : 'center', + title : '采购日期' + }, { + field : 'remark02', + align : 'center', + title : '待付款项目名称' + }, { + field : 'budget', + align : 'center', + title : '金额' + }, { + field : 'approvalTime', + align : 'center', + title : '发票日期' + }, { + field : 'approver', + align : 'center', + title : '发票号' + }, { + field : 'enclosure', + align : 'center', + title : '发票金额' + }, { + field : 'invoiceType', + align : 'center', + title : '税率' + }, { + field : 'pay', + align : 'center', + title : '应付金额' + }, { + field : 'dept', + align : 'center', + title : '付款日期' + }, { + field : 'alreadyPaid', + align : 'center', + title : '结算金额' + }, { + field : 'supplier', + align : 'center', + title : '欠款金额' + }, { + field : 'remark03', + align : 'center', + title : '付款方式' + }, { + field : 'remark04', + align : 'center', + title : '备注' + }], + }); + + }; //得到查询的参数 oTableInit.queryParams = function(params) { diff --git a/WebContent/WEB-INF/pages/lz/paymentList.jsp b/WebContent/WEB-INF/pages/lz/paymentList.jsp index 1883178..f6d897b 100644 --- a/WebContent/WEB-INF/pages/lz/paymentList.jsp +++ b/WebContent/WEB-INF/pages/lz/paymentList.jsp @@ -9,6 +9,11 @@ + + + + +
diff --git a/WebContent/WEB-INF/pages/lz/receivableList.jsp b/WebContent/WEB-INF/pages/lz/receivableList.jsp index 7f53eb2..288f7cb 100644 --- a/WebContent/WEB-INF/pages/lz/receivableList.jsp +++ b/WebContent/WEB-INF/pages/lz/receivableList.jsp @@ -108,6 +108,14 @@ field : 'cosName', align : 'center', title : '客户' + /* }, { + field : 'pnum', + align : 'center', + title : '项目编号' */ + }, { + field : 'pname', + align : 'center', + title : '项目名称' }, { field : 'money', align : 'center', @@ -159,288 +167,305 @@ } ], onClickRow: function (row) { /* 实例化第一个下表 (已开票未回款)*/ - $('#table01').bootstrapTable({ - url : '${pageContext.request.contextPath }/Report/queryProjectInfoList1.do', //请求后台的URL(*) - method : 'get', //请求方式(*) - striped : true, //是否显示行间隔色 - cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) - pagination : true, //是否显示分页(*) - sortable : false, //是否启用排序 - sortOrder : "asc", //排序方式 - sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) - pageList : [10, 20, 30], //可供选择的每页的行数(*) - queryParams : function queryParams(params){ - var temp = { - limit: params.limit, - offset: params.offset/params.limit + 1, - /* key01 :row.cosName, - key02 :row.pid, */ - }; - return temp; - },//传递参数(*) - strictSearch : true, - clickToSelect : true, //是否启用点击选中行 - height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 - uniqueId : "ID", //每一行的唯一标识,一般为主键列 - detailView : false, //是否显示父子表 - // smartDisplay : false, - columns : [ { - checkbox : true - }, { - field : 'customer', - align : 'center', - title : '客户' - }, { - field : 'pname', - align : 'center', - title : '项目名称' - }, { - field : 'number', - align : 'center', - title : '项目编号' - }, { - field : 'contract', - align : 'center', - title : '销售金额' - }, { - field : 'invoice', - align : 'center', - title : '开票金额' - }, { - field : 'remark05', - align : 'center', - title : '发票号码' - }, { - field : 'remark06', - align : 'center', - title : '回款金额' - }, { - field : 'remark04', - align : 'center', - title : '已开票未回款金额' - }, { - field : 'approver', - align : 'center', - title : '项目负责人' - }, { - field : '', - align : 'center', - title : '预计回款时间' - }], - }); - - /* 实例化第二个下表(已完工未开票) */ - $('#table02').bootstrapTable({ - url : '${pageContext.request.contextPath }/Report/queryProjectInfoList2.do', //请求后台的URL(*) - method : 'get', //请求方式(*) - striped : true, //是否显示行间隔色 - cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) - pagination : true, //是否显示分页(*) - sortable : false, //是否启用排序 - sortOrder : "asc", //排序方式 - sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) - pageList : [10, 20, 30], //可供选择的每页的行数(*) - queryParams : function queryParams(params){ - var temp = { - limit: params.limit, - offset: params.offset/params.limit + 1, - /* key01 :row.cosName, - key02 :row.pid, */ - }; - return temp; - },//传递参数(*) - strictSearch : true, - clickToSelect : true, //是否启用点击选中行 - height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 - uniqueId : "ID", //每一行的唯一标识,一般为主键列 - detailView : false, //是否显示父子表 - // smartDisplay : false, - columns : [ { - checkbox : true - }, { - field : 'cosid', - align : 'center', - title : '客户' - }, { - field : 'pname', - align : 'center', - title : '项目名称' - }, { - field : 'pnum', - align : 'center', - title : '项目编号' - }, { - field : 'contacts', - align : 'center', - title : '销售金额' - }, { - field : '', - align : 'center', - title : '开票时间' - }, { - field : '', - align : 'center', - title : '开票金额' - }, { - field : '', - align : 'center', - title : '发票号码' - }, { - field : 'reserve3', - align : 'center', - title : '回款金额' - }, { - field : 'pcway', - align : 'center', - title : '未开票未回款金额' - }, { - field : 'xstid', - align : 'center', - title : '项目负责人' - }, { - field : '', - align : 'center', - title : '预计开票时间' - }, { - field : '', - align : 'center', - title : '预计回款时间' - }], + var key01 = row.cosName + var key02 = row.pid + var pnum = row.pnum + /* 实例化第一个下表 */ + $("#table01").bootstrapTable('refresh',{ + url:'${pageContext.request.contextPath }/Report/queryProjectInfoList1.do' + +'?'+'key01='+key01+'&key02='+pnum }); - - /* 实例化第三个下表(项目未完工) */ - $('#table03').bootstrapTable({ - url : '${pageContext.request.contextPath }/Report/queryProjectInfoList3.do', //请求后台的URL(*) - method : 'get', //请求方式(*) - striped : true, //是否显示行间隔色 - cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) - pagination : true, //是否显示分页(*) - sortable : false, //是否启用排序 - sortOrder : "asc", //排序方式 - sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) - pageList : [10, 20, 30], //可供选择的每页的行数(*) - queryParams : function queryParams(params){ - var temp = { - limit: params.limit, - offset: params.offset/params.limit + 1, - /* key01 :row.cosName, - key02 :row.pid, */ - }; - return temp; - },//传递参数(*) - strictSearch : true, - clickToSelect : true, //是否启用点击选中行 - height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 - uniqueId : "ID", //每一行的唯一标识,一般为主键列 - detailView : true, //是否显示父子表 - // smartDisplay : false, - columns : [ { - checkbox : true - }, { - field : 'cosid', - align : 'center', - title : '客户' - }, { - field : 'pname', - align : 'center', - title : '项目名称' - }, { - field : 'pnum', - align : 'center', - title : '项目编号' - }, { - field : 'contacts', - align : 'center', - title : '销售金额' - }/* , { - field : '', - align : 'center', - title : '开票时间' - }, { - field : '', - align : 'center', - title : '开票金额' - }, { - field : '', - align : 'center', - title : '发票号码' - } */, { - field : 'reserve3', - align : 'center', - title : '回款金额' - }, { - field : 'reserve2', - align : 'center', - title : '已开票未回款金额' - }, { - field : 'pcway', - align : 'center', - title : '未开票未回款金额' - }, { - field : 'xstid', - align : 'center', - title : '项目负责人' - }, { - field : '', - align : 'center', - title : '预计开票时间' - }, { - field : '', - align : 'center', - title : '预计回款时间' - }], - - - onExpandRow: function (index, row, $detail) { - var cur_table = $detail.html('
').find('table'); - $(cur_table).bootstrapTable({ - url: "${pageContext.request.contextPath }/Report/queryInvoiceByNum.do?pnum="+row.pnum, //请求后台的URL(*) - method: 'post', //请求方式(*) - pagination: false, //是否显示分页(*) - sidePagination: "server", //分页方式:client客户端分页,server服务端分页(*) - /* pageNumber: 1, //初始化加载第一页,默认第一页 - pageSize: 10, //每页的记录行数(*) - pageList: [10, 20, 30], //可供选择的每页的行数(*) */ - maintainSelected: false, - minimumCountColumns: 2, //最少允许的列数 - clickToSelect: true, //是否启用点击选中行 - height: 200, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 - queryParams: function queryParams(params) { - var temp = { //这里的键的名字和控制器的变量名必须一直,这边改动,控制器也需要改成一样的 - pageSize: params.limit, //页面大小 - page: params.offset / params.limit + 1, //页码 - }; - return temp; - }, - columns: [ - [ - { - field: 'number', - visible : false - }, - { - field: 'invoiceDate', - title: '开票时间', - valign: "middle", - align: "center", - }, - { - field: 'invoice', - title: '开票金额', - valign: "middle", - align: "center" - }, - { - field: 'remark05', - title: '发票号', - valign: "middle", - align: "center" - }, - ] - ] - }); - } + $("#table02").bootstrapTable('refresh',{ + url:'${pageContext.request.contextPath }/Report/queryProjectInfoList2.do' + +'?'+'key01='+key01+'&key02='+key02 }); + $("#table03").bootstrapTable('refresh',{ + url:'${pageContext.request.contextPath }/Report/queryProjectInfoList3.do' + +'?'+'key01='+key01+'&key02='+key02 + }); + } + }); + + $('#table01').bootstrapTable({ + //url : '${pageContext.request.contextPath }/Report/queryProjectInfoList1.do', //请求后台的URL(*) + method : 'get', //请求方式(*) + striped : true, //是否显示行间隔色 + cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) + pagination : true, //是否显示分页(*) + sortable : false, //是否启用排序 + sortOrder : "asc", //排序方式 + sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) + pageList : [10, 20, 30], //可供选择的每页的行数(*) + queryParams : function queryParams(params){ + var temp = { + limit: params.limit, + offset: params.offset/params.limit + 1, + /* key01 :row.cosName, + key02 :row.pid, */ + }; + return temp; + },//传递参数(*) + strictSearch : true, + clickToSelect : true, //是否启用点击选中行 + height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 + uniqueId : "ID", //每一行的唯一标识,一般为主键列 + detailView : false, //是否显示父子表 + // smartDisplay : false, + columns : [ { + checkbox : true + }, { + field : 'customer', + align : 'center', + title : '客户' + }, { + field : 'pname', + align : 'center', + title : '项目名称' + }, { + field : 'number', + align : 'center', + title : '项目编号' + }, { + field : 'contract', + align : 'center', + title : '销售金额' + }, { + field : 'invoice', + align : 'center', + title : '开票金额' + }, { + field : 'remark05', + align : 'center', + title : '发票号码' + }, { + field : 'remark06', + align : 'center', + title : '回款金额' + }, { + field : 'remark04', + align : 'center', + title : '已开票未回款金额' + }, { + field : 'approver', + align : 'center', + title : '项目负责人' + }, { + field : '', + align : 'center', + title : '预计回款时间' + }], + }); + + /* 实例化第二个下表(已完工未开票) */ + $('#table02').bootstrapTable({ + //url : '${pageContext.request.contextPath }/Report/queryProjectInfoList2.do', //请求后台的URL(*) + method : 'get', //请求方式(*) + striped : true, //是否显示行间隔色 + cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) + pagination : true, //是否显示分页(*) + sortable : false, //是否启用排序 + sortOrder : "asc", //排序方式 + sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) + pageList : [10, 20, 30], //可供选择的每页的行数(*) + queryParams : function queryParams(params){ + var temp = { + limit: params.limit, + offset: params.offset/params.limit + 1, + /* key01 :row.cosName, + key02 :row.pid, */ + }; + return temp; + },//传递参数(*) + strictSearch : true, + clickToSelect : true, //是否启用点击选中行 + height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 + uniqueId : "ID", //每一行的唯一标识,一般为主键列 + detailView : false, //是否显示父子表 + // smartDisplay : false, + columns : [ { + checkbox : true + }, { + field : 'cosid', + align : 'center', + title : '客户' + }, { + field : 'pname', + align : 'center', + title : '项目名称' + }, { + field : 'pnum', + align : 'center', + title : '项目编号' + }, { + field : 'contacts', + align : 'center', + title : '销售金额' + }, { + field : '', + align : 'center', + title : '开票时间' + }, { + field : '', + align : 'center', + title : '开票金额' + }, { + field : '', + align : 'center', + title : '发票号码' + }, { + field : 'reserve3', + align : 'center', + title : '回款金额' + }, { + field : 'pcway', + align : 'center', + title : '未开票未回款金额' + }, { + field : 'xstid', + align : 'center', + title : '项目负责人' + }, { + field : '', + align : 'center', + title : '预计开票时间' + }, { + field : '', + align : 'center', + title : '预计回款时间' + }], + }); + + /* 实例化第三个下表(项目未完工) */ + $('#table03').bootstrapTable({ + //url : '${pageContext.request.contextPath }/Report/queryProjectInfoList3.do', //请求后台的URL(*) + method : 'get', //请求方式(*) + striped : true, //是否显示行间隔色 + cache : false, //是否使用缓存,默认为true,所以一般情况下需要设置一下这个属性(*) + pagination : true, //是否显示分页(*) + sortable : false, //是否启用排序 + sortOrder : "asc", //排序方式 + sidePagination : "server", //分页方式:client客户端分页,server服务端分页(*) + pageList : [10, 20, 30], //可供选择的每页的行数(*) + queryParams : function queryParams(params){ + var temp = { + limit: params.limit, + offset: params.offset/params.limit + 1, + /* key01 :row.cosName, + key02 :row.pid, */ + }; + return temp; + },//传递参数(*) + strictSearch : true, + clickToSelect : true, //是否启用点击选中行 + height : 300, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 + uniqueId : "ID", //每一行的唯一标识,一般为主键列 + detailView : true, //是否显示父子表 + // smartDisplay : false, + columns : [ { + checkbox : true + }, { + field : 'cosid', + align : 'center', + title : '客户' + }, { + field : 'pname', + align : 'center', + title : '项目名称' + }, { + field : 'pnum', + align : 'center', + title : '项目编号' + }, { + field : 'contacts', + align : 'center', + title : '销售金额' + }/* , { + field : '', + align : 'center', + title : '开票时间' + }, { + field : '', + align : 'center', + title : '开票金额' + }, { + field : '', + align : 'center', + title : '发票号码' + } */, { + field : 'reserve3', + align : 'center', + title : '回款金额' + }, { + field : 'reserve2', + align : 'center', + title : '已开票未回款金额' + }, { + field : 'pcway', + align : 'center', + title : '未开票未回款金额' + }, { + field : 'xstid', + align : 'center', + title : '项目负责人' + }, { + field : '', + align : 'center', + title : '预计开票时间' + }, { + field : '', + align : 'center', + title : '预计回款时间' + }], + + + onExpandRow: function (index, row, $detail) { + var cur_table = $detail.html('
').find('table'); + $(cur_table).bootstrapTable({ + url: "${pageContext.request.contextPath }/Report/queryInvoiceByNum.do?pnum="+row.pnum, //请求后台的URL(*) + method: 'post', //请求方式(*) + pagination: false, //是否显示分页(*) + sidePagination: "server", //分页方式:client客户端分页,server服务端分页(*) + /* pageNumber: 1, //初始化加载第一页,默认第一页 + pageSize: 10, //每页的记录行数(*) + pageList: [10, 20, 30], //可供选择的每页的行数(*) */ + maintainSelected: false, + minimumCountColumns: 2, //最少允许的列数 + clickToSelect: true, //是否启用点击选中行 + height: 200, //行高,如果没有设置height属性,表格自动根据记录条数觉得表格高度 + queryParams: function queryParams(params) { + var temp = { //这里的键的名字和控制器的变量名必须一直,这边改动,控制器也需要改成一样的 + pageSize: params.limit, //页面大小 + page: params.offset / params.limit + 1, //页码 + }; + return temp; + }, + columns: [ + [ + { + field: 'number', + visible : false + }, + { + field: 'invoiceDate', + title: '开票时间', + valign: "middle", + align: "center", + }, + { + field: 'invoice', + title: '开票金额', + valign: "middle", + align: "center" + }, + { + field: 'remark05', + title: '发票号', + valign: "middle", + align: "center" + }, + ] + ] + }); } }); }; diff --git a/WebContent/WEB-INF/pages/zc/forMe.jsp b/WebContent/WEB-INF/pages/zc/forMe.jsp index 62f3067..7675e18 100644 --- a/WebContent/WEB-INF/pages/zc/forMe.jsp +++ b/WebContent/WEB-INF/pages/zc/forMe.jsp @@ -1064,10 +1064,10 @@ success:function(affact){ //alert(affact) if(affact>=1){ - toastr.success('提交成功'); + toastr.success('审批成功'); }else{ - toastr.error('提交失败'); + toastr.error('审批失败'); } setTimeout(function(){ //使用 setTimeout()方法设定定时3000毫秒 //关闭模态框 @@ -1093,9 +1093,9 @@ type:'get', success:function(affact){ if(affact>=1){ - toastr.success('提交成功'); + toastr.success('审批成功'); }else{ - toastr.error('提交失败'); + toastr.error('审批失败'); } setTimeout(function(){ //使用 setTimeout()方法设定定时3000毫秒 //关闭模态框 diff --git a/WebContent/WEB-INF/pages/zc/form/ticket.jsp b/WebContent/WEB-INF/pages/zc/form/ticket.jsp index 6dddc78..18f818b 100644 --- a/WebContent/WEB-INF/pages/zc/form/ticket.jsp +++ b/WebContent/WEB-INF/pages/zc/form/ticket.jsp @@ -410,7 +410,16 @@ },{ field : 'jd', align : 'center', - title : '项目进度' + title : '项目进度', + formatter: function (value, row, index) { + if (value == '0') { + return '未完工'; + } else if (value == '1') { + return '已完工'; + } else { + return '已关闭'; + } + } } ], }); } diff --git a/build/classes/com/sdry/entity/lz/PayPage.class b/build/classes/com/sdry/entity/lz/PayPage.class index c0d252c04939293f9e0477bd2dcc5201f4ac0705..16198497872cdff5a2e8aa70a0809e8a242d3ccd 100644 GIT binary patch delta 31 ncmbQkHHT}%W)?=H$rG4FC!b`|U^Qi6WiXqZ%OXCRmz5s?l-URE delta 31 ncmbQkHHT}%W)?=n$rG4FC!b`|U^QW2WiXwb%OXCRmz5s?l&lBp diff --git a/build/classes/com/sdry/web/controller/lz/ReportController.class b/build/classes/com/sdry/web/controller/lz/ReportController.class index 01937d78673444d084600169aba5c7ebcdc23ea8..2c342c88debc8adcf33278c3328deaf594cdda8f 100644 GIT binary patch delta 2950 zcmb`JdsI}{6~@1_&vAxfMuHDSh*X|F08643OwtlbFs8NDCN>o(AP6GMu+&7<#z!4A z+LbPq6pqFxpvDF?RY73{0tjj}h>7o5AB`gBVPDav)~ZX>eeaA$yU>-c)xT!nbMM{f zH{bW|GjrvPC_F3t58SS61TcuMSV00Yg-Jat`@I=z>6Dv2>#;$4YiN1o+YVZR7y(;e z_Vm%y$4{S;XGa08a!?TpjcSd9*6P_|=lp)}p!J@mG6$9GobaFe{lP(-JWE?0v`sgM zJN>F0ROwlAJ7}lwA2CwB@1S};Cn8KWI%t<(7g1vQz(M(~0eWPLT^~>BCc5ZRiRtofMCqT5&2i<4eR76qmlMQ4Sg}({Q-}L9BNH{EXcYj7Ry(sNP3CgjqFkMP}8=l{Bj+G((xy zZtP*!%OVAB_y88%!qrT%TC9Op1fxYX@S=}+9l4^BD;rxn92ejZEBPW3`|%-sC<0Mv z!2!M-i(Y8OLHOb$rU>QDJdN97@pKdGJl%AGGs3ozZm>v#mgujN!yZ|RZh(qo7zcy7 zbnjtvi(ZS z({ee6b3{hT6?jpugj23Urd)$baxGqy#h5NjFjuZao7{lQ@*Uie8wKRMB3PD*NV!QQ z$@j!KxkbD#w~7U_LX^twqFz>sQ_?NImOI5QS;Gl70tU|7E#6)?M7UU#vHIa zjX%bn#;0J{=f=gzBGURwa&NIr4@l4Hx4aCU*{UAh#C$g`H%v3GYH1}q)#=;I)w(|2 z={mw*97TvchB$c~@$v)`j$4uFVMe+g)WIIaaMU=_U zP$54@o%{lO<(FucmrMyK@}z+0#XGh*NX4urk1bavT=CfQT~<{u&*)+=WraFn5r)$` zU6~OlN_AUC0Ier|o19UU}2%ioBr`j-7&y=45@vHxWDtIYl{X1~Vl|7P~<%zlH} zZ!`Bdn8fx?QvwSVVX=}}rW8t4CzLA-wkoU1nhG1!Y`e?4jf!<*W{63pFbU5w)x^xW zz*0(QUk>rJ7SK&3*?7V?d4=EnP~qRZU-&I7{8*Rj3cKot5Y-)VDgg1S2NG2vl2lKO zP{DXnJqoAlg)|j{92JI{DjbVc1PW9ne}gELsXnMseNm_SVXx|sRu%mKfDK`{&n|5G%&=^(j3k6EHipQx$2hOCg}vs9M?y^3SKPFBq>NW(2#Gc#I3Pd`tij+K(Naqv5~`_np%MXV zK;!yvF2qJxQELsVEBRFqaxljQY6`4sDmtrI5y_w5SJPO=JQL>!o^9^pJe5Enc^ykI zPaA?2kI~0;h#UGM(mZWEIrIhHLT4)-7D1fFBXrc@f906TpT1 zN2a8H#$#$8{FDnlRKCe%{J`<6cbNj|B>mAG-#{;t;C~UP&F#)~yxrM{Znv1XTf*Bd zec*QI{%gDQUU%C57k4gvM|W1TJFD28)$GnHc4sZSQ*5IB-`u(AmFu&P<@)@ga+R}O zn^>;R-&HP=?~zM delta 2754 zcmb`JeNQ8g zbF@`C(W2MH)UM)~P?@3v0Rp0FehX$!S{5RGPV<4|G&VNY>~rpwbe6iBwdSw0&wJmq z_wPK<-tW1^XVm!*RK%fg>ly(Jr49#3A-OoS&$h&;V@yrVCeMp5T8U%@=iFZwPAtqX z{Po;06wxXd6{FaSR=a48SrXeCzR^YN152A+RAwHHyD$887nKK=-f+uzQaWo zfu$-JRhwJm$Lcy4?KHoOkJSw>YBc5X{*b*c+DC7j`#fnO2VB%d2hG!-6m{5Cd6LyJ z)8<(a`mT#w=%m7sM6-DC0JC&ZW9S(douUteOEKn=!E-{+xu{hhZXY}}5(}$*C zf?I##qCf2zk??k^vk_eo22h5HyyNSxIL~R0GPIh=QBNwbc{XdLY0gSgea)q;JbnQl zGby{kSEx?&H1#>pQy2NS1fEY3ynx)ikmC3WO5sJ6#y%Rwi{TbUix6(5M>P7%ofYjw zJ(L|aNJMtjC=uIH6Lv$}(H^`da2;wa+OQ8HxQs8=YPBX84i$}EszDaJs(Hv)jS@N4 zMU2KdM8F{#Gq4{A(3RX6go8K)C&i&34&w+yaa1T`q*x$vJ3<24)cQa+v(X#xoKKfT z6-B={Z6jk$hu7g86x7KlI{nKr#F9zHSTYUpx%PJ#QByE7b+AQkS`!qIm=TnClX0IPauPuBY+bKwfU7sl1D3 zaTEQ9che%?W4pQv-A!t4icj7-V3!Y9?0Wu+T`I-0%W_Mh)2$6bw=N(-y)3?k((q2- zGCO_qcKSB;8sCznH9C}4!S+o>N#dY!R^nsQ29nss-W6~9<%M%GyY|&k8 z*hz2-?AA`$t+dwUPU&xBY0SXAg7wst)ZTu|6I+^PZwTlcWIAPV%7e% z&7yp^Pe&k3N20&(fmGcSY5GUV&{4?Ly)Z`i!36DwS4Sg9_eFsoh{tsdmg!g&={R|V zc$8@mD)b=K>A~2m6L453-az`T*OlH>PL4Fwrj6%{pw8QDowr}BbEW8<<<&z4^)^8r zCa7tGnl7lr1$Bg=juOla%+Pn@F@2W^ohd^9OoYB$Fz*qee=b7bdjp}jiqQRxd-^zj zGe}WmmQSA)QF|>#y-?hr!{{U0XP`Tv#|zK|0h%a4zd*Wv0QcxDOw`$!qP>`@AHo7X z2}^Yjp3}J~(RnD zxuqLh=(xrI@H;ktj_j6i4SL(i$+dLCCcT=EY)QkdZF(WX^%Ll&7uihKmqQ-yWa>?S zr1z}PnXFkSAW6AXblNWW{`Jd!aMNxU=T}>rQ)6u8*%T*C#iXYm>-TCUTYkP`T9NfL!V`Gka!~`h3SzGo8w} zUFK#7;&c^;=xW@d-^4gwBWF#W%uT(VGYxoDH^QfP;The8wR$(!={+(xd-0myhwXYl zs`LRgNRIvbC|dL}oYl?vLbu?&K8|nn38nN&8*#SvcT3Tg22w;{qP~Y^sVoLMC=3_L nZ(?RWC@22BS@Q?}S-OkpFVgHl4~hON*I0QX?jfkT^tb;2_xg^b diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$1.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$1.class index 3b81edec15d78c7f1e48843a49f40fd67f858adb..1447ddf68985d50f8fc440ebb87e5f385cc4d678 100644 GIT binary patch delta 13 VcmaFF`iOPIVkX9&lb0~r0RSl;1yuk5 delta 13 VcmaFF`iOPIVkX8Nlb0~r0RSl(1yle4 diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$2.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$2.class index cd06cfe22ed8f25eac7542e9161664dcc7a5f1fa..2ead668adf009b3f78ecb8dedd122139b46e26d2 100644 GIT binary patch delta 13 UcmaFP`kZyc3MNM9$t#)c04IM0^8f$< delta 13 UcmaFP`kZyc3MNLU$t#)c04I6`@&Et; diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController$3.class b/build/classes/com/sdry/web/controller/tdd/ArpsController$3.class index 65d016cbda7c72fb1ccac5464ff508f106250149..bc4fd4fe3310ab9136a63efcbb4725c2be496fe2 100644 GIT binary patch delta 13 UcmaFG`igbKY9_{t$!nPG04VVVGynhq delta 13 UcmaFG`igbKY9_|=$!nPG04VGQGXMYp diff --git a/build/classes/com/sdry/web/controller/tdd/ArpsController.class b/build/classes/com/sdry/web/controller/tdd/ArpsController.class index 2a66bd16faf8e2ca501db36eb751dd5b15196f54..ef1134caaea3e18ac491430b1fee6c226ef13569 100644 GIT binary patch delta 4949 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 C&`uoy delta 4909 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 0) { + // 客户 + paymentList.get(i).setSupplier(projectName.get(0).getContacts()); + } } } } @@ -905,7 +907,7 @@ public class ReportController extends BaseController { * @throws Exception 异常处理 */ @RequestMapping("/queryAllBudgetList2") - public void queryAllBudgetList2(String startDate, String overDate, String key01, HttpServletRequest request, HttpServletResponse response) throws Exception { + public void queryAllBudgetList2(String startDate, String overDate, String key01,String key03, HttpServletRequest request, HttpServletResponse response) throws Exception { payPage = new PayPage(); payPage.setPage(Integer.parseInt(request.getParameter("offset"))); payPage.setPageSize(Integer.parseInt(request.getParameter("limit"))); diff --git a/src/com/sdry/web/controller/tdd/ArpsController.java b/src/com/sdry/web/controller/tdd/ArpsController.java index cf4d811..848cc33 100644 --- a/src/com/sdry/web/controller/tdd/ArpsController.java +++ b/src/com/sdry/web/controller/tdd/ArpsController.java @@ -132,6 +132,7 @@ public class ArpsController { if(!"".equals(sname)){ staff.setSname(sname); } + staff.setSreserve1("0"); List list = staffService.queryAllByMution(staff); Map map = new HashMap(); //传递数据到页面 @@ -205,8 +206,8 @@ public class ArpsController { /** - * 查询所有员工 - * @return 成功标识+提示信息+员工列表 + * 根据id查询员工 + * @return 成功标识+提示信息+员工信息 */ @RequestMapping("/findStaffByStaid") @ResponseBody -- Gitee From 6fb89fdfeff9f0a98f3d87ecdf1eef4eac2b83f2 Mon Sep 17 00:00:00 2001 From: tdd Date: Mon, 17 Jun 2019 09:09:53 +0800 Subject: [PATCH 2/2] tj --- WebContent/BootStrapUI/datas/nav1.js | 163 +++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 WebContent/BootStrapUI/datas/nav1.js diff --git a/WebContent/BootStrapUI/datas/nav1.js b/WebContent/BootStrapUI/datas/nav1.js new file mode 100644 index 0000000..5b228ba --- /dev/null +++ b/WebContent/BootStrapUI/datas/nav1.js @@ -0,0 +1,163 @@ +var navs1 = [{ + "title": "基础信息", + "icon": "fa-cubes", + "spread": false, + "children": [{ + "title": "客户", + "icon": "fa-table", + "href": "/BaseFrame/jumpPage/cuser.do" + }, { + "title": "地区", + "icon": "", + "href": "/BaseFrame/jumpPage/reg.do" + }, { + "title": "部门", + "icon": "", + "href": "/BaseFrame/jumpPage/department.do" + }, { + "title": "职务", + "icon": "", + "href": "/BaseFrame/jumpPage/job.do" + }, { + "title": "人员", + "icon": "", + "href": "/BaseFrame/jumpPage/staff.do" + }, { + "title": "离职人员", + "icon": "", + "href": "/BaseFrame/jumpPage/staffLizhi.do" + }, { + "title": "计划总结绩效统计", + "icon": "", + "href": "/BaseFrame/jumpPage/workState.do" + }, { + "title": "车辆管理", + "icon": "", + "href": "/BaseFrame/jumpPage/vehicle.do" + }] +}, { + "title": "审批管理", + "icon": "fa-cubes", + "spread": false, + "children": [{ + "title": "发起审批", + "icon": "fa-table", + "href": "/BaseFrame/approval/sponsor.do" + }, { + "title": "我发起的", + "icon": "fa-navicon", + "href": "/BaseFrame/approval/mySponsor.do" + }, { + "title": "待我审批", + "icon": "", + "href": "/BaseFrame/approval/forMe.do" + }, { + "title": "我已审批", + "icon": "", + "href": "/BaseFrame/approval/myFinish.do" + }, { + "title": "抄送我的", + "icon": "", + "href": "/BaseFrame/approval/copyToMe.do" + }, { + "title": "管理预算审批", + "icon": "", + "href": "/BaseFrame/approval/manageBudget.do" + }] +}, { + "title": "项目管理", + "icon": "fa-cubes", + "spread": false, + "children": [{ + "title": "项目信息", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectInfo-projectInfoList" + },{ + "title": "项目需求", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectDemand-demandList" + },{ + "title": "项目预算", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectBudget-budgetList" + },{ + "title": "项目结项申请", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectAccounting-accountList" + },{ + "title": "项目备忘录", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectMemo-memoList" + },{ + "title": "报表", + "icon": "", + "href": "/BaseFrame/hpf/menuJump.do?pageUrl=projectReport-projectReportList" + }] +/*}, { + "title": "财务管理", + "icon": "fa-cubes", + "spread": false, + "children": [{ + "title": "收款登记", + "icon": "", + "href": "/BaseFrame/Report/receivePayment.do" + + },{ + "title": "付款登记", + "icon": "", + "href": "/BaseFrame/Report/outPayment.do" + },{ + "title": "发票登记", + "icon": "", + "href": "/BaseFrame/Report/invoice.do" + },{ + "title": "收付款列表", + "icon": "", + "href": "/BaseFrame/Report/paymentList.do" + },{ + "title": "发票列表", + "icon": "", + "href": "/BaseFrame/Report/invoiceList.do" + },{ + "title": "管理预算", + "icon": "", + "href": "/BaseFrame/Report/manageBudgetList.do" + },{ + "title": "应收账款", + "icon": "", + "href": "/BaseFrame/Report/receivableList.do" + },{ + "title": "应付账款", + "icon": "", + "href": "/BaseFrame/Report/payableList.do" + }]*/ +}, { + "title": "任务管理", + "icon": "fa-cubes", + "spread": false, + "children": [{ + "title": "工作日历", + "icon": "", + "href": "/BaseFrame/hMenu/fullcalendar.do" + }, { + "title": "日常日志", + "icon": "", + "href": "/BaseFrame/hMenu/log.do" + }, { + "title": "客户日志", + "icon": "", + "href": "/BaseFrame/hMenu/client.do" + }, { + "title": "项目日志", + "icon": "", + "href": "/BaseFrame/hMenu/itme.do" + }, { + "title": "工作计划", + "icon": "", + "href": "/BaseFrame/hMenu/plan.do" + /*}, { + "title": "用车日志", + "icon": "", + "href": "/BaseFrame/carLog/page.do"*/ + }] +}]; -- Gitee