Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r36620 -r36776 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36620) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36776) @@ -5177,4 +5177,41 @@ supplyRoomRemoteStore.load(); return supplyRoomStore; +} + +//BJ309YY-5:multiSelect选择全部 +function selectAllValue(combo, record, checkField, id){ + if (record.get('name') == '全部') { + //1、如果选中“全部”的项,则把所有的项选中,反之全部取消选择 + if (record.get(checkField)) { + combo.selectAll() + } else { + combo.deselectAll() + } + //2、如果已经选中所有的项,则把“全部”项选中,反之把“全部”项取消选择 + var selectAll = true; + combo.store.each(function(record) { + if (record.get('name') != '全部' && !record.get(checkField)) { + selectAll = false; + return; + } + }, combo); + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + if(id){ + $Id(id).value = ''; + }else { + combo.setValue(''); + } + }else { + if(id){ + $Id(id).value = combo.getCheckedValue(); + }else { + combo.setValue(combo.getCheckedValue()); + } + } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r36759 -r36776 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 36759) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 36776) @@ -52,7 +52,7 @@ [{ name: 'orgUnitCoding', mapping: 'orgUnitCoding' }, { name: 'name', mapping: 'name' }]), listeners: { load: function (thiz, records, options) { - if (records.length > 0) { + if (records.length > 0 && options.params.spell == '') { useRecordDepartStore.insert(0, new allDepartItems({ 'orgUnitCoding': '', 'name': '全部' })); } } @@ -76,7 +76,7 @@ [{ name: 'id', mapping: 'id' }, { name: 'name', mapping: 'name' }]), listeners: { load: function (thiz, records, options) { - if (records.length > 0) { + if (records.length > 0 && options.params.spell == '') { ascriptionDepartmentStore.insert(0, new ascriptionDepartmentItems({ 'id': '', 'name': '全部' })); } } @@ -889,7 +889,6 @@ }); } - Ext.onReady(function () { Ext.QuickTips.init(); top.Ext.QuickTips.init(); @@ -1222,35 +1221,8 @@ listWidth: 250, listeners:{ select: function (combo, record, index) { - //1、如果选中“全部”的项,则把所有的项选中,反之全部取消选择 - if (record.get('name') == '全部') { - if (record.get(this.checkField)) { - combo.selectAll() - } else { - combo.deselectAll() - } - } - - //2、如果已经选中所有的项,则把“全部”项选中,反之把“全部”项取消选择 - var selectAll = true; - combo.store.each(function(record) { - if (record.get('name') != '全部' && !record.get(this.checkField)) { - selectAll = false; - return; - } - }, combo); - - var all = combo.store.getAt(0); - if (selectAll) { - all.set(combo.checkField, true); - } else { - all.set(combo.checkField, false); - } - if (record.get('name') == '全部') { - $Id('parm_s_departCodings').value = ''; - }else { - $Id('parm_s_departCodings').value = combo.getCheckedValue(); - } + selectAllValue(combo, record, this.checkField, 'parm_s_departCodings'); + grid.dwrReload(); }, blur:function(e){ @@ -1283,37 +1255,8 @@ listWidth: 250, listeners:{ select: function (combo, record, index) { - //1、如果选中“全部”的项,则把所有的项选中,反之全部取消选择 - if (record.get('name') == '全部') { - if (record.get(this.checkField)) { - combo.selectAll() - } else { - combo.deselectAll() - } - } - - //2、如果已经选中所有的项,则把“全部”项选中,反之把“全部”项取消选择 - var selectAll = true; - combo.store.each(function(record) { - if (record.get('name') != '全部' && !record.get(this.checkField)) { - selectAll = false; - return; - } - }, combo); - - var all = combo.store.getAt(0); - if (selectAll) { - all.set(combo.checkField, true); - } else { - all.set(combo.checkField, false); - } + selectAllValue(combo, record, this.checkField, 'parm_s_ascriptionDepartment'); - if (record.get('name') == '全部') { - $Id('parm_s_ascriptionDepartment').value = ''; - }else { - $Id('parm_s_ascriptionDepartment').value = combo.getCheckedValue(); - } - grid.dwrReload(); }, blur:function(e){ @@ -1349,6 +1292,7 @@ listeners:{ select: function (combo, record, index) { $Id('parm_s_status').value = combo.getCheckedValue(); + grid.dwrReload(); } }