From 1267d84bec43de73afac7853292032d9b5998065 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 7 Jul 2020 10:35:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=89=B9=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E7=9A=84=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approve/Emr_Apply_ApproveMapper.xml | 11 +++--- .../approveManageList174.jsp | 31 ++++++++++++++-- .../collection/collectManage174.jsp | 2 +- .../userDistributionManage.jsp | 2 +- .../approveManageList/approveManageList174.js | 35 ++++++++++++++++++- .../collection/collectManage174.js | 1 + .../templateSearch/searchCommomMethodqf.js | 1 + 7 files changed, 74 insertions(+), 9 deletions(-) diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml index 75bab3f..176bd5f 100644 --- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml +++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml @@ -657,11 +657,14 @@ approve_state = 1 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp index 6bb0fc3..5614fdb 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp @@ -233,7 +233,7 @@
- +
@@ -242,7 +242,7 @@
-
@@ -385,6 +385,32 @@
+ + + diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp index 8a3baa7..d517c3c 100644 --- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp +++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp @@ -433,7 +433,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp index 4ac43bc..623eda1 100644 --- a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp +++ b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp @@ -89,7 +89,7 @@

+ placeholder="用户名-姓名" maxlength="16"/>
diff --git a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js index 55c0b1c..792f173 100644 --- a/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js +++ b/src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js @@ -232,6 +232,9 @@ function refreshTable(){ }) } +//定义临时接收申请者的申请天数，用于判断是否申请天数有改动 +var applyDay = 0; +var applyDate = ''; //借阅审批 function showApprove(id){ //加载申请类型 @@ -257,6 +260,9 @@ function showApprove(id){ $("#inpatientNo").val(data.inpatientNo); $("#admissTimes").val(data.admissTimes); $("#name").val(data.name); + pickTime("effeTime",data.effeTime); + applyDay = data.effeDays; + applyDate = data.effeTime; } } }) @@ -286,6 +292,9 @@ function updateApprove(id){ $("#admissTimes").val(data.admissTimes); $("#name").val(data.name); $("#approveNotes").val(data.approveNotes); + pickTime("effeTime",data.effeTime); + applyDay = data.effeDays; + applyDate = data.effeTime; } } }) @@ -293,11 +302,34 @@ function updateApprove(id){ //封装模态框保存公共方法，applyState:提交状态1保存未提交2已提交.msg:操作后提示信息 function add(flag){ + //判断是否有 if(flag == 1){ $("#approveState").val(1); }else if(flag == 2){ $("#approveState").val(2); } + //判断申请天数是否有修改 + var effeDays = $("#effeDays").val(); + if(applyDay != effeDays){ + //有改动弹窗确认是否修改有效日期 + $('.approveBtns').attr("data-toggle", "modal"); + $('.approveBtns').attr("data-target", "#myModal3"); + }else{ + //未改动直接提交 + saveMethod('y'); + $('.approveBtns').removeAttr("data-toggle", "modal"); + $('.approveBtns').removeAttr("data-target", "#myModal3"); + } +} + +//封装提交审批方法 +function saveMethod(flag){ + debugger + if(flag == 'n'){ + $("#effeTime").val(applyDate); + $("#effeDays").val(applyDay); + } + var approveState = $("#approveState").val(); $.ajax({ type:'post', url:path+'/approve/updateApprove', @@ -305,7 +337,7 @@ function add(flag){ dataType:'json', success:function(data){ if(data!=null && data.code == 0){ - if(flag == 1){ + if(approveState == 1){ toastr.success("批准成功!"); }else{ toastr.success("驳回成功!"); @@ -313,6 +345,7 @@ function add(flag){ refreshTable(); $('#myModal1').modal('hide'); $('#mytab').bootstrapTable('selectPage', pageNumber); + $('#myModal3').modal('hide'); }else{ toastr.warning(data.msg); } diff --git a/src/main/webapp/static/js/approveManage/collection/collectManage174.js b/src/main/webapp/static/js/approveManage/collection/collectManage174.js index 6b2b33b..431e143 100644 --- a/src/main/webapp/static/js/approveManage/collection/collectManage174.js +++ b/src/main/webapp/static/js/approveManage/collection/collectManage174.js @@ -549,6 +549,7 @@ function loadApplyType(){ } //重新申请借阅 function borrowings(){ + pickTime("effeTime", null); loadApplyType(); setFormToken(); $('#myModal2').modal('hide'); diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index 0735230..2b3c38f 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -658,6 +658,7 @@ function loadApplyType(type){ //单个申请借阅 function borrowing(patientId){ + pickTime("effeTime", null); $("#typeId").val('approves'); //加载申请借阅类型 loadApplyType(1);