Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r36187 -r36591 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 36187) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 36591) @@ -684,12 +684,9 @@
- -
-
- - +
'; - } else { - str += ''; - } - - str += result.data[i].title; - str += '
'; - $('#selectDiv').append(str); + html += '' } - //鼠标点击事件，如果点击在 selectedbutton，或者是在多选框div中的点击事件，不作处理。其他情况的点击事件，将多选空div隐藏 - document.onclick = function () { - if (event.srcElement) { - if (event.srcElement.id == "departmentTemplate" || event.srcElement.className == "checkbox") { - return; - } - } else if (event.target) { - if (event.target.id == "departmentTemplate" || event.target.className == "checkbox") { - return; - } - } - $('#selectDiv').hide(); - }; + $('#departmentTemplate').html(html); } }, error: function (msg) { @@ -6845,190 +6824,6 @@ } } -//点击selectButton，展示多选框 -function showSelectDiv() { - $('#selectDiv').show(); -} - -//鼠标进入多选框的div【selectdiv】 -function selectDivMousein() { - $('#selectDiv').show(); -} - -//鼠标离开多选框的div【selectdiv】 -function selectDivMouseout() { - $('#selectDiv').hide(); -} -//checkbox的点击事件 -function changeTemplate(obj) { - var checkboxs = document.getElementById('selectDiv').querySelectorAll('input.checkbox'); - var tousseNameValue = []; - var requestParms = {}; - requestParms.orgUnitCoding = $("#departCode").val(); - if (obj.value == 0) { - for (var i = 0; i < checkboxs.length; i++) { - checkboxs[i].checked = obj.checked; - } - requestParms.templateIds = ''; - } else { - var idsArr = []; - var isCheckedAll = true; - for (var i = 0; i < checkboxs.length; i++) { - if (parseInt(checkboxs[i].value) !== 0) { - if (checkboxs[i].checked) { - if (checkboxs[i].dataset) { - tousseNameValue.push(checkboxs[i].dataset.value) - } else if (checkboxs[i]['data-value']) { - tousseNameValue.push(checkboxs[i]['data-value']) - } - idsArr.push(checkboxs[i].value); - } - if (!checkboxs[i].checked) { - isCheckedAll = false; - } - } - } - if (obj.checked) { - if (isCheckedAll) { - checkboxs[0].checked = true; - } - } else { - checkboxs[0].checked = obj.checked; - } - requestParms.templateIds = idsArr.join(','); - } - var layerShowLoad = layer.load(1, { - shade: [0.3, '#000'] //0.1透明度的白色背景 - }); - if (obj.checked || requestParms.templateIds !== '') { - $.ajax({ - type: 'get', - url: WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do', - data: requestParms, - dataType: 'json', - success: function (dataArray) { - //获取页面显示的每个包 - var tousseItemsTable2 = $('#tousseItemTable').children().first().children(); - - var hasCloumns = [];//存数量大于等于1的tousseDefinitionID - var hasCloumsObjs = [];//存数量大于等于1的对象 - - for (var j = 0; j < tousseItemsTable2.length; j++) { - var id = tousseItemsTable2[j].id || ''; - if (id !== '') { - var index = j; - var tousseDefinitionID = $("#tousseDefinitionID" + index).val(); - var recycleAmountVal = parseInt($('#recycleAmount' + index).val(), 10); - if (recycleAmountVal >= 1) { - hasCloumns.push(tousseDefinitionID); - - var obj = {}; - obj.tousseItemId = ""; - obj.tousseName = $("#tousseName" + index).val(); - obj.tousseDefinitionID = $("#tousseDefinitionID" + index).val(); - obj.applicationAmount = $("#applicationAmount" + index).val(); - obj.recycleAmount = recycleAmountVal; - obj.loadedAmount = $("#loadedAmount" + index).val(); - obj.isCleanedEntirely = $("#isCleanedEntirely" + index).val(); - obj.tousseType = $("#tousseType" + index).val(); - obj.isThereIdentificationCard = $("#isThereIdentificationCard" + index).val(); - obj.isApplyEntireTousse = $("#isApplyEntireTousse" + index).val(); - obj.urgentAmount = $("#urgentAmount" + index).val(); - obj.hiddenUrgentAmount = $("#hiddenUrgentAmount" + index).val(); - obj.tousseRemark = $("#tousseRemark" + index).val(); - obj.errorDamageQmKey = $("#hiddenErrorDamageQmKey" + index).val(); - obj.spelling = $("#spelling" + index).val(); - - hasCloumsObjs.push(obj); - - } - $('#tousseItemsTr' + index).remove(); - } - } - - - var addColumnArr = [];//用来增加的数据 - if (hasCloumns.length > 0) { - //先获取到大于等于1的包的，循环拿到row，赋值给大于等于1的对象的row，保证这个id唯一和连续 - for (var m = 0; m < hasCloumns.length; m++) { - var myObj = hasCloumsObjs[m]; - myObj.row = m; - addColumnArr.push(myObj); - } - } - //获取到大于等于1的数组的长度，后面每次加一下，就是新增加的包的row - var totalLength = hasCloumns.length - 1; - for (var i = 0; i < dataArray.length; i++) { - //没找到，就是数量大于等于1的id，在后台返回的数据中没有，这时候就需要直接取到后台数据，增加到页面上 - if (hasCloumns.indexOf(dataArray[i].tousseDefinitionID + "") == -1) { - totalLength++; - var timeStr = new Date().getTime(); - var errorDamageQmKey = dataArray[i].tousseDefinitionID + "_" + timeStr; - var toussItem = { - row: totalLength, - tousseItemId: '', - tousseName: dataArray[i].tousseName, - tousseDefinitionID: dataArray[i].tousseDefinitionID, - applicationAmount: 0, - recycleAmount: 0, - loadedAmount: 0, - isCleanedEntirely: dataArray[i].isCleanedEntirely, - tousseType: dataArray[i].tousseType, - isThereIdentificationCard: dataArray[i].isThereIdentificationCard, - isApplyEntireTousse: dataArray[i].isApplyEntireTousse, - urgentAmount: 0, - hiddenUrgentAmount: 0, - taskGroup: dataArray[i].taskGroup, - tousseRemark: '', - errorDamageQmKey: errorDamageQmKey, - spelling: dataArray[i].spelling, - packed: dataArray[i].packed - }; - addColumnArr.push(toussItem); - } - } - - for (var i = 0; i < addColumnArr.length; i++) { - var addColumnObj = addColumnArr[i]; - //统一增加的原因，是防止下次去拿数据的时候，拿到刚增加进去的数据 - addToussItem(addColumnObj, true); - } - - //恢复点击入筐后，回收数量和装配数量背景色的控制，因为前面删掉了全部的数据 - if (hasCloumns.length > 0) { - for (var k = 0; k < hasCloumns.length; k++) { - setTousseItemLoadedAmountCss(k); - } - } - - if (requestParms.templateIds == '') { - $('#departmentTemplate').val('全部模板'); - } else { - $('#departmentTemplate').val(tousseNameValue.join(',')); - } - - layer.close(layerShowLoad); - selectDivMousein(); - } - }) - } else { - var tousseItemsTable2 = $('#tousseItemTable').children().first().children(); - for (var j = 0; j < tousseItemsTable2.length; j++) { - var id = tousseItemsTable2[j].id || ''; - if (id !== '') { - var index = id.split('tousseItemsTr')[1]; - var loadedAmount = $('#loadedAmount' + index).val(); - if (parseInt(loadedAmount) == 0) { - $('#tousseItemsTr' + index).remove(); - } - } - } - $('#departmentTemplate').val('选择模板'); - layer.close(layerShowLoad); - selectDivMousein(); - } -} - // 装载数量根据其值更新背景色 function checkLoadedAmount() { $('#tousseItemTable').children().first().children().each(function (i, element) {