Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r30594 -r30713
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 30594)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 30713)
@@ -1389,7 +1389,57 @@
}
});
-
+ //灭菌方式数据源定义
+ var sterilizationModeJsonStore = new Ext.data.SimpleStore({
+ fields : [ 'optionText' ],
+ url : WWWROOT + '/disinfectSystem/baseData/sterilisationAction!getSterilizationModeList.do',
+ listeners: {
+ load:function(thiz,records){
+ record = Ext.data.Record.create([
+ {name: "optionText", type: "string"}
+ ]);
+ var isAll = new record({
+ optionText: "全部"
+ });
+ thiz.insert(0, isAll);
+ }
+ }
+ });
+
+ //包装类型
+ var packageTypeStore = new Ext.data.SimpleStore({
+ fields : [ 'typeName'],
+ url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageTypeAndExpirationDateInfo.do',
+ baseParams :{addNullValue:true},
+ listeners: {
+ load:function(thiz,records){
+ record = Ext.data.Record.create([
+ {name: "typeName", type: "string"}
+ ]);
+ var isAll = new record({
+ typeName: "全部"
+ });
+ thiz.insert(0, isAll);
+ }
+ }
+ });
+
+ //装配任务组
+ var taskGroupStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/taskGroupAction!loadTaskGroupStore.do',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ root : 'data',
+ totalProperty: 'totalCount'
+ },[
+ {name : 'id',mapping : 'valueField'},
+ {name : 'taskGroupName',mapping : 'displayField'}
+ ]
+ )
+ });
+
var sign = true;
var tbar = [{
text : '进入'+reviewViewText+'列表',
@@ -1434,25 +1484,27 @@
addQualityMonitoringWash();
}
} ,'->',{
- text : '科室分组:'
+ text : '科室分组:',
+ hidden:sstsConfig.reviewModuleVersion == 2
},{
- xtype : 'combo',
- id : 'departmentGroupOption_review',
- name : 'departmentGroupOption_review',
- editable:false,
- valueField : 'departCodes',
- displayField : 'name',
- store : departmentGroupOptionStore,
- forceSelection : true,
- width: 100,
- triggerAction : 'all',
- anchor : '100%',
+ xtype : 'combo',
+ id : 'departmentGroupOption_review',
+ name : 'departmentGroupOption_review',
+ editable:false,
+ hidden:sstsConfig.reviewModuleVersion == 2,
+ valueField : 'departCodes',
+ displayField : 'name',
+ store : departmentGroupOptionStore,
+ forceSelection : true,
+ width: 100,
+ triggerAction : 'all',
+ anchor : '100%',
listeners : {
select: function(combo, record, index){
reloadConditionPara(combo.getValue(), 'parm_s_departCodesFilters');
}
}
- }];
+ }];
/** 未审核器械包 **/
grid = new Ext.ux.ForgonPageGrid({
@@ -1470,6 +1522,104 @@
isShowRowNumber:true,
frame : false,
border : false,
+ listeners:{
+ render : function() {
+ if(sstsConfig.reviewModuleVersion == 2){
+ var tbar = new Ext.Toolbar ({
+ items : [{
+ text : '装配任务组:'
+ },{
+ xtype : 'combo',
+ id : 'taskGroup_review',
+ name : 'taskGroup_review',
+ editable:false,
+ valueField : 'taskGroupName',
+ displayField : 'taskGroupName',
+ store : taskGroupStore,
+ forceSelection : true,
+ width: 100,
+ triggerAction : 'all',
+ anchor : '100%',
+ listeners : {
+ select: function(combo, record, index){
+ var value = combo.getValue();
+ if(value == '全部'){
+ value = '';
+ }
+ reloadConditionPara(value, 'parm_s_taskGroup');
+ }
+ }
+ },{
+ text : '包装类型:'
+ },{
+ xtype : 'combo',
+ id : 'packageType_review',
+ name : 'packageType_review',
+ editable:false,
+ valueField : 'typeName',
+ displayField : 'typeName',
+ store : packageTypeStore,
+ forceSelection : true,
+ width: 100,
+ triggerAction : 'all',
+ anchor : '100%',
+ listeners : {
+ select: function(combo, record, index){
+ var value = combo.getValue();
+ if(value == '全部'){
+ value = '';
+ }
+ reloadConditionPara(value, 'parm_s_packageType');
+ }
+ }
+ },{
+ text : '灭菌方式:'
+ },{
+ xtype : 'combo',
+ id : 'sterilingMode_review',
+ name : 'sterilingMode_review',
+ editable:false,
+ valueField : 'optionText',
+ displayField : 'optionText',
+ store : sterilizationModeJsonStore,
+ forceSelection : true,
+ width: 100,
+ triggerAction : 'all',
+ anchor : '100%',
+ listeners : {
+ select: function(combo, record, index){
+ var value = combo.getValue();
+ if(value == '全部'){
+ value = '';
+ }
+ reloadConditionPara(value, 'parm_s_sterilingMode');
+ }
+ }
+ },{
+ text : '科室分组:'
+ },{
+ xtype : 'combo',
+ id : 'departmentGroupOption2_review',
+ name : 'departmentGroupOption2_review',
+ editable:false,
+ valueField : 'departCodes',
+ displayField : 'name',
+ store : departmentGroupOptionStore,
+ forceSelection : true,
+ width: 100,
+ triggerAction : 'all',
+ anchor : '100%',
+ listeners : {
+ select: function(combo, record, index){
+ reloadConditionPara(combo.getValue(), 'parm_s_departCodesFilters');
+ }
+ }
+ }]
+ });
+ tbar.render(grid.tbar);
+ }
+ }
+ },
viewConfig:{
getRowClass : function(record,rowIndex,rowParams,store){
if(record.data.scanned){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r30296 -r30713
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 30296)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp (.../reviewView.jsp) (revision 30713)
@@ -104,8 +104,10 @@
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r30521 -r30713
--- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 30521)
+++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 30713)
@@ -898,8 +898,21 @@
return returnContent;
}
- if(itemId != 'packing' && itemId != 'reviewPacking' && itemId !='sterilizationRecord'){
- //region 只有临床用户且配了版本2或者3才能看到科室申领版本2或者3的图标还有申请单图标
+ if(itemId != 'packing' && itemId !='sterilizationRecord'){
+ //SZYK-26:reviewModuleVersion审核版本
+ if(itemId == 'reviewPacking'){
+ if(sstsConfig.reviewModuleVersion == 2){
+ returnContent += '