Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r38816 -r38897 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 38816) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 38897) @@ -3115,6 +3115,53 @@ var remarkName = configureObj.remark; var bedNumberName = configureObj.bedNumber; + var hasApplicationTime = false; + + if((id == '' || formType == 'interfere') && sstsConfig.notAllowBlankFieldsOnForeignTousseInfoPage && sstsConfig.notAllowBlankFieldsOnForeignTousseInfoPage.length > 0){ + for(var i = 0;i < sstsConfig.notAllowBlankFieldsOnForeignTousseInfoPage.length;i++){ + var notAllowBlankFiled = sstsConfig.notAllowBlankFieldsOnForeignTousseInfoPage[i]; + if(notAllowBlankFiled == 'applicationTime'){ + hasApplicationTime = true; + break; + } + } + } + + var applicationTimeItems = [{ + xtype : 'textfield', + width : '25%', + labelWidth :65, + fieldLabel : applicationTimeName, + id : 'applicationTime', + name : 'applicationTime', + editable:false, + readOnly : true, + flex : 1, + format : 'Y-m-d H:i', + fieldCls : 'fieldReadOnlyNoRemoveAndTop' + }] + + if(hasApplicationTime){ + var value = ''; + if(id == ''){ + value = new Date(nowToday) + } + applicationTimeItems = [{ + xtype : 'datefield', + width : '25%', + labelWidth :65, + fieldLabel : applicationTimeName, + id : 'applicationTime', + name : 'applicationTime', + selectOnFocus :true, + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + format : 'Y-m-d H:i:s', + allowBlank : true, + value:value, + flex : 1 + }] + } + foreignTousseForm = new top.Ext4.form.Panel({ id : 'foreignToussForm', frame : true, @@ -3169,21 +3216,10 @@ }] },{ layout : 'form', - labelWidth :70, + labelWidth :60, columnWidth :.25, height:heightVal, - items : [{ - xtype : 'textfield', - width : '25%', - fieldLabel : applicationTimeName, - id : 'applicationTime', - name : 'applicationTime', - editable:false, - readOnly : true, - flex : 1, - format : 'Y-m-d H:i', - fieldCls : 'fieldReadOnlyNoRemoveAndTop' - }] + items : applicationTimeItems },{ layout : 'form', labelWidth :70, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp =================================================================== diff -u -r37814 -r38897 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 37814) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 38897) @@ -28,6 +28,8 @@ request.setAttribute("isBeApplication",isBeApplication); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd"); request.setAttribute("today", dateFormat.format(new Date())); + SimpleDateFormat nowDateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + request.setAttribute("nowToday", nowDateFormat.format(new Date())); SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); SupplyRoomConfig firstSupplyRoomConfig = supplyRoomConfigManager.getFirstSupplyRoomConfig(); @@ -132,6 +134,7 @@ } var today = '<%=request.getAttribute("today")%>'; + var nowToday = '<%=request.getAttribute("nowToday")%>'; var curUserName = '<%=request.getAttribute("userName")%>'; var curUserCode = '<%=request.getAttribute("userCode")%>'; var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');