Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r38837 -r38849 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38837) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 38849) @@ -459,7 +459,7 @@ - + Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r38840 -r38849 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 38840) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 38849) @@ -49,8 +49,8 @@ { name: 'price' }, { name: 'fluctuationPrice' }, { name: 'invoicePlanSerialNumber' }, - {name : 'settleAccountsDepart'}, - {name : 'settleAccountsDepartCoding'}, + { name : 'settleAccountsDepart'}, + { name : 'settleAccountsDepartCoding'}, { name: 'storage' }, { name: 'batchNumber' }, { name: 'sterilizerName' }, @@ -647,8 +647,8 @@ }) }, { header: "申请单号", dataIndex: 'invoicePlanSerialNumber', width: 50, menuDisabled: true, sortable: false }, - { header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true }, - {header : "结算科室",dataIndex : 'settleAccountsDepart',width : 60,menuDisabled : true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView} + { header: "结算科室",dataIndex : 'settleAccountsDepart',width : 60,menuDisabled : true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView}, + { header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true } ]); var form = new top.Ext.FormPanel({ Index: ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js =================================================================== diff -u -r38841 -r38849 --- ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js (.../invoiceView.js) (revision 38841) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/invoice/invoiceView.js (.../invoiceView.js) (revision 38849) @@ -34,6 +34,7 @@ {name : 'fluctuationPrice'}, {name : 'settleAccountsDepart'}, {name : 'settleAccountsDepartCoding'}, + {name : 'upDateSettleAccountsDepart'}, {name : 'storage'}, {name : 'batchNumber'}, {name : 'sterilizerName'}, @@ -229,6 +230,7 @@ } record.set('settleAccountsDepart',newSettleAccountsDepart); record.set('settleAccountsDepartCoding',newSettleAccountsDepartCoding); + record.set('upDateSettleAccountsDepart',true); showResult('结算科室更新成功'); updateSettleAccountsDepartWin.close(); } @@ -740,8 +742,8 @@ } }) }, - {header : "发货类型",dataIndex : 'type',width : 60,menuDisabled : true}, - {header : "结算科室",dataIndex : 'settleAccountsDepart',width : 60,menuDisabled : true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView,renderer:renderSettleAccountsDepartFunction} + {header : "结算科室",dataIndex : 'settleAccountsDepart',width : 60,menuDisabled : true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView,renderer:renderSettleAccountsDepartFunction}, + {header : "发货类型",dataIndex : 'type',width : 60,menuDisabled : true} ]); var form = new top.Ext.FormPanel({