Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css
===================================================================
diff -u -r24445 -r24583
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24445)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24583)
@@ -13,8 +13,7 @@
.w148{width:183px !important;}
.w86{width:88px;}
.over-hidden{overflow:hidden;}
-.ml12{margin-left:12px;}/*
-.mr3{margin-right: 3px;} */
+.ml12{margin-left:12px;}
.h40{height:40px;}
.w60{width:60px;}
.title-font{
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24550 -r24583
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24550)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24583)
@@ -1,5 +1,6 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
<%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
@@ -62,7 +63,13 @@
text-align:center;
}
-
+
+
+
+
+
+
+
@@ -87,9 +94,9 @@
-
-
@@ -400,8 +409,8 @@
@@ -631,7 +640,7 @@
条形码扫描登记
@@ -900,6 +909,27 @@
+
+
+
@@ -931,7 +961,23 @@
+
+<%@ include file="/disinfectsystem/print/print2.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -957,6 +1003,7 @@
//回收记录
var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
+ var hospitalName = '<%=request.getAttribute("hospitalName")%>';
var WWWROOT = '${basePath}';
// var taskGroup = '${taskGroup}';
var taskGroup = parent.myGroupName;
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js
===================================================================
diff -u -r24550 -r24583
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24550)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24583)
@@ -3,6 +3,12 @@
var assemblyTaskLeftTopTableCon; //left table top
var addVal = "";
var packingTasks;
+var addLOseClassifyTypeResult;
+//打印标签部分
+var packing = false;
+var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试
+var packedToussesArray = [];// 用于一次打印所有装配的包
+var tousseesToPrint = [];
//页面一加载就获取焦点
$("#searchBarcode").focus();
//增加table的paddiing
@@ -12,6 +18,12 @@
}
//点击装配按钮
$("#packPrint").click(function(){
+ packing = true;
+ if(packing){
+ packingToussesArray = []; // 清除所装配的器械包数组
+ packedToussesArray = [];
+ tousseesToPrint = [];
+ }
//检查人
var inspector = $("#inspectorInput").val();
// 检查人工号
@@ -152,7 +164,18 @@
errors = task.errors;
department = task.department;
departmentArray.push(department);
-
+ if(!sstsConfig.allowPackingWhenUnSupplementMaterial){
+ if(errors != null && errors.length > 0){
+ //showResult("材料缺失，不够组成器械包，请补充缺失器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+ alert("材料缺失，不够组成器械包，请补充缺失器械！");
+ return;
+ }
+ if(damages != null && damages.length > 0){
+ //showResult("材料已报损，不够组成器械包，请补充报损器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+ alert("材料已报损，不够组成器械包，请补充报损器械！");
+ return;
+ }
+ }
/*if(status == '待确认'){
showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage);
return;
@@ -257,17 +280,17 @@
packingTasks = result.packingTasks;
packingTaskArray = packingTaskArray.concat(packingTasks);
}
-
- alert(result.message);
- }else{
- var addNumHtml= ""
- + "
提示
"
- + "
"
- + ""+result.message+""
- + "
"
- + "
"
+ + "
提示
"
+ + "
"
+ + ""+result.message+""
+ + "
"
+ + "
";
- }
- }
- ];
-
-
- $("#addLose").click(function(){
- //$("#simon_test", window.parent.document).css({'background-color':'#000','filter':'alpha(opacity=50)'});
- $('.addLoseModel').modal('show');
- $(".addLoseModel .modal-title").text("器械补充");
- addPaddingBottom("addLoseModel");
- //补充列表
- $.ajax({
- url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml",
- type: "get",
- async:true,
- data:{
- "type":"丢失",
- "packingTaskId":""
- },
- success:function(result){
- console.log("result..",result);
- //var result = JSON.parse(result);
- if(result.success == true){
- $("#addLoseTable").bootstrapTable('destroy');//销毁表格
- var addLoseTable="";
- $('#addLoseTableWrapper').append(addLoseTable);
- addLoseLoadTable(result.rows,addLoseModel_columns);
- $("#addLoseTableWrapper .fixed-table-container").css({"padding-bottom":"45px"});
- }else{
- alert(result.message);
- }
-
- }
- });
+ var addLoseTable="";
+ $('#addLoseTableWrapper').append(addLoseTable);
+ $("#addLose").click(function(){
+ loseAnd("丢失");
- })
- function addLoseLoadTable(tableDate,columns){
- $("#addLoseTable").bootstrapTable(
- {
- data:tableDate,
- method : 'get',
- striped : true,// 设置为 true 会有隔行变色效果
- undefinedText : " ",// 当数据为 undefined 时显示的字符
- data_local : "zh-US",// 表格汉化
- responseHandler : "",
- sortable: true,//是否启用排序
- sortOrder: "desc",//排序方式
- sortName: 'appTime',//排序字段
- formatLoadingMessage: function () {
- return "请稍等，正在加载中...";
- },
- formatNoMatches:function(){ //未找到匹配记录
- //return " ";
- },
- columns : columns
- });
- }
+ });
+ //点确定
+ $("#comfirmAddlose").click(function(){
+ //function conformAdd(type){
+ var addLoseTableData = $('#addLoseTable').bootstrapTable('getData');
+ if(addLoseTableData.length == 0){
+ alert("没有待补充的器械！");
+ //showResult("没有待补充的器械！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+ return false;
+ }
+ var materialArray = [];
+ for(var i=0;i提示"
+ + ""
+ + ""+result.message+""
+ + "
"
+ + "";
+ $("body").append(addNumHtml);
+ reloadPackingTasks();//刷新左下表格
+ }else{
+ alert(result.message);
+ }
+
+ }
+ });
+ // }
+
+ });
+
//补充丢失器械弹框end
//补充报损器械按钮弹框
$("#addBreakage").click(function(){
- $('.addBreakageModel').modal('show');
+ /* $('.addBreakageModel').modal('show');
$(".addBreakageModel .modal-title").text("器械补充");
- addPaddingBottom("addBreakageModel");
+ addPaddingBottom("addBreakageModel");*/
+ loseAnd("报损");
})
//添加报损器械按钮弹框
@@ -2819,6 +2907,209 @@
}
+//補充丟失删除行
+function deleteLoseRow(id){
+ $('#addLoseTable').bootstrapTable('removeByUniqueId',id);
+ addLOseInstrumentTypeSelect("addLOse_instrument");
+}
+//丢失分类类型option
+var addLoseClassifyTypeOptions = "";
+$.ajax({
+ url:"/disinfectSystem/recyclingrecord/materialErrorDamageController/getDamageErrorDepartType.mhtml",
+ type: "get",
+ async:true,
+ success:function(result){
+ if(result.success == true){
+ for(var i=0;i"+result.rows[i].value+"";
+ }
+
+ }else{
+ //alert(result.message);
+ }
+
+ }
+ });
+//补充丢失器械弹框start
+var addLoseModel_columns=[
+ {
+ title : '序号',
+ align : 'center',
+ formatter:function(v,row,index){
+ return index+1;
+
+ }
+ },
+ {
+ title : '器械名称',
+ field : 'materialName',
+ align : 'center'
+ },
+ {
+ title : '待补充数量',
+ field : 'amount',
+ align : 'center'
+ },
+ {
+ title : '分类类型',
+ align : 'center',
+ formatter:function(v,row,index){
+ //console.log("id..",row.id);
+ return "";
+ }
+ },
+ {
+ title : '器械类型',
+ align : 'center',
+ formatter:function(v,row,index){
+ return "";
+ }
+ },
+ {
+ title : '操作',
+ align : 'center',
+ formatter:function(v,row,index){
+ return "";
+ }
+ }
+];
+function loseAnd(type){
+ $('.addLoseModel').modal('show');
+ $(".addLoseModel .modal-title").text("器械补充");
+ addPaddingBottom("addLoseModel");
+ //清空
+ $("#addLoseBarcodeHidden").next("span").text("");
+ //篮筐
+ $("#addLoseBarcode").keydown(function(e){
+ if (e.keyCode == 13) {
+ var barcode = $("#addLoseBarcode").val();
+ if(barcode != "" && barcode != null){
+ //补充丢失加载清洗篮筐
+ $.ajax({
+ url:"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml",
+ type: "get",
+ async:true,
+ data:{basketBarcode:barcode},
+ success:function(result){
+ console.log("篮筐...",result);
+ if(result.success == true){
+ $("#addLoseBarcodeHidden").val(barcode);//条码存入隐藏域
+ $("#addLoseBarcodeHidden").next("span").show();
+ $("#addLoseBarcodeHidden").next("span").text("清洗篮筐名称:"+result.data.containerName);
+ $("#addLoseBarcode").val("");//清空
+ }else{
+ alert(result.message);
+
+ }
+
+ }
+ });
+ }else{
+ var addNumHtml= ""
+ + "
提示
"
+ + "
"
+ + "请扫描篮筐条码！"
+ + "
"
+ + "