Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r29160 -r29219 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29160) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29219) @@ -1761,6 +1761,9 @@ if(dex >= 0){//检查全选框是否被选中-是 selectValues.splice(dex,1); checkAll_box.checked = false; + if(isSelected){ + selectValues.remove(0) + } }else{//否 if(!isSelected){ selectValues.push(record.data.id); @@ -1780,6 +1783,19 @@ checkbox.checked = false; } } + var k = 0; + Ext4.each(check_boxs, function(item) { + if(item.checked){ + k++ + } + }); + if(k == 0){ + var par = { + templateIds:"", + reloadTemplate:top.Ext4.getCmp("departCoding").getValue() + } + loadProduction(par, true); + } } if((selectValues.length + 1) == record.store.data.items.length && selectValues.indexOf(0) == -1){//检查是否是除全选框外的其它选择宽都被选中 selectValues.push(0); @@ -2462,7 +2478,6 @@ params : para, timeout : 600000, success : function(response, options) { - try { var result = Ext4.JSON.decode(response.responseText); if (mergeEarlyTousseItem){ //待会根据结算科室重新算一次性物品的价格 @@ -2507,6 +2522,32 @@ } }); } + + function arrRemoveRepart(arr,type){ + var newArr = []; + var tArr = []; + if(arr.length == 0){ + return arr; + }else{ + if(type){ + for(var i = 0; i < arr.length;i++){ + if(!tArr[arr[i][type]]){ + newArr.push(arr[i]); + tArr[arr[i][type]] = true; + } + } + return newArr; + }else{ + for(var i = 0; i < arr.length;i++){ + if(!tArr[arr[i]]){ + newArr.push(arr[i]); + tArr[arr[i]] = true; + } + } + return newArr; + } + } + } /** * 迭代两个数据,如果新数据里面也有旧数据,则将旧数据的count赋值给新的. @@ -2523,6 +2564,9 @@ } }); result = result.concat(newDatas); + var obj = {}; + + result = arrRemoveRepart(result,'tousseDefinitionID'); //模板已经申请的要置顶 if(sstsConfig.isOpenLoadTemplateByUnit && (type == comboApplicationForm || type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == reservateionApplicationForm