';
- invoiceItems += '| ' + invoiceItem.showTousseName + ' | ';
- invoiceItems += '' + invoiceItem.batchNumber + ' | ';
- invoiceItems += '' + invoiceItem.count + ' | ';
- invoiceItems += '' + invoiceItem.fluctuationPrice + ' | ';
+ invoiceItems += '| ' + invoiceItem.showTousseName + ' | ';
+ invoiceItems += '' + invoiceItem.barcode + ' | ';
+ invoiceItems += '' + invoiceItem.batchNumber + ' | ';
+ invoiceItems += '' + invoiceItem.count + ' | ';
+ invoiceItems += '' + invoiceItem.fluctuationPrice + ' |
';
}
record.set('invoiceItems',invoiceItems);
record.commit(true);
- expander.bodyContent[record.id] = expander.tpl.apply(record.data);
+ if(enableTheDisposableGoodsTreeModeForiInvoiceView){
+ Ext.Ajax.request( {
+ url : WWWROOT + '/disinfectSystem/invoiceAction!loadDiposableGoodsItemByInvoiceId.do',
+ method : 'GET',
+ params : { id : invoiceID },
+ waitMsg : '正在加载数据，请稍候',
+ success : function(response, options) {
+ var diposableGoodsItems = '';
+ var result = response.responseText;
+ var diposableGoodsItemsObject = eval('(' + result + ')');
+ for(var i=0;i';
+ diposableGoodsItems += '
';
+ diposableGoodsItems += '';
+ diposableGoodsItems += '' + diposableGoodsItem.name + '';
+ diposableGoodsItems += '';
+ diposableGoodsItems += ' | ';
+ diposableGoodsItems += ' | ';
+ diposableGoodsItems += '' + diposableGoodsItem.count + ' | ';
+ diposableGoodsItems += '' + diposableGoodsItem.unit + ' | ';
+ diposableGoodsItems += ' | ';
+ diposableGoodsItems += '';
+ for(var j=0;j' + childrenItem.barcode + '';
+ diposableGoodsItems += '' + childrenItem.batchNumber + ' | ';
+ diposableGoodsItems += '' + childrenItem.count + ' | ';
+ diposableGoodsItems += '' + childrenItem.unit + ' | ';
+ diposableGoodsItems += '' + childrenItem.fluctuationPrice + ' | ';
+ diposableGoodsItems += '';
+ }
+ }
+ record.set('diposableGoodsItems',diposableGoodsItems);
+ record.commit(true);
+ expander.bodyContent[record.id] = expander.tpl.apply(record.data);
+ },
+ failure : function(form, action) {
+ alert("数据加载失败，请稍后再试。");
+ }
+ });
+ }else {
+ expander.bodyContent[record.id] = expander.tpl.apply(record.data);
+ }
},
failure : function(form, action) {
alert("数据加载失败，请稍后再试。");
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r39746 -r39749
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 39746)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 39749)
@@ -3,7 +3,7 @@
var tousseTypeDataArray = [['全部', '全部'], ['一次性物品', '一次性物品'], ['器械包', '器械包'], ['敷料包', '敷料包'], ['消毒物品', '消毒物品'], ['自定义器械包', '自定义器械包'], ['外来器械包', '外来器械包'], ['外来器械拆分小包', '外来器械拆分小包'], ['外部代理灭菌', '外部代理灭菌']];
//基础信息
var recyclingApplicationFormWidth = 1000;
-var recyclingApplicationFormHeight = 620;
+var recyclingApplicationFormHeight = 310;
var recyclingApplicationInfoWidth = 950;
//预约或者自定义下的患者信息的显示与否
@@ -12,10 +12,10 @@
var isPatientHeight = 140;
//发货器械包
var recyclingGrid2Width = 620;
-var recyclingGrid2Height = 385;
+var recyclingGrid2Height = 300;
//发货单明细
var recyclingGrid1Width = 350;
-var recyclingGrid1Height = 385;
+var recyclingGrid1Height = 149;
var rd = new Ext.data.JsonReader({
fields: [
@@ -529,6 +529,7 @@
var cm = new Ext.grid.ColumnModel([
{ id: 'id', dataIndex: 'id', hidden: true },
+ { header: "物品名称", dataIndex: 'showTousseName', width: 80, menuDisabled: true },
{
header: "条码", dataIndex: 'barcode', width: 40, menuDisabled: true,
renderer: function (v, p, record) {
@@ -552,7 +553,6 @@
return result;
}
},
- { header: "物品名称", dataIndex: 'showTousseName', width: 80, menuDisabled: true },
{ header: "name", dataIndex: 'name', hidden: true, menuDisabled: true },
{ header: "批次/灭菌日期", dataIndex: 'batchNumber', width: 60, menuDisabled: true },
{ header: "灭菌炉名称", dataIndex: 'sterilizerName', width: 100, menuDisabled: true, hidden: true },
@@ -650,27 +650,24 @@
{ header: "结算科室", dataIndex: 'settleAccountsDepart', width: 60, menuDisabled: true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView },
{ header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true }
]);
-
var form = new top.Ext.FormPanel({
id: 'recyclingApplicationForm',
frame: true,
labelSeparator: '：',
bodyStyle: 'padding:5px 5px 0px 5px',
- width: recyclingApplicationFormWidth,
- height: recyclingApplicationFormHeight,
autoScroll: true,
labelAlign: 'right',
layout: 'form',
items: [{
- xtype: "fieldset",
- title: "基础数据",
layout: 'column',
id: 'recyclingApplicationInfo',
- width: recyclingApplicationInfoWidth,
- autoHeight: true,
+ height: recyclingApplicationFormHeight,
items: [{
+ xtype: "fieldset",
+ title: "基础数据",
layout: 'column',
- columnWidth: .55,
+ columnWidth: .5,
+ height: recyclingApplicationFormHeight + 10,
items: [{
xtype: 'hidden',
name: 'id',
@@ -764,8 +761,6 @@
anchor: '99%',
cls: 'x-item-disabled'
}]
-
-
}, {
layout: 'form',
labelWidth: 70,
@@ -888,7 +883,6 @@
cls: 'x-item-disabled',
readOnly: true
}]
-
},
{
layout: 'form',
@@ -970,41 +964,72 @@
}]
}]
}, {
- layout: 'form',
- hidden: (isForeignProxyDisinfection ? true : false),
- columnWidth: 0.45,
- items: [
- new top.Ext.grid.EditorGridPanel({
- id: 'recyclingError',
- title: '丢失材料明细',
- store: recyclingErrorStore,
- cm: recyclingErrorCm,
- enableHdMenu: false,
- width: isPatientWidth,
- height: isPatientHeight,
- autoExpandColumn: 'price',
- frame: false,
- bodyStyle: 'border:1px solid #afd7af',
- viewConfig: { forceFit: true },
- clicksToEdit: 1,
- selModel: new top.Ext.grid.RowSelectionModel({
- singleSelect: false
+ layout: 'column',
+ columnWidth: .48,
+ style: 'margin-left:1%;',
+ items: [{
+ layout: 'form',
+ hidden: (isForeignProxyDisinfection ? true : false),
+ columnWidth: .99,
+ items: [
+ new top.Ext.grid.EditorGridPanel({
+ id: 'recyclingError',
+ title: '丢失材料明细',
+ store: recyclingErrorStore,
+ cm: recyclingErrorCm,
+ enableHdMenu: false,
+ height: recyclingGrid1Height,
+ frame: false,
+ bodyStyle: 'border:1px solid #afd7af',
+ viewConfig: { forceFit: true },
+ clicksToEdit: 1,
+ selModel: new top.Ext.grid.RowSelectionModel({
+ singleSelect: false
+ })
})
- })
- ]
+ ]
+ }, {
+ layout: 'form',
+ columnWidth: .99,
+ items: [
+ new top.Ext.grid.EditorGridPanel({
+ id: 'recyclingGrid1',
+ title: '发货单明细 发货总数量:',
+ store: invoiceStore,
+ cm: recyclingapplicationCm,
+ enableHdMenu: false,
+ height: isForeignProxyDisinfection ? recyclingGrid1Height * 2 : recyclingGrid1Height,
+ autoExpandColumn: 'deleteItem',
+ frame: false,
+ bodyStyle: 'border:1px solid #afd7af',
+ viewConfig: { forceFit: true },
+ clicksToEdit: 1,
+ selModel: new top.Ext.grid.RowSelectionModel({
+ singleSelect: false
+ }),
+ listeners: {
+ validateedit: function (o) {
+ if (!isPositiveInteger(o.value)) {
+ return false;
+ }
+ }
+ }
+ })
+ ]
+ }]
}]
}, {
layout: 'column',
items: [{
layout: 'form',
- columnWidth: 0.65,
+ columnWidth: sstsConfig.enableTheDisposableGoodsTreeModeForiInvoiceView ? 0.5 : 1,
autoScroll: true,
items: [
new top.Ext.grid.EditorGridPanel({
id: 'recyclingGrid2',
store: tousseInstanceStore,
+ title: sstsConfig.enableTheDisposableGoodsTreeModeForiInvoiceView ? '器械包发货明细' : '',
cm: cm,
- width: recyclingGrid2Width,
height: recyclingGrid2Height,
autoExpandColumn: 'deleteItem',
enableHdMenu: false,
@@ -1018,32 +1043,71 @@
})]
}, {
layout: 'form',
- columnWidth: 0.35,
+ columnWidth: 0.48,
+ style: 'margin-left:1%;',
+ hidden: !sstsConfig.enableTheDisposableGoodsTreeModeForiInvoiceView,
items: [
- new top.Ext.grid.EditorGridPanel({
- id: 'recyclingGrid1',
- title: '发货单明细 发货总数量:',
- store: invoiceStore,
- cm: recyclingapplicationCm,
- enableHdMenu: false,
- width: recyclingGrid1Width,
- height: recyclingGrid1Height,
- autoExpandColumn: 'deleteItem',
- frame: false,
+ new top.Ext.tree.ColumnTree({
+ id: 'diposableGoodsItem',
+ rootVisible: false,
+ title: '一次性物品发货明细',
+ height: recyclingGrid2Height,
+ autoScroll: true,
bodyStyle: 'border:1px solid #afd7af',
- viewConfig: { forceFit: true },
- clicksToEdit: 1,
- selModel: new top.Ext.grid.RowSelectionModel({
- singleSelect: false
- }),
- listeners: {
- validateedit: function (o) {
- if (!isPositiveInteger(o.value)) {
- return false;
+ containerScroll: true,
+ columns: [{
+ header: '物品名称',
+ width: 100,
+ dataIndex: 'name'
+ }, {
+ header: '条码',
+ width: 80,
+ dataIndex: 'barcode'
+ }, {
+ header: '批次',
+ width: 100,
+ dataIndex: 'batchNumber'
+ }, {
+ header: '单价',
+ width: 50,
+ dataIndex: 'fluctuationPrice'
+ }, {
+ header: '数量',
+ width: 50,
+ dataIndex: 'count'
+ }, {
+ header: '单位',
+ width: 50,
+ dataIndex: 'unit'
+ }, {
+ header: '申请单号',
+ width: 80,
+ dataIndex: 'invoicePlanSerialNumber'
+ }, {
+ header: '发货类型',
+ width: 80,
+ dataIndex: 'type'
+ }],
+ loader: new top.Ext.tree.TreeLoader({
+ url: WWWROOT + '/disinfectSystem/invoiceAction!loadDiposableGoodsItemByInvoiceId.do',
+ baseParams: { id: id },
+ uiProviders: {
+ 'col': top.Ext.tree.ColumnNodeUI
+ },
+ listeners: {
+ load: function (_this, node, response) {
+ var result = Ext.decode(response.responseText);
+ if (result.success === false) {
+ showResult('加载出错了,原因如下:' + result.message)
+ }
}
}
- }
- })]
+ }),
+ root: new top.Ext.tree.AsyncTreeNode({
+ text: 'data'
+ })
+ })
+ ]
}]
}],
buttons: [{
@@ -1070,7 +1134,7 @@
}]
});
- var winWidth = 1000;
+ var winWidth = 1270;
var winHeight = top.screen.height > 800 ? 700 : 500;
var window = new top.Ext.Window({
@@ -1079,23 +1143,18 @@
title: '发货单',
width: winWidth,
height: winHeight,
- minWidth: winWidth,
- minHeight: winHeight,
border: false,
modal: true,
plain: true,
- items: [form],
- listeners: {
- resize: function (t, w, h) {
- var widthRadio = parseFloat(w / winWidth).toFixed(2);
- var heightRadio = parseFloat(h / winHeight).toFixed(2);
- resizeWindow(widthRadio, heightRadio, 'recyclingApplicationWin');
- }
- }
+ items: [form]
});
window.show();
+ if (sstsConfig.enableTheDisposableGoodsTreeModeForiInvoiceView) {
+ top.Ext.getCmp('diposableGoodsItem').expandAll()
+ }
+
form.form.load({
url: WWWROOT + '/disinfectSystem/invoiceAction!loadInvoice.do',
method: 'GET',