Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java
===================================================================
diff -u -r12331 -r15025
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java (.../GoodsOption.java) (revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/reportoption/GoodsOption.java (.../GoodsOption.java) (revision 15025)
@@ -27,7 +27,8 @@
public static final String MODEL_TOUSSEDELIVERDETAIL = "器械包发货统计明细";
public static final String MODEL_INVOICEAMOUNTCONTRAST = "一次性物品发货量对比";
public static final String MODEL_SURGICALINSTRUMENTS_DEPT = "手术器械科室定义";
-
+ public static final String MODEL_TOUSSEGOODSSTOCK = "器械包库存";
+
private String code;
private String value;
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java
===================================================================
diff -u -r14009 -r15025
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java (.../TousseGoodsStockTableManager.java) (revision 14009)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseGoodsStockTableManager.java (.../TousseGoodsStockTableManager.java) (revision 15025)
@@ -11,6 +11,8 @@
import java.util.List;
import java.util.Map;
+import com.forgon.disinfectsystem.basedatamanager.reportoption.GoodsOptionManager;
+import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -56,6 +58,12 @@
private TousseDefinitionManager tousseDefinitionManager;
+ private GoodsOptionManager goodsOptionManager;
+
+ public void setGoodsOptionManager(GoodsOptionManager goodsOptionManager) {
+ this.goodsOptionManager = goodsOptionManager;
+ }
+
private ObjectDao objectDao;
public void setGridManager(GridManager gridManager) {
@@ -92,7 +100,16 @@
if (StringUtils.isNotBlank(tousseName)) {
sqlBuilder.append(" and name='" + tousseName + "'");
}
-
+
+ //查看是否设置了统计的器械包名
+ GoodsOption goodsOption = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_TOUSSEGOODSSTOCK, AcegiHelper.getCurrentOrgUnitCode());
+ String values = goodsOption.getValue();
+ if (StringUtils.isNotBlank(values)){
+ String[] goods = goodsOption.getValue().split(";");
+ String names = SqlBuilder.build_IN_Statement(" name ", SqlBuilder.IN, goods);
+ sqlBuilder.append(" and ").append(names);
+ }
+
//科室名称
String orgUnitCode = sqlWhereParamMap.get("orgUnitCode");
if (StringUtils.isNotBlank(orgUnitCode)) {
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r14686 -r15025
--- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14686)
+++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 15025)
@@ -986,7 +986,8 @@
}
}
} else {
- var context = getElement(this).context;
+ // var context = getElement(this).context;
+ var context = this;
window = context.contentWindow;
if('iframe_enterpriseView'==context.id) {
window = context.contentDocument.getElementById('mainFrame').contentWindow;
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
===================================================================
diff -u -r13016 -r15025
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js (.../tousseGoodsStockView.js) (revision 13016)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js (.../tousseGoodsStockView.js) (revision 15025)
@@ -9,6 +9,18 @@
return "" + record.data['name'] + "";
}
+/**
+ * 删除configGrid选中的那一行
+ */
+function removeGridItem(){
+ var rows = top.Ext.getCmp('configGrid').getSelectionModel().getSelections();
+ if (rows) {
+ for ( var i = 0; i < rows.length; i++) {
+ apparatusInfuTypeStore.remove(rows[i]);
+ }
+ }
+}
+
Ext.onReady(function() {
var columns = new Array();
columns.push(
@@ -75,10 +87,10 @@
}
}]
},{
- width :220,
+ width :500,
layout : 'column',
items : [{
- columnWidth : .5,
+ columnWidth : .2,
layout :'form',
items : [{
xtype : 'button',
@@ -90,7 +102,7 @@
}
}]
},{
- columnWidth : .5,
+ columnWidth : .2,
layout :'form',
items : [{
xtype : 'button',
@@ -101,6 +113,18 @@
$Id('tousseName').value = "";
}
}]
+ },{
+ columnWidth : .6,
+ layout :'form',
+ items : [{
+ xtype : 'button',
+ text : '设置统计的器械包品名',
+ minWidth : 50,
+ iconCls : 'icon_set',
+ handler : function() {
+ setapparatusInfuType('器械包库存',top.dirOrgCode,"tousse");
+ }
+ }]
}]
}]
});
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
===================================================================
diff -u -r14961 -r15025
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js (.../setGoodsOption.js) (revision 14961)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js (.../setGoodsOption.js) (revision 15025)
@@ -19,7 +19,7 @@
});
}
-function setapparatusInfuType(model,code){
+function setapparatusInfuType(model,code,type){
var rd = new Ext.data.JsonReader({
fields : [{
name : 'name'
@@ -51,10 +51,20 @@
},
dataIndex:'button'
}]);
-
+
+ var searchUrl = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do';
+ var isHideDisposableGood = false;
+
+ //判断类型
+ if ('tousse' == type){
+ //只是搜索器械包
+ searchUrl = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchComboTousseData.do';
+ isHideDisposableGood = true;
+ }
+
var tousseAndDiposableGoodsStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do',
+ url : searchUrl,
method : 'POST'
}),
reader : new Ext.data.JsonReader({
@@ -158,6 +168,7 @@
}
},{
text : '全部一次性物品',
+ hidden: isHideDisposableGood,
handler:function(){
Ext.Ajax.request({
url : WWWROOT + '/disinfectSystem/diposableGoodsAction!loadDiposablegoods.do',
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
===================================================================
diff -u -r13004 -r15025
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp (.../tousseGoodsStockView.jsp) (revision 13004)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp (.../tousseGoodsStockView.jsp) (revision 15025)
@@ -25,6 +25,8 @@
+
+