Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r30836 -r31283 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 30836) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 31283) @@ -229,13 +229,21 @@ } Ext.onReady(function(){ - Ext.QuickTips.init(); + Ext.QuickTips.init(); + var isShowInterfacePush = false; + if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.length > 0){ + var expandFieldsOfForeignTousseApplicationForm = sstsConfig.expandFieldsOfForeignTousseApplicationForm; + if(expandFieldsOfForeignTousseApplicationForm.indexOf("isInterfacePush") >= 0){ + isShowInterfacePush = true; + } + } var columns = [ {header : "紧急度",width : 45,dataIndex : 'urgencyNum', renderer : urgencyIconRender1,hidden:true}, // {header : "申请人",width : 50,dataIndex : 'applicant', renderer : modifyRecord}, {header : "申请人",width : 100,dataIndex : 'applicant', renderer : renderModifyFun}, {header : "申请时间",width : 115,dataIndex : 'applicationTime', renderer : myDateFormatByMinute}, - {header : "申请科室",width : 100,dataIndex : 'depart'}, + {header : "申请科室",width : 100,dataIndex : 'depart'}, + {header : "接口推送",width : 100,dataIndex : 'isInterfacePush',hidden:!isShowInterfacePush}, {header : "住院号",width : 70,dataIndex : 'hospitalNumber'}, {header : "病人姓名",width : 60,dataIndex : 'patient'}, {header : "医生",width : 60,dataIndex : 'doctor'}, @@ -266,7 +274,8 @@ var readerDetail = [ {name : 'id'}, {name : 'applicant'}, - {name : 'applicationTime'}, + {name : 'applicationTime'}, + {name : 'isInterfacePush'}, {name : 'barcodes'}, {name : 'depart'}, {name : 'deliverStatus'}, @@ -296,6 +305,7 @@ filters:[ {type: 'string', dataIndex: 'applicant'}, {type: 'date', dataIndex: 'applicationTime'}, + {type: 'string', dataIndex: 'isInterfacePush'}, {type: 'string', dataIndex: 'depart'}, {type: 'string', dataIndex: 'deliverStatus'}, {type: 'string', dataIndex: 'recyclingStatus'}, Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js =================================================================== diff -u -r31109 -r31283 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 31109) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 31283) @@ -201,6 +201,8 @@ mustViewPackingPhotoBeforeForeignTousseSignAndUse:true, //核算月报中单独显示属于科研项目的一次性物品申请单发货的总金额 showTotalMoneyOfSciProjectDisposableGoodsInvoiceInAccountingMonthlyReport:true, + //外来器械申请单的扩展字段 + expandFieldsOfForeignTousseApplicationForm:["isInterfacePush"], //启用装配外来器械包时,检查是否上传了图片 enableCheckUploadPhotoBeforePackingForeignTousse:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r31093 -r31283 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 31093) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 31283) @@ -2491,11 +2491,11 @@ { layout : 'form', labelWidth :70, - columnWidth :.33, + columnWidth :.25, height:heightVal, items : [{ xtype : 'textfield', - width : '33.3%', + width : '25%', fieldLabel : '申请人', maxLength : '50', id : 'applicant', @@ -2510,11 +2510,11 @@ },{ layout : 'form', labelWidth :70, - columnWidth :.33, + columnWidth :.25, height:heightVal, items : [{ xtype : 'textfield', - width : '33.3%', + width : '25%', fieldLabel : '申请时间', id : 'applicationTime', name : 'applicationTime', @@ -2526,11 +2526,11 @@ },{ layout : 'form', labelWidth :70, - columnWidth :.33, + columnWidth :.25, height:heightVal, items : [{ xtype : 'textfield', - width : '33.3%', + width : '25%', fieldLabel : '流水号', id : 'serialNumber', name : 'serialNumber', @@ -2542,6 +2542,27 @@ },{ layout : 'form', labelWidth :70, + columnWidth :.25, + height:heightVal, + id:'isInterfacePush', + hidden:true, + items : [{ + fieldLabel : '接口推送', + xtype : 'combo', + name : 'isInterfacePush', + valueField : 'yesOrNo', + displayField : 'yesOrNo', + store : new top.Ext4.data.SimpleStore({ + fields : [ 'yesOrNo' ], + data : [['是'],['否']] + }), + value:'否', + allowBlank: true, + forceSelection : true + }] + },{ + layout : 'form', + labelWidth :70, columnWidth :.5, height:heightVal, items : [{ @@ -3335,7 +3356,6 @@ readOnlyDom.fieldCls = 'fieldReadOnlydisabled'; } } - //新增字段使用expandFieldsOfForeignTousseApplicationForm配置项控制显示和隐藏 if(sstsConfig.expandFieldsOfForeignTousseApplicationForm && sstsConfig.expandFieldsOfForeignTousseApplicationForm.length > 0){ for(var j = 0;j < sstsConfig.expandFieldsOfForeignTousseApplicationForm.length;j++){