Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24517 -r24550 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24517) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24550) @@ -1,7 +1,8 @@ var documentHeight = $(window).height(); var recoredTableH =""; -var assemblyTaskLeftTopTableCon = []; //left table top +var assemblyTaskLeftTopTableCon; //left table top var addVal = ""; +var packingTasks; //页面一加载就获取焦点 $("#searchBarcode").focus(); //增加table的paddiing @@ -11,6 +12,76 @@ } //点击装配按钮 $("#packPrint").click(function(){ + //检查人 + var inspector = $("#inspectorInput").val(); + // 检查人工号 + var inspectorCode = $("#inspectorCodeInputHidden").val(); + + //配包人 + var operator = $("#operator").val(); + var operatorCode = $("#operatorCodeHidden").val(); + //审核人 + var reviewer = $("#reviewer").val(); + var reviewerCode = $("#reviewerCodeHidden").val(); + //灭菌人 + var sterileUserName = $("#sterileUserName").val(); + var sterileUserCode = $("#sterileUserCodeHidden").val(); + //包装人 + var wrapper = $("#wrapper").val(); + var wrapperCode = $("#wrapperCodeHidden").val(); + + //包装类型 + var packageType = $("#packageType option:selected").val(); + //灭菌程序 + var sterilingType = $("#sterilingType option:selected").val(); + //灭菌日期 + var sterileDate = $("#determineDate").val(); + + if(sterileDate == undefined || sterileDate == ""){ + var date = new Date(); + Y = date.getFullYear() + '-'; + M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; + D = date.getDate() + ' '; + D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate()); + sterileDate =  Y+M+D; + + } + //外来器械拆包信息 splitPackage + //篮筐条码 + //扫描的篮筐条码 scannedBasketBarcodes + //标识牌实例id idCardInstanceID + //标识牌定义id idCardDefinitionId + + //炉次 + var frequency =$("#frequency").val(); + //确认继续 confirmContinue + //tousseWeight 器械包重量 + + //remark 备注 + var remark = $("#remark").val(); + + + if(inspector == ""){ + alert("请扫描检查人条码"); + return; + } + if(operator == "" ){ + alert("请扫描配包人条码"); + return; + } + if(reviewer == ""){ + alert("请扫描审核人条码"); + return; + } + if(wrapper == ""){ + alert("请扫描包装人条码"); + return; + } + if(sterileUserName == ""){ + alert("请扫描灭菌人条码"); + return; + } + // 开始构造参数循环调用装配方法 var tempTableId = ""; if($("#assemblyTaskleftFootTable").bootstrapTable('getSelections').length>0){ @@ -23,66 +94,64 @@ if(selections == null || selections.length == 0){ return ; } - + var packingTaskArray = []; for(var tousseIndex=0;tousseIndex packingAmount){ - amount = packingAmount; - } - packageType = task.packageType; + var taskId = task.taskId; + + var amount = task.amount; + if(amount > packingAmount){ + amount = packingAmount; + } + packageType = task.packageType; // if(useManualSelectPackageType()){ // packageType = Ext4.getCmp('packageType').getValue(); // } - sterilingType = task.sterilingMethod; + sterilingType = task.sterilingMethod; // if(isUndefinedOrNullOrEmpty(sterilingType) || useManualSelectPackageType()){ // sterilingType = Ext4.getCmp('sterilingType').getValue(); // } - tousseType = task.tousseType; - supplierName = task.supplierName; - damages = task.damages; - errors = task.errors; - department = task.department; - departmentArray.push(department); + tousseType = task.tousseType; + supplierName = task.supplierName; + damages = task.damages; + errors = task.errors; + department = task.department; + departmentArray.push(department); /*if(status == '待确认'){ showResult(tousseName+",有器械丢失，请确认！" , null , sstsConfig.messagePauseTimeOnPackingPage); @@ -99,7 +168,7 @@ return; } }*/ - taskIdArray.push(taskId); + taskIdArray.push(taskId); /* if(packingAmount > 0){ scannedBasketBarcodes.push(basketBarcode); @@ -118,56 +187,15 @@ taskIdArray = taskIdArray.join(";"); // packingTousse(false,basketBarcode,scannedBasketBarcodes.join(";"),taskIdArray.join(";"),tousseName,tousseType,pNode.get('amount'),packageType,sterilingType,supplierName,departmentArray.join(";"),pNode.get('urgentAmount')); //var taskIds = taskIdsArray.join(";"); - //检查人 - var inspector = $("#inspectorInput").val(); - // 检查人工号 - var inspectorCode = $("#inspectorCodeInputHidden").val(); - - //配包人 - var operator = $("#operator").val(); - var operatorCode = $("#operatorCodeHidden").val(); - //审核人 - var reviewer = $("#reviewer").val(); - var reviewerCode = $("#reviewerCodeHidden").val(); - //灭菌人 - var sterileUserName = $("#sterileUserName").val(); - var sterileUserCode = $("#sterileUserCodeHidden").val(); - //包装人 - var wrapper = $("#wrapper").val(); - var wrapperCode = $("#wrapperCodeHidden").val(); - - //包装类型 - var packageType = $("#packageType option:selected").val(); - //灭菌程序 - var sterilingType = $("#sterilingType option:selected").val(); - //灭菌日期 - var sterileDate = $("#determineDate").val(); - - if(sterileDate == undefined || sterileDate == ""){ - var date = new Date(); - Y = date.getFullYear() + '-'; - M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; - D = date.getDate() + ' '; - D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate()); - sterileDate =  Y+M+D; - - } - //外来器械拆包信息 splitPackage - //篮筐条码 - //扫描的篮筐条码 scannedBasketBarcodes - //标识牌实例id idCardInstanceID - //标识牌定义id idCardDefinitionId - - //炉次 - var frequency =$("#frequency").val(); - //确认继续 confirmContinue - //tousseWeight 器械包重量 - - //remark 备注 - var remark = $("#remark").val(); //装配数量 - var inputId = '#input_'+tousseNode.tousseID; + var inputId =""; + if (tempTableId == "assemblyTaskleftFootTable") { + inputId = '#input_'+tousseNode.tousseID; + } else { + inputId = '#topInput_'+tousseNode.tousseID; + } var inputAmount = $(inputId).val(); + //return; var params = { "taskIds":taskIdArray, "inspector":inspector, @@ -189,6 +217,30 @@ "urgentAmount":urgentAmount, "remark":remark }; + + + if(inspector == ""){ + alert("请扫描检查人条码"); + return; + } + if(operator == "" ){ + alert("请扫描配包人条码"); + return; + } + if(reviewer == ""){ + alert("请扫描审核人条码"); + return; + } + if(wrapper == ""){ + alert("请扫描包装人条码"); + return; + } + if(sterileUserName == ""){ + alert("请扫描灭菌人条码"); + return; + } + + $.ajax({ url:"/disinfectSystem/packingController/packingTousse.mhtml", dataType: "json", @@ -199,22 +251,77 @@ }, success:function(result){ if(result.success == true){ - reloadPackingTasks();//刷新 - alert(result.message); - }else{ - var addNumHtml= "
" - + "
提示
" - + "
" - + ""+result.message+"" - + "
" - + "
"; - $("body").append(addNumHtml); - } + if (tempTableId == "assemblyTaskleftFootTable") { + reloadPackingTasks();//刷新左下表格 + } else { + packingTasks = result.packingTasks; + packingTaskArray = packingTaskArray.concat(packingTasks); + } + + alert(result.message); + }else{ + var addNumHtml= "
" + + "
提示
" + + "
" + + ""+result.message+"" + + "
" + + "
"; + $("body").append(addNumHtml); + } - } - }); + + } + }); } + + var assembleArray = []; + if (assemblyTaskLeftTopTableCon != undefined + && assemblyTaskLeftTopTableCon.length > 0) { + for (var i = 0; i < assemblyTaskLeftTopTableCon.length; i++) { + var assembleModel = assemblyTaskLeftTopTableCon[i]; + if (assembleModel.children.length <= 0) { + continue; + } + var assembleArrayModel = [];//新children + for (var j = 0; j < assembleModel.children.length; j++) { + var objTaskId = assembleModel.children[j].taskId; + //console.log("packingTaskArray",packingTaskArray); + console.log("旧id。。",objTaskId); + for (var k = 0; k < packingTaskArray.length; k++) { + console.log("新id。。",packingTaskArray[k].taskId); + //相等更改数量 + if (objTaskId == packingTaskArray[k].taskId) { + assembleModel.children[j].amount = packingTaskArray[k].unPackAmount; + console.log("数量对比。。",assembleModel.children[j].amount); + } + } + + //大于0，保存起来 + if (assembleModel.children[j].amount > 0) { + assembleArrayModel.push(assembleModel.children[j]); + } + } + + if (assembleArrayModel.length > 0) { + //把不需要删除的重新赋值给children，改变了children的值 + assembleModel.children = assembleArrayModel; + assembleModel.amount = 0; + for (var m = 0; m < assembleArrayModel.length; m++) { + assembleModel.amount += parseInt(assembleArrayModel[m].amount); + } + assembleArray.push(assembleModel); + } + + } + } + + assemblyTaskLeftTopTableCon = assembleArray; + reloadPackingLeftTopTasks();//刷新左上表格 + + + }); + //检查人条码 $("#inspectorCodeInput").keydown(function(e){ if (e.keyCode == 13) { @@ -260,9 +367,9 @@ type: "post", success:function(result){ if(result.success == true){ - $("#"+name).val(result.fullName); - $("#"+namecode).val(result.name);//工号 - $("#"+clearId).val(""); + $("#"+name).val(result.fullName);//名字,例如检查人 + $("#"+namecode).val(result.name);//工号放入隐藏域在提交装配时传参 + $("#"+clearId).val("");//清空检查人条码 $("#"+name).parent().parent().parent().next().children("div:first-child").children().children("input").focus(); }else{ alert(result.message); @@ -301,50 +408,56 @@ }); //灭菌炉 -$.ajax({ - url:"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml", - type: "get", - async:true, - success:function(result){ - var result = JSON.parse(result); - if(result.success == true){ - for(var i=0;i"+result.rows[i].name+""; - $("#sterilizerName").append(sterilizerOptions); +function sterilizerNameRequest(){ + $.ajax({ + url:"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml", + type: "get", + async:true, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + for(var i=0;i"+result.rows[i].name+""; + $("#sterilizerName").append(sterilizerOptions); + } + }else{ + alert(result.message); } - }else{ - alert(result.message); + + } - - - } -}); + }); +} + //包装类型 -$.ajax({ - url:"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml", - type: "get", - async:true, - success:function(result){ - var result = JSON.parse(result); - if(result.success == true){ - for(var i=0;i"+result.rows[i].optionText+""; - $("#packageType").append(optionText); +function packageTypeRequest(){ + $.ajax({ + url:"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml", + type: "get", + async:false, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + for(var i=0;i"+result.rows[i].optionText+""; + $("#packageType").append(optionText); + } + }else{ + alert(result.message); } - }else{ - alert(result.message); + + } - - - } -}) -$("#packageType").change(function(){ - var packageTypeVal = $("#packageType option:selected").val(); - var validDate = $("#packageType option:selected").attr("data-validDate"); - var validDateUnit = $("#packageType option:selected").attr("data-validDateUnit"); - alert(packageTypeVal+"的失效期为"+validDate+validDateUnit); -}) + }) + $("#packageType").change(function(){ + var packageTypeVal = $("#packageType option:selected").val(); + var validDate = $("#packageType option:selected").attr("data-validDate"); + var validDateUnit = $("#packageType option:selected").attr("data-validDateUnit"); + alert(packageTypeVal+"的失效期为"+validDate+validDateUnit); + }) +} + //补充丢弃器械和报损按钮的数字 $.ajax({ url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml", @@ -363,14 +476,102 @@ }); $(function(){ - //补充丢失器械按钮弹框 + //补充丢失器械弹框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){ + return ""; + + + } + }, + { + title : '器械类型', + align : 'center' + }, + { + title : '操作', + align : 'center', + formatter:function(v,row,index){ + return ""; + } + } + ]; + + $("#addLose").click(function(){ - //$("#simon_test", window.parent.document).css({'background-color':'#000','filter':'alpha(opacity=50)'}); + //$("#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); + } + + } + }); + }) - + 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 + }); + } + //补充丢失器械弹框end + //补充报损器械按钮弹框 $("#addBreakage").click(function(){ $('.addBreakageModel').modal('show'); @@ -467,10 +668,10 @@ if(row.children[i].damages.length > 0){ return {css:{"color":"red"}}; } - return {css:{"color":"#000"}}; } } + return {css:{"color":"#000"}}; } }, @@ -479,7 +680,17 @@ field : 'amount', align : 'center', sortable:true, - switchable: false + switchable: false, + formatter:function(v,record){ + var inputId = 'topInput_'+record.tousseID; + return "" + } }, { title : '加急数量', @@ -531,10 +742,16 @@ sortable:true } ]; + var assemblyTaskLeftTopTable = "
"; + $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); /*在篮筐中输入条码*/ $("#searchBarcode").keydown(function(e){ if (e.keyCode == 13) { var searchBarcodeVal = $("#searchBarcode").val(); + if(searchBarcodeVal == ""){ + alert("请扫描篮筐条码"); + return; + } $.ajax({ url: "/disinfectSystem/packingController/getPackingTaskList.mhtml", dataType: "json", @@ -546,19 +763,13 @@ }, success: function(result) { if(result.success == true){ - for(var i=0;i" - + "
" - + "" - + "" - + "
" - + ""; - } - $("#assemblyTaskLeftTopTable").bootstrapTable('destroy'); - var assemblyTaskLeftTopTable = "
"; - $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); + assemblyTaskLeftTopTableCon = result.data; + $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 + + //$("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); + /* if(!$('#assemblyTaskLeftTopTable')){ + $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); + }*/ assemblyTaskLeftTopload(result.data,assemblyTaskLeftTopTable_columns); $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ "padding-bottom":"2px", @@ -575,7 +786,7 @@ }else{ alert(result.message); } - assemblyTaskLeftTopTableCon = result.data; + } }); @@ -591,8 +802,8 @@ "margin-top":"4px", "margin-bottom":"4px" }); - subText("assemblyTaskleftTopTable"); - $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + // subText("assemblyTaskleftTopTable"); + // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); //topTableRowClickEvent(); } }) @@ -645,6 +856,7 @@ //console.log("winH"+documentHeight); function assemblyTaskLeftTopload(tableDate,columns){ + $("#assemblyTaskLeftTopTable").bootstrapTable('destroy'); $("#assemblyTaskLeftTopTable").bootstrapTable( { data:tableDate, @@ -653,10 +865,8 @@ dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行 striped : true,// 设置为 true 会有隔行变色效果 undefinedText : " ",// 当数据为 undefined 时显示的字符 - pagination : false, // 分页 - pageNumber : 1,// 如果设置了分页，首页页码 data_local : "zh-US",// 表格汉化 - responseHandler : "", + // responseHandler : "", detailView: true,//父子表 search:false, toolbar:'#printClass', @@ -672,14 +882,7 @@ formatNoMatches:function(){ //未找到匹配记录 //return " "; }, - queryParams : function(params) { - return { - start : params.offset, - limit : params.limit, - keyword : params.search - }; - }, - idField : "id", + /* idField : "id",*/ columns : columns,//表头 onExpandRow: function (index, row, $detail) { var thW = $("#assemblyTaskLeftTopTable").find("th"); @@ -688,7 +891,8 @@ for(var i=0;i"; - table += "" + //table += ""//simon-test + table += ""//simon-test +"" +""; if(childrens[i].status == '待装配'){ @@ -725,14 +929,15 @@ $detail.html(table); subText("assemblyTaskleftTopTableSub"); var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr"); - materialListSub(topTableSubTr,row);//子级材料清单 + materialListSub(topTableSubTr,row);//子级材料清单 metarilsFocus();//显示功能检查 }, onClickRow: function(row,element){ $("#sterilingType").val(row.sterilingMethod); //根据灭菌程序设置灭菌方式的值 $("#sterilingType").change(); - $("#packageType").val(row.packageType); + packageTypeRequest();//包裝類型 + sterilizerNameRequest();//灭菌炉 //父材料清单 materialList(row); }, @@ -751,6 +956,36 @@ }); } + /*var assemblyTaskLeftTopTable = "
"; + $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); */ + assemblyTaskLeftTopload([],assemblyTaskLeftTopTable_columns); + $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ + "line-height":"0", + "margin-top":"4px", + "margin-bottom":"4px" + }); + $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + function reloadPackingLeftTopTasks() { + $("#assemblyTaskleftTopTable").bootstrapTable("destroy"); + loadPackingLetTopTasks(); + } + window.reloadPackingLeftTopTasks = reloadPackingLeftTopTasks; + function loadPackingLetTopTasks() { +// $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 + assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns); + $("#assemblyTaskLeftTopTable").bootstrapTable("refresh"); + $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ + "padding-bottom":"2px", + "padding-top":"2px" + }); + $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ + "line-height":"0", + "margin-top":"4px", + "margin-bottom":"4px" + }); + $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"29px"}); + subText("assemblyTaskLeftTopTable"); + } /*left top table end*/ /*left foot table start*/ var assemblyTaskleftFootTable_columns=[ @@ -865,6 +1100,8 @@ sortable:true } ]; + var assemblyTaskleftFootTable = "
"; + $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable); function reloadPackingTasks(){ $("#assemblyTaskleftFootTable").bootstrapTable("destroy"); loadPackingTasks(); @@ -888,8 +1125,7 @@ for(var i=0;i"; - $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable); + $("#assemblyTaskleftFootTable").bootstrapTable("destroy"); assemblyTaskLeftFootload(result.data,assemblyTaskleftFootTable_columns); $("#assemblyTaskleftFootTable").bootstrapTable("refresh"); @@ -909,6 +1145,7 @@ } loadPackingTasks(); function assemblyTaskLeftFootload(tableDate,columns){ + $("#assemblyTaskleftFootTable").bootstrapTable('destroy'); $("#assemblyTaskleftFootTable").bootstrapTable( { data:tableDate, @@ -1001,15 +1238,16 @@ onClickRow: function(row,element){ $("#sterilingType").val(row.sterilingMethod); //根据灭菌程序设置灭菌方式的值 - $("#sterilingType").change(); - $("#packageType").val(row.packageType); + $("#sterilingType").change(); }, onCheck:function(row){//foot $("#sterilingType").val(row.sterilingMethod); //根据灭菌程序设置灭菌方式的值 $("#sterilingType").change(); - $("#packageType").val(row.packageType); - packPrintChange();///判断按钮 + //$("#packageType").val(row.packageType); + packageTypeRequest();//包裝類型 + sterilizerNameRequest();//灭菌炉 + packPrintChange();///判断按钮 $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll"); //父级材料清单 materialList(row); @@ -1102,15 +1340,7 @@ $("#packPrint").hide(); } } - var assemblyTaskLeftTopTable = "
"; - $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); - assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns); - $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ - "line-height":"0", - "margin-top":"4px", - "margin-bottom":"4px" - }); - $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + //把表格的高度变小 $("#assemblyTaskleftFootTable").css({"min-width": "1100px"}); $("#assemblyTaskleftFootTable th,#assemblyTaskleftFootTable td").css({ @@ -1122,25 +1352,24 @@ /*材料清单table start*/ function materialsLoadTable(tableDate,columns){//detailView树形菜单 $("#materialsTable").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 - }); - + { + 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 + }); } var materials_columns=[ { @@ -1383,8 +1612,7 @@ $("#todayAssemblyRecordTableWrapp .fixed-table-container").css("padding-bottom","43px"); //器械丢失补充模态框 - var addLoseTable="
"; - $('#addLoseTableWrapper').append(addLoseTable); + // loadTable("addLoseTable",allModel.list,allModelication_columns,false,false,"",false,true,false); //器械報損补充模态框 @@ -1418,7 +1646,7 @@ //loadTable("printAmendtable",allApp.list,allApplication_columns,false,false,"printAmend",false,true,false); //调模态框居中的方法 - modelCenter(".addLoseModel"); //器械丢失 + // modelCenter(".addLoseModel"); //器械丢失 modelCenter(".addBreakageModel"); //器械報損 modelCenter(".deleteMsgModel"); //删除模态框 modelCenter("#discardModel"); //废弃模态框、 @@ -1884,6 +2112,13 @@ //今天本组装配 $(function(){ + /*$("#aa").select2({ + language: "zh-CN", + placeholder:'关键词搜素', + allowClear:true, + minimumInputLength: 1, + maximumSelectionLength:1 + })*/ //select2器械包名称 /*Mock.mock( 'http://mockjsbagname', { @@ -1913,15 +2148,17 @@ allBagName=req; } });*/ - var allBagName = [{"id|1-100": 1, text: '小手术包' }, - {"id|1-100": 2, text: '小麻醉包' }, - {"id|1-100": 3, text: '小麻醉骨科包' }, + var allBagName = {"results":[ + {"id": 1, text: '小手术包' } + /* {"id|1-100": 2, text: '小麻醉包' }, + {"id|1-100": 3, text: '小麻醉骨科包'}, {"id|1-100": 4, text: '大麻醉包' }, {"id|1-100": 5, text: '小器械包' }, {"id|1-100": 6, text: '大器械包' }, - {"id|1-100": 7, text: '大器械骨科包' }] + {"id|1-100": 7, text: '大器械骨科包' }*/]} selectPull("instrumentSetSelect",allBagName);//器械包名称 function selectPull(selId,allData){ + //console.log(allData); $("#"+selId).select2({ data:allData, language: "zh-CN", @@ -2475,6 +2712,15 @@ } /*数字增减*/ +//只能输入数字 +/*$('.onlyNum').keydown(function(e){ + var k = e.keyCode; + if ((k <= 57 && k >= 48) || (k <= 105 && k >= 96) || (k== 8)){ + return true; + } else { + return false; + } + });*/ function addNum(that){ var numVals = $(that).parent().siblings("input").val(); var touseName = $(that).parent().siblings("input").attr("tousseName"); Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24517 -r24550 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24517) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24550) @@ -323,7 +323,7 @@ @@ -379,7 +379,7 @@ -
+