Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r19168 -r19361
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 19168)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 19361)
@@ -1434,8 +1434,6 @@
leftTemplateStore.setRootNode({'expanded':false,'children':[]});
rightTemplateStore.setRootNode({'expanded':false,'children':[]});
-// leftTemplateStore.removeAll();
-// rightTemplateStore.removeAll();
if(id == 0){
id = "";
@@ -1451,25 +1449,14 @@
//打印预览按钮的json
var printViewButtonJson = {
text : '打印预览',
- hidden:(id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods))/*,
- handler:function(){
- applicationPrintBtnPressed(1, id);
- }*/
+ hidden:(id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods))
};
//打印按钮的json
var printButtonJson = {
xtype:'button',
text : '打印',
- hidden:(id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods))/*,
- handler:function(){
- top.Ext4.MessageBox.confirm("请确认", "要打印本申请单吗？",
- function(btn) {
- if (btn == 'yes') {
- applicationPrintBtnPressed(0, id);
- }
- });
- }*/
+ hidden:(id == "" || (SSTS_PrintApplicationGoods && SSTS_DepartPrintApplicationGoods))
};
if(applicationPrintButtonConfigJsonArray && applicationPrintButtonConfigJsonArray.length > 0){
@@ -2782,7 +2769,6 @@
id : 'tousseTreeGrid',
store : leftTemplateStore,
width : (type == comboApplicationForm && !sstsConfig.hideDisposablePriceColumn) ? configWinWidth/2 - 100 : configWinWidth/2 - 50,
- // width : (type == comboApplicationForm && !sstsConfig.hideDisposablePriceColumn) ? 440 : 499,
height : configWinHeight - 200,
flex : 1,
tbar:[{
@@ -2879,16 +2865,11 @@
id : 'diposableTreeGrid',
columns : tousseColumnArr2,
width : (type == comboApplicationForm && !sstsConfig.hideDisposablePriceColumn) ? configWinWidth/2 + 60 : configWinWidth/2 + 10,
- // width : (type == comboApplicationForm && !sstsConfig.hideDisposablePriceColumn) ? 558 : 499,
flex : 1,
height : configWinHeight - 200,
store : rightTemplateStore,
listeners : {
- itemmouseenter: function (_this, record, item, index, e, eOpts) {
- // var tousseDefinitionID = record.get('tousseDefinitionID');
- // var tousseType = record.get('tousseType');
- // popGoodTips(tousseDefinitionID + tousseType, item, record);
- }
+ itemmouseenter: function (_this, record, item, index, e, eOpts) {}
},
tbar : [{
text:"数量:"
@@ -2905,12 +2886,6 @@
listeners : {
specialkey : function(field, ee) {
if (ee.getKey() == Ext.EventObject.ENTER) {
- // if(Ext.isEmpty(field.getValue())||field.getValue()<=0){
- // showResult("申请数量必须大于0");
- // field.focus();
- // return false;
- // }
-
if (checkAdd()){
return;
}
@@ -3123,8 +3098,6 @@
}
});
}
-
- //处理科室
}
function getApplyItemsInfo(treeStore, tousseInstanceInfos, tousseNames){
@@ -3801,7 +3774,7 @@
}
/**
- * 创建操作的工具栏
+ * 创建操作的工具栏.
* @param isSupplyRoomUser 是否供应室用户
* @returns {[*,*,*,*,*]}
*/
@@ -4134,9 +4107,6 @@
//将生成的html用对应的id缓存到页面,减少请求服务器次数
tipManager[cacheId] = tipTable;
}
- // target.parentNode.parentNode.setAttribute('data-qtip', tipTable);
- // target.parentNode.parentNode.setAttribute('data-qwidth', 450);
- // target.parentNode.parentNode.setAttribute('data-qtitle', title);
});
}
@@ -4385,11 +4355,6 @@
tooltip : '申请物品',
hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 1,
handler : function() {
- //新打开申请对话框时,相关参数调整及清除
- /* handleDepartStore.proxy.extraParams.applyDepartCode = "";
- handleDepartStore.proxy.extraParams.tousseType = "";
- comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
- comboApplication(0, "true",false,false,true,comboApplicationForm, false);*/
formPrinted = 1;
openApplication("",comboApplicationForm);
}
@@ -4422,7 +4387,6 @@
handler : function() {
formPrinted = 1;
openApplication(invoicePlanForTousseType_Tousse, disinfectGoodsApplicationForm);
- // addAndEditUntracableTousse('',0,"01",function(){});
}
},{
text : '申请外来器械',
@@ -4463,14 +4427,12 @@
// 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2和版本3)
if ((recyclingApplicationVersion == 2 || recyclingApplicationVersion == 3) && listType != 'all'){
- // if (recyclingApplicationVersion == 2 && listType != 'all'){
document.getElementById("parm_s_status").value = 'unFinish';
}
//如果不是用版本2且不是版本3或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
if ((recyclingApplicationVersion != 2 && recyclingApplicationVersion != 3) || listType == 'all' || isCssdUser == "true"){
- // if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
grid = new Ext.ux.ForgonPageGrid({
title : entityName + '单列表',
id : 'applyGrid',
@@ -4570,13 +4532,6 @@
e.getTarget().setAttribute('data-qtip', tableContent);
e.getTarget().setAttribute('data-qwidth', 450);
e.getTarget().setAttribute('data-qtitle', ' 申请物品列表:');
- // var maxWidth = grid.getInnerWidth();
-// var maxHeight = grid.getInnerHeight();
-// var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
- //var align = e.xy[1] > maxHeight / 2 ? 'bl-tr' : 'tl-tr';
- // rowEl.set({'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 申请物品列表:'},false);
- /*grid.tip.show();
- grid.tip.body.dom.innerHTML = tableContent;*/
}
});
@@ -4590,42 +4545,4 @@
}]
});
}
-
-
-
- /*var view = grid.getView(); // Capture the GridView.
- grid.tip = new Ext.ToolTip({
- title:'申请物品列表',
- target: view.mainBody, // The overall target element.
- view:view,
- delegate: '.x-grid3-row', // Each grid row causes its own seperate show and hide.
- trackMouse: true, // Moving within the row should not hide the tip.
- renderTo: document.body, // Render immediately so that tip.body can be referenced prior to the first show.
- autoHide:true,//自动隐藏
- //mouseOffSet:[10,10],//从鼠标位置开始偏移(X/Y)
-
- anchor:'bottom',//top,right,bottom,left
-
- anchorToTarget:false,//false时，用anchor对齐，true时，用defaultAlign(默认值: "tl-bl?")对齐
-
- defaultAlign:'l-r?',
-
- anchorOffset:10,//anchor的值是top或bottom时，anchor arrow水平偏移；anchor值是left或right时，nchor arrow竖直偏移
-
- listeners: { // Change content dynamically depending on which element triggered the show.
- beforeshow: function updateTipBody(tip) {
- var rowIndex = tip.view.findRowIndex(tip.triggerElement);
- if(!Ext.isEmpty(tableContent)){
- tip.body.dom.innerHTML = tableContent;
- }else{
- return false; //停止执行，从而禁止显示Tip
- tip.destroy();
- }
- }
- }
- });*/
-
-
-
-
});