Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r39749 -r41520 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 39749) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 41520) @@ -650,6 +650,9 @@ { header: "结算科室", dataIndex: 'settleAccountsDepart', width: 60, menuDisabled: true, hidden: !sstsConfig.enableSettleDepartIntervenesInTheSplitOfInvoiceView }, { header: "发货类型", dataIndex: 'type', width: 40, menuDisabled: true } ]); + if(sstsConfig.enableDesignatedWarehouseReceiving){ + recyclingApplicationFormHeight += 30 + } var form = new top.Ext.FormPanel({ id: 'recyclingApplicationForm', frame: true, @@ -950,6 +953,26 @@ }, { layout: 'form', + labelWidth: 70, + columnWidth: .5, + hidden: !sstsConfig.enableDesignatedWarehouseReceiving, + items: [{ + xtype:'hidden', + id:'signStorageLocationId', + name:'signStorageLocationId' + },{ + xtype: 'textfield', + fieldLabel: '签收库房', + maxLength: '41', + id: 'signStorageLocationName', + name: 'signStorageLocationName', + readOnly: true, + anchor: '99%', + cls: 'fieldReadOnlyNoRemove' + }] + }, + { + layout: 'form', columnWidth: 1, labelWidth: 70, items: [{