![]("+WWWROOT+"/images/web/urgent-white.png)
" + v + "![]("+WWWROOT+"/images/web/urgent-black.png)
" + v + "";
+ }else{
+ cell = "" + v + "";
+ }
+ return cell;
+ //return "" + v + "";
+}
+
function renderColor(v, p, record){
var deliverStatus = record.data['deliverStatus'];
var packageStatus = record.data['packageStatus'];
@@ -130,7 +146,8 @@
Ext.QuickTips.init();
var columns = [
{header : "紧急度",width : 45,dataIndex : 'urgencyNum', renderer : urgencyIconRender1,hidden:true},
- {header : "申请人",width : 50,dataIndex : 'applicant', renderer : modifyRecord},
+ // {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 : 70,dataIndex : 'hospitalNumber'},
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r27731 -r27780
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27731)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27780)
@@ -16,10 +16,13 @@
var phoneNumber; //选择器械包或供应商连带出联系人电话
var contactName; //选择器械包或供应商连带出联系人电话
var oldSupplierName = null; //不是新建记录旧的供应商名称
+var currentRecord;
//外来器械申请单id
var foreignTousseApplicationId;
var orgUnitCodeOperationRoom= null;
var saveOrgUnitCode = null;
+var urgentLevelId;
+var urgentLevelVal;
//外来器械材料种类颜色管理
var washClassifyTypeColor = sstsConfig.washClassifyTypeColorManager || {
'平面类' : 'yellow-row',
@@ -74,25 +77,33 @@
listeners: {
beforeedit: function(editor, context, eOpts){
var record = context.record;
+ currentRecord = record;
var isLeaf = record.get('leaf');
var colIdx = context.colIdx;
if(sstsConfig.foreignTousseAddWeight){
- if(!isLeaf && (colIdx == 4 || colIdx == 5 || colIdx == 7 || colIdx == 8)){//根节点不能编辑
+ if(!isLeaf && (colIdx == 4 || colIdx == 5 || colIdx == 8 || colIdx == 9)){//根节点不能编辑
return false;
- }else if(isLeaf && (colIdx == 1 || colIdx == 6 || colIdx == 9|| colIdx == 10 || colIdx == 11 || colIdx == 3)){
+ }else if(isLeaf && (colIdx == 1 || colIdx == 7 || colIdx == 10|| colIdx == 11 || colIdx == 12 || colIdx == 3)){
return false;
}
}else if(sstsConfig.onlySelectExistedForeignTousse){//外来器械申请单器械包材料名称父节点不允许编辑
- if(!isLeaf && (colIdx == 2 || colIdx == 3 || colIdx == 4 || colIdx == 6 || colIdx == 7)){
+ if(!isLeaf && (colIdx == 2 || colIdx == 3 || colIdx == 4 || colIdx == 7 || colIdx == 8)){
return false;
- }else if(isLeaf && (colIdx == 1 || colIdx == 5 || colIdx == 8|| colIdx == 9 || colIdx == 10)){
+ }else if(isLeaf && (colIdx == 1 || colIdx == 5 || colIdx == 9 || colIdx == 10 || colIdx == 11)){
return false;
}
}else{
- if(!isLeaf && (colIdx == 3 || colIdx == 4 || colIdx == 6 || colIdx == 7)){
+ /* if(!isLeaf && (colIdx == 3 || colIdx == 4 || colIdx == 6 || colIdx == 7)){//父节点不能编辑
return false;
- }else if(isLeaf && (colIdx == 1 || colIdx == 5 || colIdx == 8|| colIdx == 9 || colIdx == 10)){
+ }else if(isLeaf && (colIdx == 1 || colIdx == 5 || colIdx == 8|| colIdx == 9 || colIdx == 10)){//子节点不能编辑
return false;
+ } */
+
+
+ if(!isLeaf && (colIdx == 3 || colIdx == 4 || colIdx == 7 || colIdx == 8)){//父节点不能编辑
+ return false;
+ }else if(isLeaf && (colIdx == 1 || colIdx == 5 || colIdx == 6 || colIdx == 9|| colIdx == 10 || colIdx == 11)){//子节点不能编辑
+ return false;
}
}
},
@@ -132,6 +143,8 @@
{name : 'amount'},
{name : 'includeImplant'},
{name : 'price'},
+ {name : 'urgentLevel'},
+ {name : 'urgentLevelId'},
{name : 'type'},
{name : 'usedAmountOfIncludeImplant'},
{name : 'implantAmountOfUseRecord'},
@@ -509,6 +522,8 @@
supplierName : n.get("supplierName"),
amount : n.get("amount"),
price : n.get("price"),
+ urgentLevel:n.get("urgentLevel"),
+ urgentLevelId:n.get("urgentLevelId"),
packageSize : n.get("packageSize"),
foreignToussePrintAmount : n.get("foreignToussePrintAmount"),
splitNumber : n.get("splitNumber"),
@@ -1014,7 +1029,23 @@
//外来器械申请时是否显示原始包定义（如果为true显示原始，否则显示最近一次申请的）
var isShowForeignTousseAncestorDefinitionForApply = getObjValueFromJs('sstsConfig.isShowForeignTousseAncestorDefinitionForApply',false);
-
+ var urgentLevelStore = new Ext4.data.Store({
+ proxy : {
+ type : 'ajax',
+ url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
+ reader : {
+ type : 'json',
+ root : 'data'
+ }
+ },
+ fields : [
+ {name : 'id',mapping : 'id'},
+ {name : 'urgentLevel',mapping : 'urgentLevel'},
+ {name : 'urgentDefaultValue',mapping : 'urgentDefaultValue'}
+ ]
+ });
+ urgentLevelStore.load();
+
//外来器械包的store
var foreignTousseJsonStore = new Ext4.data.Store({
proxy : {
@@ -1248,6 +1279,24 @@
}
}
},{
+ text: "加急级别:",
+ hidden: !sstsConfig.enableUrgentFunction
+ },{
+ xtype : 'combo',
+ width : 60,
+ id : 'urgentLevel1',
+ name : 'urgentLevel1',
+ store : urgentLevelStore,
+ valueField : 'id',
+ displayField : 'urgentLevel',
+ hidden: !sstsConfig.enableUrgentFunction,
+ minChars : 0,
+ forceSelection : true,
+ lazyInit : true,
+ editable:true,
+ triggerAction : 'all',
+ typeAhead : false
+ },{
xtype:'button',
id : 'addTousseBt',
text: "添加",
@@ -1261,6 +1310,11 @@
tousseDefinitionId = "";
}
var suppler = top.Ext4.getCmp('suppler1').getValue();
+ if(sstsConfig.enableUrgentFunction){
+ var urgentLevel = top.Ext4.getCmp('urgentLevel1').getRawValue();
+ var urgentLevelId = top.Ext4.getCmp('urgentLevel1').getValue();
+ }
+
//保存添加器械信息时带的供应商名称
oldSupplierName =suppler;
if(Ext4.isEmpty(foreignTousseName)){
@@ -1336,6 +1390,8 @@
amount : 1,
includeImplant : '',
price : foreignToussePriceOfSysParams,
+ urgentLevel:urgentLevel,
+ urgentLevelId:urgentLevelId,
type : 'tousse',
usedAmountOfIncludeImplant : 0,
implantAmountOfUseRecord : 0,
@@ -1627,6 +1683,34 @@
}
}
},{
+ header: '加急级别',
+ width : 60,
+ align:'center',
+ sortable: true,
+ dataIndex: 'urgentLevel',
+ hidden:!sstsConfig.enableUrgentFunction,
+ editor: {
+ xtype : 'combo',
+ id : 'urgentLevel',
+ name : 'urgentLevel',
+ valueField : 'urgentLevel',
+ displayField : 'urgentLevel',
+ store : urgentLevelStore,
+ allowBlank: true,
+ forceSelection : true,
+ listeners : {
+ select: function(v,r,p) {
+ currentRecord.set("urgentLevel",r[0].data.urgentLevel);
+ currentRecord.set("urgentLevelId",r[0].data.id);
+ },
+ blur:function(thiz){
+ if(thiz.getValue() == null){
+ currentRecord.set('urgentLevelId',null);
+ }
+ }
+ }
+ }
+ },{
header:'植入物使用数量',
width:100,
align:'center',
@@ -1723,6 +1807,9 @@
dataIndex : 'oldSupplierName',
hidden : true
},{
+ dataIndex : 'urgentLevelId',
+ hidden : true
+ }, {
header: '图片',
width : 80,
align:'center',
@@ -1978,7 +2065,7 @@
title : '基础信息',
collapsible : false,
height : 250,
- width : top.screen.width > 1280 ? 900 : 900,//900
+ width : top.screen.width > 1280 ? 930 : 920,//900
defaultType : 'textfield',
layout : {
type : 'vbox'
@@ -2533,7 +2620,7 @@
border : true,
tbar : forigntousseTbar,
store : foreignTousseStore,
- width : 900,
+ width : 930,
height: 320,
forceFit: true,
listeners : {
@@ -2598,7 +2685,7 @@
// width : 950,
height : 650,
// height : top.screen.height > 1000 ? 600 : 500,
- width : top.screen.width > 1280 ? 950 : 930,
+ width : top.screen.width > 1280 ? 960 : 950,
resizable :false,
modal : true,
border : false,
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r27705 -r27780
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27705)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27780)
@@ -850,9 +850,12 @@
var urgentAmountColor = "";
if(sstsConfig.enableUrgentFunction){
if(record.get("leaf")){//子级
- var colorCode = record.get("urgentLevelObj").colorCode;
- if(colorCode != ""){//有加急的
- urgentAmountColor = "" + v + "
"; + var urgentLevelObj = record.get("urgentLevelObj"); + if(urgentLevelObj != null){ + var colorCode = record.get("urgentLevelObj").colorCode; + if(colorCode != ""){//有加急的 + urgentAmountColor = "" + v + "
"; + } } }else{//父级 var parentColor = record.get("colorCode"); @@ -876,10 +879,14 @@ var urgentLevel = ""; if(sstsConfig.enableUrgentFunction){ if(record.get("leaf")){//子级 - var colorCode = record.get("urgentLevelObj").colorCode; - if(colorCode != ""){ - urgentLevel = "" +v + "
"; + var urgentLevelObj = record.get("urgentLevelObj"); + if(urgentLevelObj != null){ + var colorCode = record.get("urgentLevelObj").colorCode; + if(colorCode != ""){ + urgentLevel = "" +v + "
"; + } } + }else{//父级 var parentColor = record.get("colorCode"); urgentLevel = "" +v + "
"; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r27686 -r27780 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27686) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27780) @@ -1832,7 +1832,17 @@ if(type==customTousseApplicationForm) {//自定义器械包申请单 cell = "" + v + ""; } else if (type==foreignTousseApplicationForm){//外来器械包申请单 - cell = "" + v + ""; + if(sstsConfig.enableUrgentFunction && record.json.urgentLevel != "" ){//有背景色，白色图标加急级别 + var colorCode = record.json.urgentLevel.colorCode; + cell = ""; + }else if(sstsConfig.enableUrgentFunction && record.json.urgent =="是" && record.json.urgentLevel == ""){//无背景色,只有黑色加急图标 + cell = "" + v + "";
+ }else{
+ cell = "" + v + "";
+ }
+
+
+ //cell = "" + v + "";
} else if(type == tousseLeaseApplicationForm){//借物单
cell = "" + v + "";
} else if(type == foreignPorxyApplicationForm){//外部代理灭菌单