Index: ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js =================================================================== diff -u -r38839 -r38840 --- ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js (.../invoiceView.js) (revision 38839) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js (.../invoiceView.js) (revision 38840) @@ -1031,24 +1031,20 @@ text : '保存', handler : function() { var settleAccountsDepartArr = []; - var interfereAllGoods = true; for ( var i = 0; i < tousseInstanceStore.getCount(); i++) { var record = tousseInstanceStore.getAt(i); settleAccountsDepartArr.push({ settleAccountsDepart:record.data.settleAccountsDepart, settleAccountsDepartCoding:record.data.settleAccountsDepartCoding, - tousseInstanceId:record.data.id + tousseInstanceId:record.data.id, + tousseType:record.data.tousseType, }); - if(record.data.tousseType !== '器械包'){ - interfereAllGoods = false; - } } //SZSDSRMYY-166:保存备注和结算科室 Ext.Ajax.request({ url: WWWROOT + '/disinfectSystem/invoiceAction!interfereInvoice.do', params : { invoiceId : id, - interfereAllGoods:interfereAllGoods, remark1:top.Ext.getCmp("remark2").getValue(), settleAccountsDepartArr:JSON.stringify(settleAccountsDepartArr) }, Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r38837 -r38840 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 38837) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 38840) @@ -49,6 +49,8 @@ { name: 'price' }, { name: 'fluctuationPrice' }, { name: 'invoicePlanSerialNumber' }, + {name : 'settleAccountsDepart'}, + {name : 'settleAccountsDepartCoding'}, { name: 'storage' }, { name: 'batchNumber' }, { name: 'sterilizerName' }, @@ -645,7 +647,8 @@ }) }, { header: "申请单号", dataIndex: 'invoicePlanSerialNumber', width: 50, menuDisabled: true, sortable: false }, - { header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true } + { header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true }, + {header : "结算科室",dataIndex : 'settleAccountsDepart',width : 60,menuDisabled : true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView} ]); var form = new top.Ext.FormPanel({