|
|
@@ -87,6 +87,7 @@ function getSpiritAnestheticPrintData() {
|
|
|
let code = '';
|
|
|
let number = 0;
|
|
|
let sex;
|
|
|
+ let drugFlag = $("#drugFlagSearch").val();
|
|
|
for (var i = 0; i < res.data.length; i++) {
|
|
|
let data = res.data[i];
|
|
|
if(code == ''){
|
|
|
@@ -120,7 +121,7 @@ function getSpiritAnestheticPrintData() {
|
|
|
html += '<td>' + data.drugname + '</td>';
|
|
|
html += '<td>' + data.specification + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.quantity + '</td>';
|
|
|
- html += '<td class="xtd" style="text-align: center;">' + data.employeeName.trim().substring(0,1)+new Array(data.employeeName.trim().length).join('*') + '</td>';
|
|
|
+ html += '<td class="xtd" style="text-align: center;">' + data.employeeName.trim() + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.warnDeptName + '</td>';
|
|
|
html += '<td class="xtd" ></td>';
|
|
|
html += '<td class="xtd" ></td>';
|
|
|
@@ -130,7 +131,6 @@ function getSpiritAnestheticPrintData() {
|
|
|
html += '<td colspan="15" style="text-align: center;font-weight: 700;">共计:' + number + '</td>';
|
|
|
html += '</tr>';
|
|
|
$("#jmtj_table").append(html);
|
|
|
- let drugFlag = $("#drugFlagSearch").val();
|
|
|
let title = "";
|
|
|
if(drugFlag == 1){
|
|
|
title = "麻、精一及麻黄碱类药品使用登记";
|
|
|
@@ -356,8 +356,8 @@ function init_daterangepickertime() {
|
|
|
return;
|
|
|
}
|
|
|
var optionSet1 = {
|
|
|
- startDate: moment().subtract(1, 'days').format("YYYY-MM-DD 14:00:00"),
|
|
|
- endDate: moment().format("YYYY-MM-DD 13:59:59"),
|
|
|
+ startDate: moment().subtract(1, 'days').format("YYYY-MM-DD 00:00:00"),
|
|
|
+ endDate: moment().subtract(1, 'days').format("YYYY-MM-DD 23:59:59"),
|
|
|
minDate: '2012-01-01',
|
|
|
maxDate: nowString()+' 23:59:59',
|
|
|
dateLimit: {
|
|
|
@@ -397,5 +397,5 @@ function init_daterangepickertime() {
|
|
|
$('#reportrange').daterangepicker(optionSet1, function (start, end, label) {
|
|
|
$('#reportrange span').html(start.format('YYYY-MM-DD HH:mm:ss') + ' - ' + end.format('YYYY-MM-DD HH:mm:ss'));
|
|
|
});
|
|
|
- $('#reportrange span').html(moment().subtract(1, 'days').format("YYYY-MM-DD 14:00:00") + ' - ' + moment().format("YYYY-MM-DD 13:59:59"));
|
|
|
+ $('#reportrange span').html(moment().subtract(1, 'days').format("YYYY-MM-DD 00:00:00") + ' - ' + moment().subtract(1, 'days').format("YYYY-MM-DD 23:59:59"));
|
|
|
}
|