Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js =================================================================== diff -u -r29742 -r29940 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 29742) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseForm.js (.../borrowingTousseForm.js) (revision 29940) @@ -690,7 +690,7 @@ id : 'applicationTimeStr', name : 'applicationTimeStr', editable:false, - allowBlank: false, + allowBlank: true, anchor : '95%', readOnly:true, // value : today, @@ -933,7 +933,6 @@ waitMsg:'正在加载数据,请稍候', success:function(form,action){ top.Ext.getCmp('oldVersion').setValue(action.result.data.version); - top.Ext.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(action.result.data.applicationTime.time),'Y-m-d H:i')); if(action.result.data.status != '待发货'){ top.Ext.getCmp('saveBtn').hide(); } @@ -945,7 +944,6 @@ //光标定位到“物品名称combo” top.Ext.getCmp("leaseTousseName").focus('', 10); - getServerTime('yyyy-MM-dd HH:mm ',top.Ext,'applicationTimeStr'); top.Ext.getCmp('applicant').setValue($Id('userName').value); top.Ext.getCmp('depart').setValue($Id('depart').value); top.Ext.getCmp('departCoding').setValue($Id('departCoding').value); Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r29917 -r29940 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29917) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 29940) @@ -1892,7 +1892,7 @@ flex : 1, id : 'applicationTimeStr', name : 'applicationTimeStr', - allowBlank : false, + allowBlank : true, readOnly : true, fieldCls : 'fieldReadOnlyNoRemoveAndTop' }] @@ -2250,7 +2250,6 @@ //1、设置“申请人”和“申请时间” top.Ext4.getCmp('applicant').setValue(curUserName); top.Ext4.getCmp('applicantCode').setValue(userCode); - getServerTime('yyyy-MM-dd HH:mm',top.Ext4,'applicationTimeStr'); //2、设置“申请科室”、“结算科室”、“处理科室” if (!isFirstSupplyRoomUser) { @@ -2391,10 +2390,6 @@ top.Ext4.getCmp("handleDepartCoding").setValue(recyclingApplication.handleDepartCoding); top.Ext4.getCmp("handleDepart").setValue(recyclingApplication.handleDepart); - if(recyclingApplication.applicationTime){ - top.Ext4.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(recyclingApplication.applicationTime.time),'Y-m-d H:i')); - } - top.Ext4.getCmp("remark").setValue(recyclingApplication.remark);// top.Ext4.getCmp('storeCode').setValue(recyclingApplication.storeCode); top.Ext4.getCmp('projCode').setValue(recyclingApplication.projCode); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js =================================================================== diff -u -r29581 -r29940 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js (.../customTousseForm.js) (revision 29581) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseForm.js (.../customTousseForm.js) (revision 29940) @@ -305,7 +305,7 @@ id : 'applicationTime', name : 'applicationTime', editable : false, - allowBlank: fillPrice, + allowBlank: true, // value : today, anchor : '95%', readOnly:true, @@ -726,7 +726,6 @@ top.Ext.getCmp('applicant').setValue(InvoicePlan.applicant); top.Ext.getCmp('urgency').setValue(InvoicePlan.urgency); - top.Ext.getCmp('applicationTime').setValue(InvoicePlan.applicationTimeStr); top.Ext.getCmp("departCoding").setValue(InvoicePlan.departCoding); top.Ext.getCmp("depart").setValue(InvoicePlan.depart); top.Ext.getCmp('settleAccountsDepart').setValue(InvoicePlan.settleAccountsDepart); @@ -756,8 +755,6 @@ failure : function(form, action) { } }); - }else{ - getServerTime('yyyy-MM-dd HH:mm',top.Ext,'applicationTime'); } var isSupplyRoomUser = validateIsSupplyRoomUser(); if(!isSupplyRoomUser){