Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js =================================================================== diff -u -r32730 -r32732 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js (.../chargeSetForm.js) (revision 32730) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetForm.js (.../chargeSetForm.js) (revision 32732) @@ -44,26 +44,6 @@ updateSum(index); } -//更新固定值的数量 -function updateFixedNum(index, k) { - var num = $('.fixedNum_' + index + '_' + k).val(); - var currentPrice = $('.fixedPrice_' + index + '_' + k).text(); - var n = 0; - if (isNaN(num) || num == '') { - n = 0; - $('.fixedNum_' + index + '_' + k).val(''); - } else { - if (parseInt(num) < 0) { - n = 0; - } else { - n = parseInt(num); - } - $('.fixedNum_' + index + '_' + k).val(n); - } - $('.sumFixedPrice_' + index + '_' + k).find('span').html(toFloat(currentPrice * n)); - updateSum(index); -} - //更改固定值 function changeFixedMode(that, index, k) { if (that.checked) { @@ -223,9 +203,9 @@ } if (fixedAmount > 0) { numbers += fixedModeList[z].fixedAmount; - html += '

'; + html += '

'; } else { - html += '

'; + html += '

'; } } html += '

' + numbers + '

' @@ -267,7 +247,7 @@ } //保存 -function save() { +function save(chargeSetWin) { var trLen = $('#chargeSetTable').find('tr').length; var foreignTousseChargeInfos = []; for (var i = 0; i < trLen - 1; i++) { @@ -351,9 +331,10 @@ }, success: function (result) { if (result.success) { - window.parent.ReturnChargeSetResult(result); + showResult(result.message); + chargeSetWin.close(); } else { - window.parent.ReturnChargeSetResult(result); + showResult(result.message); } } }); Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r32715 -r32732 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 32715) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 32732) @@ -244,15 +244,6 @@ } } -function ReturnChargeSetResult(res){ - if(res.success){ - showResult(res.message); - chargeSetWin.close(); - }else { - showResult(res.message); - } -} - Ext.onReady(function(){ Ext.QuickTips.init(); var isShowInterfacePush = false; @@ -504,7 +495,7 @@ return false; } - var form = new Ext4.Panel({ + var form = new top.Ext4.Panel({ frame: false,//渲染面板 autoScroll: true,//自动显示滚动条 collapsible: false,//允许展开和收缩 @@ -515,7 +506,7 @@ id: 'confirmBtn', text: '保存', handler: function () { - window.frames["thisTable"].save(); + top.window.frames["thisTable"].save(chargeSetWin); } }, { text: '取消', @@ -525,7 +516,7 @@ }] }); - chargeSetWin = new Ext4.window.Window({ + chargeSetWin = new top.Ext4.window.Window({ id: 'chargeSetWin', title: '外来器械包收费设置(' + records[0].data.depart + '-' + records[0].json.serialNumber + ')', height: 500, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp =================================================================== diff -u -r32705 -r32732 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp (.../chargeSetTable.jsp) (revision 32705) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/chargeSetTable.jsp (.../chargeSetTable.jsp) (revision 32732) @@ -67,7 +67,8 @@ - + +