Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java =================================================================== diff -u -r22066 -r22093 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 22066) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/action/ExpensiveGoodsApplicationAction.java (.../ExpensiveGoodsApplicationAction.java) (revision 22093) @@ -130,7 +130,7 @@ } /** - * + * 构建高值耗材申请单的json对象 * @param expensiveGoodsApplication * @return */ @@ -145,6 +145,7 @@ obj.put("handleDepartCoding", expensiveGoodsApplication.getHandleDepartCoding()); obj.put("serialNumber", expensiveGoodsApplication.getSerialNumber()); obj.put("applicant", expensiveGoodsApplication.getApplicant()); + obj.put("applicantCode", expensiveGoodsApplication.getApplicantCode()); obj.put("applicationTimeStr", expensiveGoodsApplication.getApplicationTimeStr()); obj.put("remark", expensiveGoodsApplication.getRemark()); obj.put("deliverStatus", expensiveGoodsApplication.getDeliverStatus()); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js =================================================================== diff -u -r22066 -r22093 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js (.../expensiveGoodsApplicationFormForApproval.js) (revision 22066) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationFormForApproval.js (.../expensiveGoodsApplicationFormForApproval.js) (revision 22093) @@ -312,11 +312,21 @@ allowDecimals : false, readOnly: notAllowChanges },{ - xtype : 'textfield', + xtype : 'combo', fieldLabel : '性别', + valueField : 'typeName', + displayField : 'typeName', id : 'patientSex', name : 'patientSex', - readOnly : notAllowChanges + mode : 'local', + triggerAction : 'all', + forceSelection : true, + editable : false, + store : new Ext4.data.SimpleStore({ + fields : ['typeName'], + data : [['男'],['女']] + }), + readOnly: notAllowChanges },{ xtype : 'textfield', fieldLabel : '病人所属科室',