Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r16149 -r16219 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 16149) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 16219) @@ -2,6 +2,7 @@ var foreignTousseForm; var foreignTousseApplyWindow; var applyDepartJsonStore; +var settleDepartJsonStore; var currentWashClassifyType = null; var tmpWashClassifyTypeNum = 0; @@ -431,10 +432,24 @@ /** * 修复IE6下快速粘贴申请科室,科室编码未赋值问题 */ - // var depart = top.Ext4.ComponentQuery.query("#foreignToussForm #depart")[0].getValue(); + var depart = top.Ext4.ComponentQuery.query("#foreignToussForm #depart")[0].getValue(); + var settleAccountsDepart = top.Ext4.ComponentQuery.query("#foreignToussForm #settleAccountsDepart")[0].getValue(); var deptCoding = top.Ext4.getCmp('departCoding').getValue(); var deptCoding2 = top.Ext4.getCmp('settleAccountsDepartCoding').getValue(); + //从store用用名字再次寻找deptCoding,比较页面上的deptCoding和从store找出来的deptCoding一样不,如果不一样, 有可能用户是复制粘贴科室名称上去, + //而没有从下拉选项中选择(由于做了分页,如果用户粘贴了一个不在当前页面的科室名,下拉选项是不会有值的,所以不用担心从store里找不到该科室的coding) + var storeDeptCoding = getStoreDepartCoding(applyDepartJsonStore,depart); + if (deptCoding != storeDeptCoding){ + //如果不一样,则将deptCoding改成storeDeptCoding + deptCoding = storeDeptCoding; + } + var storeDeptCoding2 = getStoreDepartCoding(settleDepartJsonStore,settleAccountsDepart); + if (deptCoding2 != storeDeptCoding2){ + //如果不一样,则将deptCoding改成storeDeptCoding2 + deptCoding2 = storeDeptCoding2; + } + // var deptCoding = getStoreDepartCoding(applyDepartJsonStore,depart); // top.Ext4.ComponentQuery.query("#foreignToussForm #departCoding")[0].setValue(deptCoding); @@ -451,7 +466,9 @@ showResult("结算科室编码不能为空!"); return false; } - + top.Ext4.getCmp('departCoding').setValue(deptCoding); + top.Ext4.getCmp('settleAccountsDepartCoding').setValue(deptCoding2); + foreignTousseForm.form.submit({ url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do', method : 'POST', @@ -1038,7 +1055,7 @@ folderSort: true }); - var settleDepartJsonStore = new Ext4.data.JsonStore({ + settleDepartJsonStore = new Ext4.data.JsonStore({ proxy : { type : 'ajax', url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',