Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r35094 -r35437
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35094)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35437)
@@ -198,10 +198,8 @@
-
-
-
-
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r35160 -r35437
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 35160)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 35437)
@@ -251,6 +251,9 @@
if(top.Ext4.getCmp('remark')){
top.Ext4.getCmp('remark').setValue(patientInfo.remark || '');
}
+ if(top.Ext4.getCmp('doctorAccountDepart')){
+ top.Ext4.getCmp('doctorAccountDepart').setValue(patientInfo.doctorAccountDepart || '');
+ }
}
//确认归还:0,提前归还:1,批量确认归还:2,批量提前归还:3
@@ -3432,6 +3435,22 @@
}]
},{
layout : 'form',
+ columnWidth :.33,
+ height:heightVal,
+ hidden : sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.indexOf('doctorAccountDepart') >= 0,
+ id:'doctorAccountDepartBox',
+ items : [{
+ labelWidth :130,
+ xtype : 'textfield',
+ fieldLabel : '主刀医生核算科室',
+ id : 'doctorAccountDepart',
+ name : 'doctorAccountDepart',
+ width : '33.3%',
+ allowBlank : true,
+ flex : .33
+ }]
+ },{
+ layout : 'form',
labelWidth :70,
columnWidth :.33,
height:heightVal,