From 8b65996b03b39304081b4f072181f3876d9670a5 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 29 Sep 2020 14:27:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html | 118 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 54 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
index 9d5f45e..b934721 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
@@ -18,15 +18,15 @@
<option>--医生--</option>
</select> 
<div class="layui-col-sm4">
- <input type="text" class="layui-input search-input" id="startTime" placeholder="开始时间"> 至 <input type="text"
- class="layui-input search-input" id="endTime" placeholder="结束时间">  
+ <input type="text" class="layui-input search-input" id="startTime" placeholder="开始时间"> 至 <input
+ type="text" class="layui-input search-input" id="endTime" placeholder="结束时间">  
</div>
<button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysdictionaries-list"><i
class="layui-icon"></i>搜索</button>
<button id="piliangjiesuan" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i
class="layui-icon"></i>批量结算</button>
- <button id="export" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i
- class="layui-icon"></i>导出</button>
+ <button id="export" class="layui-btn icon-btn permissions" permissions="sysdictionaries-edit"><i
+ class="layui-icon"></i>导出</button>
</div>
<!-- 数据表格 -->
@@ -53,7 +53,7 @@
laydate.render({
elem: '#endTime' //指定元素
});
-
+
// 获取应用列表
// layer.load(2);
@@ -132,8 +132,8 @@
};
form.on('select(department_clients)', function (data) {
- getDoctorData(data.value)
- });
+ getDoctorData(data.value)
+ });
//获取医生
function getDoctorData(id) {
admin.req('api-user/sysdoctor/findByMap', JSON.stringify({
@@ -167,13 +167,13 @@
}, 'post');
};
function getTabel() {
- var doctorId=""
- if($("#doctorId").val()!="--医生--"){
- doctorId=$("#doctorId").val();
+ var doctorId = ""
+ if ($("#doctorId").val() != "--医生--") {
+ doctorId = $("#doctorId").val();
}
- var departmentId=""
- if($("#departmentId").val()!="--科室--"){
- departmentId=$("#departmentId").val();
+ var departmentId = ""
+ if ($("#departmentId").val() != "--科室--") {
+ departmentId = $("#departmentId").val();
}
var startTime = $('#startTime').val();
var endTime = $('#endTime').val();
@@ -184,16 +184,16 @@
return;
}
}
- var obj={
- payStatus:2,
- type:0,
+ var obj = {
+ payStatus: 2,
+ type: 0,
createHospitalId: $("#hospitalId").val(),
createHospitalDepartid: departmentId,
createDoctorId: doctorId,
startTime: startTime,
endTime: endTime
}
-
+
table.render({
elem: '#app-table',
url: config.base_server + 'api-opration/saasclientpay',
@@ -236,36 +236,46 @@
}
}
}
- $('#piliangjiesuan').click(function (){
+ $('#piliangjiesuan').click(function () {
var selectData = layui.table.checkStatus('app-table').data;
- if(selectData==null||selectData.length<=0){
+ if (selectData == null || selectData.length <= 0) {
layer.msg('请选择一条数据');
return;
}
- let objList=[];
+ let objList = [];
selectData.forEach(element => {
objList.push(element.id);
});
admin.req('api-opration/saasclientpay/updateTypeList', JSON.stringify(objList), function (data) {
layer.closeAll('loading');
if (0 === data.code) {
- let selected = false;
- console.log(data.data)
- $("#doctorId").empty();
- $.each(data.data, function (index, item) {
- //往下拉菜单里添加元素
- if (index == 0) {
- selected = true
- } else {
- selected = false
+ var doctorId = ""
+ if ($("#doctorId").val() != "--医生--") {
+ doctorId = $("#doctorId").val();
+ }
+ var departmentId = ""
+ if ($("#departmentId").val() != "--科室--") {
+ departmentId = $("#departmentId").val();
+ }
+ var startTime = $('#startTime').val();
+ var endTime = $('#endTime').val();
+ if (startTime != null && endTime != null) {
+ var flag = compareDate(startTime, endTime);
+ if (!flag) {
+ layer.msg('结束时间不得小于开始时间');
+ return;
}
- console.log(item)
- $('#doctorId').append(new Option(item.doctorName, item.id,
- false, selected));
- form.render('select', 'doctor_clients');
- })
-
- form.render();
+ }
+ var obj = {
+ payStatus: 2,
+ type: 0,
+ createHospitalId: $("#hospitalId").val(),
+ createHospitalDepartid: departmentId,
+ createDoctorId: doctorId,
+ startTime: startTime,
+ endTime: endTime
+ }
+ table.reload('app-table', { where: obj });
} else {
layer.msg(data.msg, {
icon: 2,
@@ -274,7 +284,7 @@
}
}, 'post');
});
-
+
// 搜索按钮点击事件
$('#app-btn-search').click(function () {
getTabel();
@@ -283,13 +293,13 @@
});
//导出
$('#export').click(function () {
- var doctorId=""
- if($("#doctorId").val()!="--医生--"){
- doctorId=$("#doctorId").val();
+ var doctorId = ""
+ if ($("#doctorId").val() != "--医生--") {
+ doctorId = $("#doctorId").val();
}
- var departmentId=""
- if($("#departmentId").val()!="--科室--"){
- departmentId=$("#departmentId").val();
+ var departmentId = ""
+ if ($("#departmentId").val() != "--科室--") {
+ departmentId = $("#departmentId").val();
}
var startTime = $('#startTime').val();
var endTime = $('#endTime').val();
@@ -300,9 +310,9 @@
return;
}
}
- var obj={
- payStatus:2,
- type:0,
+ var obj = {
+ payStatus: 2,
+ type: 0,
createHospitalId: $("#hospitalId").val(),
createHospitalDepartid: departmentId,
doctorId: doctorId,
@@ -313,14 +323,14 @@
var xhr = new XMLHttpRequest();
xhr.open('POST', url, true);
xhr.responseType = "blob";
- var form = new FormData();
- // Add selected file to form
- form.append("payStatus", 2);
- form.append('type',0);
- form.append('doctorId',doctorId);
- form.append('startTime',startTime);
- form.append('endTime',endTime);
- form.append('createHospitalId',$("#hospitalId").val());
+ var form = new FormData();
+ // Add selected file to form
+ form.append("payStatus", 2);
+ form.append('type', 0);
+ form.append('doctorId', doctorId);
+ form.append('startTime', startTime);
+ form.append('endTime', endTime);
+ form.append('createHospitalId', $("#hospitalId").val());
xhr.setRequestHeader("client_type", "DESKTOP_WEB");
xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
--
Gitblit v1.8.0