From 1d1580dfea7e030d347aeee5dd54264a866f10a4 Mon Sep 17 00:00:00 2001 From: zc Date: Mon, 24 Jun 2019 14:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/BootStrapUI/login.jsp | 3 ++ WebContent/WEB-INF/pages/zc/form/borrow.jsp | 16 ++++++---- WebContent/WEB-INF/pages/zc/form/payment.jsp | 16 +++++----- WebContent/WEB-INF/pages/zc/form/ticket.jsp | 6 ++++ WebContent/WEB-INF/pages/zc/roleList.jsp | 16 +++++----- build/classes/com/sdry/dao/zc/ApplyMapper.xml | 4 +-- .../classes/com/sdry/entity/zc/Payment.class | Bin 5995 -> 6195 bytes build/classes/com/sdry/entity/zc/Ticket.class | Bin 5377 -> 5377 bytes .../sdry/service/tdd/StaffServiceImpl.class | Bin 4862 -> 5006 bytes .../web/controller/tdd/ArpsController.class | Bin 13293 -> 13631 bytes .../web/controller/tdd/LoginController.class | Bin 2788 -> 2836 bytes .../zc/ApprovedByMeController.class | Bin 11561 -> 11608 bytes .../zc/android/AndroidApplyController$1.class | Bin 956 -> 956 bytes .../zc/android/AndroidApplyController$2.class | Bin 958 -> 958 bytes .../zc/android/AndroidApplyController$3.class | Bin 952 -> 952 bytes .../zc/android/AndroidApplyController$4.class | Bin 960 -> 960 bytes .../zc/android/AndroidApplyController$5.class | Bin 960 -> 960 bytes .../zc/android/AndroidApplyController$6.class | Bin 958 -> 958 bytes .../zc/android/AndroidApplyController$7.class | Bin 894 -> 894 bytes .../zc/android/AndroidApplyController$8.class | Bin 897 -> 897 bytes .../zc/android/AndroidApplyController.class | Bin 20383 -> 20525 bytes src/com/sdry/dao/zc/ApplyMapper.xml | 4 +-- src/com/sdry/entity/zc/Borrow.java | 16 +++++----- src/com/sdry/entity/zc/Payment.java | 11 ++++++- src/com/sdry/entity/zc/Repayment.java | 8 +++-- src/com/sdry/entity/zc/Ticket.java | 1 + .../sdry/service/tdd/StaffServiceImpl.java | 6 ++++ .../web/controller/tdd/ArpsController.java | 28 +++++++++++++++--- .../web/controller/tdd/LoginController.java | 2 ++ .../controller/zc/ApprovedByMeController.java | 3 +- .../web/controller/zc/ZcSystemController.java | 10 +++---- .../zc/android/AndroidApplyController.java | 2 ++ 32 files changed, 104 insertions(+), 48 deletions(-) diff --git a/WebContent/BootStrapUI/login.jsp b/WebContent/BootStrapUI/login.jsp index f74e2c2..50e53cf 100644 --- a/WebContent/BootStrapUI/login.jsp +++ b/WebContent/BootStrapUI/login.jsp @@ -45,6 +45,9 @@ }else if(data == -2){ $("#nameerr").show(); $("#nameerr").html("该用户名无访问权限，请联系管理员！"); + }else if(data == -3){ + $("#nameerr").show(); + $("#nameerr").html("用户名或者密码不正确！"); } else{ diff --git a/WebContent/WEB-INF/pages/zc/form/borrow.jsp b/WebContent/WEB-INF/pages/zc/form/borrow.jsp index a0e52fd..ae22d89 100644 --- a/WebContent/WEB-INF/pages/zc/form/borrow.jsp +++ b/WebContent/WEB-INF/pages/zc/form/borrow.jsp @@ -93,9 +93,9 @@
- +
- +
@@ -177,13 +177,13 @@
- +
- +
- +
@@ -273,7 +273,7 @@ onDblClickCell: function (field,value,row) { //alert(field + ',' + value + ',' + row ); $("#borrowbill").val(row.remark01); - $("#bemoney").val(row.money); + $("#bemoney").val(row.remark06); $('#myModal').modal('hide'); }, strictSearch : true, @@ -292,6 +292,10 @@ field : 'money', align : 'center', title : '借款金额' + },{ + field : 'remark06', + align : 'center', + title : '待还款金额' },{ field : 'applicant', align : 'center', diff --git a/WebContent/WEB-INF/pages/zc/form/payment.jsp b/WebContent/WEB-INF/pages/zc/form/payment.jsp index 478c489..79b446a 100644 --- a/WebContent/WEB-INF/pages/zc/form/payment.jsp +++ b/WebContent/WEB-INF/pages/zc/form/payment.jsp @@ -74,6 +74,12 @@
+
+ +
+ +
+
@@ -322,24 +328,18 @@ //渲染 form.render('select','costType'); //下拉框改变清空其他数据 - if(payType == "项目类"){ + if(payType == "5"){ $("#projectDiv").css("display","block"); $("#budgetDiv").css("display","none"); $("#budgetNum").val(""); $("#budget").val(""); $("#alreadyPaid").val(""); - }else if(payType == "管理类"){ + }else if(payType == "6"){ $("#projectDiv").css("display","none"); $("#budgetDiv").css("display","block"); $("#number").val(""); $("#budget").val(""); $("#alreadyPaid").val(""); - }else if(payType == "开发类"){ - $("#projectDiv").css("display","block"); - $("#budgetDiv").css("display","none"); - $("#number").val(""); - $("#budget").val(""); - $("#alreadyPaid").val(""); } }, error: function(){ diff --git a/WebContent/WEB-INF/pages/zc/form/ticket.jsp b/WebContent/WEB-INF/pages/zc/form/ticket.jsp index 18f818b..3491d48 100644 --- a/WebContent/WEB-INF/pages/zc/form/ticket.jsp +++ b/WebContent/WEB-INF/pages/zc/form/ticket.jsp @@ -140,6 +140,12 @@
+
+ +
+ +
+
diff --git a/WebContent/WEB-INF/pages/zc/roleList.jsp b/WebContent/WEB-INF/pages/zc/roleList.jsp index 1ff2802..83d5b17 100644 --- a/WebContent/WEB-INF/pages/zc/roleList.jsp +++ b/WebContent/WEB-INF/pages/zc/roleList.jsp @@ -204,25 +204,24 @@ layui.use(['table','layer','upload','form','laydate'], function(){ //监听行工具事件 table.on('tool(test)', function(obj){ var data = obj.data; + var id = data.id; if(obj.event === 'delete'){ //删除角色前判断角色是否被使用 $.ajax({ type:'post', url:'${pageContext.request.contextPath }/system/selectUseRoleById.do', - data:{"id":data.id}, - success:function(data){ - if(data>0){ + data:{"id":id}, + success:function(res){ + if(res>0){ toastr.warning("正在被使用，不能删除！"); }else{ - var idArr = new Array(); - idArr[0] = data.id; layer.confirm('确定删除吗？', function(index){ $.ajax({ type:'post', url:'${pageContext.request.contextPath }/system/deleteRoleById.do', - data:{"idArr":idArr}, - success:function(data){ - if(data>0){ + data:{"id":id}, + success:function(res1){ + if(res1>0){ toastr.success("删除成功！"); setTimeout(function(){ //使用 setTimeout（）方法设定定时2000毫秒 //关闭模态框 @@ -242,6 +241,7 @@ layui.use(['table','layer','upload','form','laydate'], function(){ }) } else if(obj.event === 'edit'){ var id = data.id; + $("#id").val(id) $.ajax({ type:'post', url:'${pageContext.request.contextPath }/system/selectUseRoleById.do', diff --git a/build/classes/com/sdry/dao/zc/ApplyMapper.xml b/build/classes/com/sdry/dao/zc/ApplyMapper.xml index eca9900..4258417 100644 --- a/build/classes/com/sdry/dao/zc/ApplyMapper.xml +++ b/build/classes/com/sdry/dao/zc/ApplyMapper.xml @@ -26,13 +26,13 @@ {call zc_insertPaymentForm(#{applicant},#{dept},#{number},#{supplier},#{payType}, #{costType},#{budget},#{alreadyPaid},#{pay},#{difference},#{differenceExplain}, #{payDate},#{invoiceType},#{taxAmount},#{pic},#{enclosure},#{approver},#{status}, - #{remark01},#{remark02},#{remark03},#{remark04},#{remark05}, + #{remark01},#{remark02},#{remark03},#{remark04},#{remark05},#{remark06}, #{status1},#{status2},#{copyMan})} - {call zc_insertTicketForm(#{applicant},#{dept},#{number},#{pname},#{customer},#{contract},#{already},#{notYet},#{invoice},#{invoiceDate},#{invoiceType},#{pic},#{enclosure},#{approver},#{status},#{remark01},#{remark02},#{remark03},#{remark04},#{status1},#{status2},#{copyMan})} + {call zc_insertTicketForm(#{applicant},#{dept},#{number},#{pname},#{customer},#{contract},#{already},#{notYet},#{invoice},#{invoiceDate},#{invoiceType},#{pic},#{enclosure},#{approver},#{status},#{remark01},#{remark02},#{remark03},#{remark04},#{remark06},#{status1},#{status2},#{copyMan})}