Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/slickDP.js
===================================================================
diff -u -r25032 -r25102
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/slickDP.js (.../slickDP.js) (revision 25032)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryPlanApplication/slickDP.js (.../slickDP.js) (revision 25102)
@@ -468,7 +468,11 @@
/*添加模态框打开的时候，给扫码输入框焦点*/
$('#myModal').on('shown.bs.modal', function (){
$("#deliveryGoods").focus();
-
+ var myDate = new Date();
+ //myDate.toLocaleTimeString()
+ var today = myDate.getFullYear().toString()+"-"+(myDate.getMonth()+1).toString()+"-"+myDate.getDate().toString()+" "+myDate.getHours().toString()+":"+myDate.getMinutes().toString();
+ //$("#deliveryTime").val(today);
+ $("#deliveryTime").datetimepicker('setDate', new Date());
$("#applyList").select2({
language: "zh-CN",
placeholder: '请选择申请单',
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.css
===================================================================
diff -u -r25032 -r25102
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.css (.../slickWash.css) (revision 25032)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.css (.../slickWash.css) (revision 25102)
@@ -274,6 +274,63 @@
color: #31b546;
margin: 10px 0 5px 0; }
+.InstrumentPackageContain {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background-color: #ccc;
+ display: none;
+ z-index: 1060; }
+ .InstrumentPackageContain .iPC {
+ width: 970px;
+ height: 600px;
+ background: #FFFFFF;
+ margin: 20px auto; }
+ .InstrumentPackageContain .iPCHeader {
+ display: block;
+ width: 100%;
+ padding: 5px 7px 20px 7px;
+ border-bottom: 1px solid #f2f2f2; }
+ .InstrumentPackageContain .iPCHeader a {
+ float: right; }
+ .InstrumentPackageContain .iPCHeader span {
+ float: left; }
+ .InstrumentPackageContain .iPCTitle {
+ font-size: 25px;
+ font-weight: bold;
+ text-align: center; }
+ .InstrumentPackageContain .iPCBody {
+ border: 1px solid red;
+ width: 100%;
+ height: 480px;
+ padding: 0 0 0 8px; }
+ .InstrumentPackageContain .iPCBodyLeft {
+ width: 40%;
+ height: 100%;
+ vertical-align: top;
+ border: 1px solid green;
+ display: inline-block;
+ position: relative; }
+ .InstrumentPackageContain .iPCBodyLeftImg {
+ width: 100%;
+ height: 240px;
+ background: #f2f2f2; }
+ .InstrumentPackageContain .iPCBodyLeftImgText {
+ font-size: 20px;
+ font-weight: bold;
+ padding: 0 0 0 0;
+ text-align: center;
+ position: absolute;
+ top: 100px;
+ left: 92px; }
+ .InstrumentPackageContain .iPCBodyRight {
+ border: 1px solid grey;
+ width: 59%;
+ height: 100%;
+ display: inline-block; }
+
.addBadGoodsModal .addBad {
height: 430px;
overflow-y: scroll; }
@@ -773,6 +830,27 @@
height: 505px;
border: 1px solid black; }
+.rowInfoSuspendedFrame {
+ position: fixed;
+ display: none;
+ border: 1px solid #ccc;
+ background: white;
+ z-index: 1010;
+ font-size: 15px;
+ font-weight: bold; }
+ .rowInfoSuspendedFrameTitle {
+ padding: 5px 5px 0 5px; }
+ .rowInfoSuspendedFrameTable {
+ padding: 5px 5px 5px 5px; }
+ .rowInfoSuspendedFrameTable table {
+ border: 1px solid #ccc; }
+ .rowInfoSuspendedFrameTable table thead th {
+ padding: 5px 5px 5px 5px;
+ border: 1px solid #ccc; }
+ .rowInfoSuspendedFrameTable table tbody td {
+ padding: 5px 5px 5px 5px;
+ border: 1px solid #ccc; }
+
#bigView img {
height: none;
max-width: none;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js
===================================================================
diff -u -r25007 -r25102
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js (.../slickDM.js) (revision 25007)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/deliveryManagementApplication/slickDM.js (.../slickDM.js) (revision 25102)
@@ -403,4 +403,22 @@
$(function(){
mainTable(0,searchWordsGroup);
$(".bottomContain").css("top",pagePositionHeight() - 35);
+ $("#cleanDate").select2({
+ language: "zh-CN",
+ placeholder: '请选择',
+ minimumResultsForSearch: -1,
+ width:150
+ });
+ $("#cleanWay1").select2({
+ language: "zh-CN",
+ placeholder: '请选择',
+ minimumResultsForSearch: -1,
+ width:150
+ });
+ $("#cleanWay2").select2({
+ language: "zh-CN",
+ placeholder: '请选择',
+ minimumResultsForSearch: -1,
+ width:150
+ });
})
\ No newline at end of file
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss
===================================================================
diff -u -r25032 -r25102
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss (.../slickWash.scss) (revision 25032)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/washingApplication/slickWash.scss (.../slickWash.scss) (revision 25102)
@@ -423,6 +423,75 @@
}
}
}
+//器械包图片
+.InstrumentPackageContain{
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ background-color: #ccc;
+ display: none;
+ z-index: 1060;
+ .iPC{
+ width: 970px;
+ height: 600px;
+ background: #FFFFFF;
+ margin: 20px auto;
+ &Header{
+ display: block;
+ width: 100%;
+ padding: 5px 7px 20px 7px;
+ border-bottom: 1px solid #f2f2f2;
+ a{
+ float: right;
+ }
+ span{
+ float: left;
+ }
+ }
+ &Title{
+ font-size: 25px;
+ font-weight: bold;
+ text-align: center;
+ }
+ &Body{
+ border: 1px solid red;
+ width: 100%;
+ height: 480px;
+ padding: 0 0 0 8px;
+ &Left{
+ width: 40%;
+ height: 100%;
+ vertical-align: top;
+ border: 1px solid green;
+ display: inline-block;
+ position: relative;
+ &Img{
+ width: 100%;
+ height: 240px;
+ background: #f2f2f2;
+ &Text{
+ font-size: 20px;
+ font-weight: bold;
+ padding: 0 0 0 0;
+ text-align: center;
+ position: absolute;
+ top: 100px;
+ left: 92px;
+ }
+ }
+ }
+ &Right{
+ border: 1px solid grey;
+ width: 59%;
+ height: 100%;
+ display: inline-block;
+ }
+ }
+ }
+}
+
//添加报损
.addBadGoodsModal{
.addBad{
@@ -992,6 +1061,38 @@
}
}
+//悬浮层
+.rowInfoSuspendedFrame{
+ position: fixed;
+ display: none;
+ border: 1px solid #ccc;
+ background: white;
+ z-index: 1010;
+ font-size: $fontSize;
+ font-weight: bold;
+ &Title{
+ padding: 5px 5px 0 5px;
+ }
+ &Table{
+ padding: 5px 5px 5px 5px;
+ table{
+ border: 1px solid #ccc;
+ thead{
+ th{
+ padding: 5px 5px 5px 5px;
+ border: 1px solid #ccc;
+ }
+ }
+ tbody{
+ td{
+ padding: 5px 5px 5px 5px;
+ border: 1px solid #ccc;
+ }
+ }
+ }
+ }
+}
+
#bigView img{
height: none;
max-width: none;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp
===================================================================
diff -u -r25018 -r25102
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp (.../deliveryManagementApplication.jsp) (revision 25018)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/deliveryManagementApplication/deliveryManagementApplication.jsp (.../deliveryManagementApplication.jsp) (revision 25102)
@@ -26,6 +26,10 @@
+
+
+
+
@@ -75,7 +79,7 @@
-
+
+
+
+
+
+
+
+ 吊瓶
+
+
+
+
+
+
+
+ | 材料名称 |
+ 数量 |
+ 是否可拆 |
+ 清洗方式 |
+ 清洗质量检查关注点 |
+ 功能检查 |
+
+
+
+
+
+
+
';
+ alink += dataContext.operator + '
';
+ return alink;
+ }
},
{
name: '清洗机名称',
field: 'disinfectIdentification',
id: 'disinfectIdentification',
sortable: true,
- minWidth: 100
+ minWidth: 100,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.disinfectIdentification + '
';
+ return alink;
+ }
},
{
name: '清洗程序',
field: 'disinfectProgram',
id: 'disinfectProgram',
sortable: true,
- minWidth: 100
+ minWidth: 100,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.disinfectProgram + '
';
+ return alink;
+ }
},
{
name: '清洗状态',
field: 'washStatus',
sortable: true,
id: 'washStatus',
minWidth: 100,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.washStatus + '
';
+ return alink;
+ }
//进度条
/*
formatter: function(value, row, index, columnDef, dataContext) {
@@ -78,13 +99,23 @@
name: '开始时间',
field: 'startDateStr',
id: 'startDateStr',
- minWidth: 150
+ minWidth: 150,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.startDateStr + '
';
+ return alink;
+ }
},
{
name: '结束时间',
field: 'endDateStr',
id: 'endDateStr',
- minWidth: 150
+ minWidth: 150,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.endDateStr + '
';
+ return alink;
+ }
},
{
name: '操作',
@@ -107,13 +138,23 @@
name: '清洗参数',
field: 'washDataAmount',
id: 'washDataAmount',
- minWidth: 100
+ minWidth: 100,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.washDataAmount + '
';
+ return alink;
+ }
},
{
name: '清洗总数',
field: 'washMaterialAmount',
id: 'center',
- minWidth: 100
+ minWidth: 100,
+ formatter: function(value, row, index, columnDef, dataContext){
+ var alink = '';
+ alink += dataContext.washMaterialAmount + '
';
+ return alink;
+ }
},
];
var mainTableColumns = columns;
@@ -373,7 +414,7 @@
}
}
else{
- return "" + spacer + "" + value +"";
+ return "" + spacer + "" + value +"";
}
}
function myFilter(item) {
@@ -998,6 +1039,7 @@
$("#loadstate").val("hason");
mainTable(0,searchWordsGroup);
}
+
//获取清洗记录进行修改
function UpdateCleanList(basketId,sealNum,disfin,dispro,startTime,endTime){
$.ajax({
@@ -1010,7 +1052,6 @@
},
});
updateCleanAfterAjax();
- updateModal
$('#updateModal').on('shown.bs.modal', function (){
$("#updateDisinfectIdentification").select2({
language: "zh-CN",
@@ -1024,8 +1065,36 @@
minimumResultsForSearch: -1,
width:150
});
+ $("#updateStartDateStr").datetimepicker({
+ language:"zh-CN",
+ autoclose: true,
+ format: 'yyyy-mm-dd hh:ii',
+ startDate: (new Date())
+ });
+ $("#updateEndDateStr").datetimepicker({
+ language:"zh-CN",
+ autoclose: true,
+ format: 'yyyy-mm-dd hh:ii',
+ startDate: (new Date()),
+ onSelect: updateCleanDateCompare
+ }).on('changeDate',updateCleanDateCompare);
});
}
+ //修改--比较时间
+ function updateCleanDateCompare(ev){
+ var startTime = $("#updateStartDateStr").val();
+ var endTime = $("#updateEndDateStr").val();
+
+ startTime = new Date(startTime.replace(/\-/g, "\/"));
+ endTime = new Date(endTime.replace(/\-/g, "\/"));
+
+ if(startTime!=""&&endTime!=""&&startTime >=endTime)
+ {
+ alert("开始时间不能大于结束时间！");
+ $("#updateEndDateStr").val("");
+ return false;
+ }
+ }
//添加清洗的比较时间
function addCleanDateCompare(ev){
var startTime = $("#addCleanStartDateStr").val();
@@ -1041,6 +1110,7 @@
return false;
}
}
+
//添加模态框打开的时候，给扫码输入框焦点，设置下拉框
$('#addModal').on('shown.bs.modal', function (){
$("#addCleanGetCode").focus();
@@ -1100,9 +1170,109 @@
width:150
});
})
+
+
+
+
+ function rowInfoSuspendedFrameOpen(){
+
+ var ifColumns = 100;
+ ifColumns = mainViewGrid.onMouseEnter.subscribe(function(e,args,obk){
+ var rowIndex = mainViewGrid.getCellFromEvent(e);
+ ifColumns = rowIndex.cell;
+ this.ifColumns = ifColumns;
+ var e=window.event;
+ if(ifColumns<=3){
+ $("#rowInfoSuspendedFrame").css("display","block");
+ $("#rowInfoSuspendedFrame").css("left",e.clientX+20);
+ $("#rowInfoSuspendedFrame").css("top",e.clientY+30);
+ }
+ })
+ }
+ function rowInfoSuspendedFrameClose(){
+ $("#rowInfoSuspendedFrame").css("display","none");
+ }
+ function opModal(){
+ $("#InstrumentPackageContain").css("display","block");
+ }
+ function closeModal(){
+ $("#InstrumentPackageContain").css("display","none");
+ }
+// function pzx(){
+// // 禁用标识牌功能
+// if(disableIdCard==true){
+// }
+// // 审核器械包必须入篮筐（一级供应室）
+// if(mustScanBasketForTousseReview==true){
+// }
+// // 审核器械包必须入篮筐（二级供应室）
+// if(mustScanBasketForTousseReviewOf2ndSupplyRoom==true){
+// }
+// // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
+// if(applicationFormType==2){
+// }
+// if(hidePackageSpec==true){
+// }
+// // 申请界面是否显示器械包或消毒物品的的单位
+// if(showTousseUnitColumn==true){
+// }
+// // 条码类型：1：一维码， 2：二维码
+// if(barcodeType==1){
+// }
+// // 申请器械包时是否自动归还待归还物品
+// if(autoReturnTousse==false){
+// }
+// // 是否隐藏进入审核列表按钮
+// if(hideEnterReviewListButton==false){
+// }
+// // 是否自动补全用户名
+// if(autoFillUserName==false){
+// }
+// // 自动补全用户名的长度
+// if(autoFillUserNameLength==false){
+// }
+// // 是否支持部分终止申请单中的物品
+// if(enableTerminatePartOfApplication==false){
+// }
+// //限制入库单填写的一次性物品为能申领的物品
+// if(restrictGodownEntryDiposableGoods==false){
+// }
+// //提交申请单前显示申请的物品清单
+// if(showAppliedGoodsBeforeSubmit==false){
+// }
+// // 隐藏申请科室
+// if(hideApplyDepartColumn==false){
+// }
+// // 隐藏结算科室
+// if(hideSettleDepartColumn==false){
+// }
+// // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
+// if(useRecordAuditMode==1){
+// }
+// //回收时，申请数量与回收数量不一致，是否要确认
+// if(confirmRecyclingAmount==false){
+// }
+// //是否启用本地文件访问
+// if(enableLocalFileSystemObject==false){
+// }
+// //下送人不显示
+// if(showInvoicePersonInCharge==false){
+// }
+// //发货审核非必填
+// if(invoiceAssistantSenderRequired==false){
+// }
+// //允许部分回收
+// if(enablePartRecycle==false){
+// }
+// // 终止 不删除装配任务
+// if(terminateInvoicePlanNotUpdatePackingTask==false){
+// }
+// //允许一个篮筐装载多套外来器械
+// multiForeignTousseIntoSameBasket:true,
+//
+// }
$(function(){
mainTable(0,searchWordsGroup);
-
//主表的横向滚动
$("#myGrid>.slick-viewport").css("overflow","scroll");
@@ -1115,5 +1285,13 @@
width:150
});
+ //$('[data-toggle="popover"]').popover('hide');
+// $(".forone").parent().hover(function(){
+// console.log("asd");
+// $(document).mousemove(function(e){
+// console.log(e.pageX + ", " + e.pageY);
+// });
+// });
+
});