Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r34875 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 34875)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 35334)
@@ -888,6 +888,11 @@
{ header: operatorColumnHeader, width: 60, dataIndex: 'operator', hidden: existsObjInArray(operatorColumnHeader, hiddenColumnsOfUseRecordListView) },
{ header: departColumnHeader, width: 80, dataIndex: 'depart', hidden: existsObjInArray(departColumnHeader, hiddenColumnsOfUseRecordListView) },
{ header: departNameOfpatientColumnHeader, width: 150, dataIndex: 'departNameOfpatient', sortable: false },
+ { header: '特殊感染类型', width: 120, dataIndex: 'specialInfectionJson', sortable: false,renderer:function(v, p, rec){
+ if(rec.data.specialInfectionJson){
+ return ""+rec.data.specialInfectionJson.name+"
";
+ }
+ } },
{
header: enteringDateColumnHeader, width: 120, dataIndex: 'enteringDate', hidden: existsObjInArray(enteringDateColumnHeader, hiddenColumnsOfUseRecordListView), renderer: function (v, p, rec) {
//DGSETYY-13:增加使用到回收超时提醒
@@ -943,6 +948,7 @@
{ name: 'recyclingStatus' },
{ name: 'priorConvertStatus' },
{ name: 'depart' },
+ { name: 'specialInfectionJson' },
{ name: 'operator' },
{ name: 'enteringDate' },
{ name: 'applicationTime' },
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r34108 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 34108)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 35334)
@@ -2073,7 +2073,6 @@
allowBlank : true,
readOnly : true,
hidden:true,
- fieldCls : 'fieldReadOnlyNoRemoveAndTop',
anchor: '96%'
}]
},{ // 申请科室、结算科室、处理的供应室、还有一个显示修改记录按钮
@@ -2636,9 +2635,13 @@
}
var specialInfection = recyclingApplication.specialInfection || '';
+ console.log(recyclingApplication)
if(specialInfection !== ''){
top.Ext4.getCmp("specialInfection").setValue(specialInfection);
top.Ext4.getCmp('specialInfection').show();
+ if(recyclingApplication.specialInfectionJson){
+ top.Ext4.getCmp('specialInfection').el.dom.querySelectorAll("input")[0].style.background = recyclingApplication.specialInfectionJson.colorCode;
+ }
}
/*appDepartJsonStore.load({
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r35317 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 35317)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 35334)
@@ -6497,7 +6497,11 @@
$("#useRecordId").val(application.useRecordId);
}
var specialInfection = application.specialInfection || '';
+ var specialInfectionColorCode = application.specialInfectionColorCode || '';
if (specialInfection !== '') {
+ if(specialInfectionColorCode !== ''){
+ $('#specialInfectionText').css('background',specialInfectionColorCode);
+ }
$('#specialInfectionText').text(specialInfection);
$('#specialInfection').show();
}
@@ -7084,7 +7088,11 @@
$("#remarkText").text($("#remarkText").text() + (application.remark == null ? "" : application.remark));
addApplicantToRemark(application);
var specialInfection = application.specialInfection || '';
+ var specialInfectionColorCode = application.specialInfectionColorCode || '';
if (specialInfection !== '') {
+ if(specialInfectionColorCode !== ''){
+ $('#specialInfectionText').css('background',specialInfectionColorCode);
+ }
$('#specialInfectionText').text(specialInfection);
$('#specialInfection').show();
}
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r35299 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 35299)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 35334)
@@ -1953,7 +1953,12 @@
var specialInfection = record.get('specialInfection') || '';
var warningImg = '';
if(specialInfection !== ''){
- warningImg = "![]("+WWWROOT+"/images/web/warning.png)
";
+ var item = record.get('specialInfectionJson');
+ if(item){
+ warningImg = "!
";
+ }else {
+ warningImg = "";
+ }
}
if(type==customTousseApplicationForm) {//自定义器械包申请单
cell = warningImg + "" + v + "";
@@ -3933,6 +3938,7 @@
{name : 'serialNumber'},
{name : 'applicant'},
{name : 'specialInfection'},
+ {name : 'specialInfectionJson'},
{name : 'applicationTime'},
{name : 'submitTime'},
{name : 'printTime'},
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r35104 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 35104)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 35334)
@@ -120,6 +120,35 @@
#tops {
margin-bottom: 0 !important;
}
+.border {
+ width: 0;
+ height: 0;
+ border-style: solid;
+ border-width: 0 12px 20px;
+ border-color: transparent transparent #d9534f;
+ position: relative;
+ float: left;
+}
+
+.border:after {
+ content: '';
+ border-style: solid;
+ border-width: 0 8px 15px;
+ border-color: transparent transparent #fff;
+ position: absolute;
+ top: 3px;
+ left: -8px;
+}
+
+.border span {
+ position: absolute;
+ left: -3px;
+ top: 6px;
+ font-size: 12px;
+ z-index: 1000;
+ color: #d9534f;
+ font-weight: bold;
+}
<%@ include file="/common/include_Ext2_Css.jsp"%>
<%@ include file="/common/include_Ext2_Js.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.jsp (revision 35334)
@@ -0,0 +1,33 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+
+
+特殊感染类型设置
+
+
+
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<%@ include file="/disinfectsystem/print/print.jsp"%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionForm.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionForm.js (revision 35334)
@@ -0,0 +1,334 @@
+var configWin;
+
+function saveConfig() {
+ var name = top.Ext4.getCmp('name').getValue();
+ var enable = top.Ext4.getCmp('enable').getValue();
+ var barcode = top.Ext4.getCmp('barcode').getValue();
+ var colorCode = top.Ext4.getCmp('colorCode').getValue();
+ var colorName = top.Ext4.getCmp('colorName').getValue();
+ var id = top.Ext4.getCmp('id').getValue();
+
+ var params = {
+ name: name,
+ enable: enable,
+ colorCode: colorCode,
+ colorName: colorName,
+ barcode: barcode,
+ isCheckColor: false,
+ id: id
+ }
+ top.Ext4.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!saveSpecialInfection.do',
+ params: params,
+ success: function (response, options) {
+ var result = Ext4.decode(response.responseText);
+ if (result.success) {
+ showResult('保存成功');
+ listStore.loadPage(1);
+ configWin.close();
+ } else {
+ showResult(result.message);
+ }
+ },
+ failure: function (response, options) {
+ showResult('保存失败!');
+ }
+ });
+}
+
+function deleteConfig(ids) {
+ top.Ext4.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!deleteSpecialInfection.do',
+ params: {
+ ids: ids
+ },
+ success: function (response, options) {
+ var result = Ext4.decode(response.responseText);
+ if (result.success) {
+ showResult('删除成功');
+ listStore.loadPage(1);
+ } else {
+ showResult(result.message);
+ }
+ },
+ failure: function (response, options) {
+ showResult('删除失败!');
+ }
+ });
+}
+
+function showAddOrUpdateSpecialInfectionWin(record) {
+ var id = '';
+ var name = '';
+ var enable = '是';
+ var barcode = '';
+ var colorCode = '';
+ var colorName = '';
+
+ var colorStore = new Ext4.data.SimpleStore({
+ fields: [
+ { name: 'text', mapping: 'text' },
+ { name: 'value', mapping: 'value' }
+ ],
+ data: [{
+ text: "红
",
+ value: "红,#FF0000"
+ }, {
+ text: "橙红
",
+ value: "橙红,#FF3300"
+ }, {
+ text: "橙
",
+ value: "橙,#FF6600"
+ }, {
+ text: "橙黄
",
+ value: "橙黄,#FF9900"
+ }, {
+ text: "黄
",
+ value: "黄,#FFFF00"
+ }, {
+ text: "黄绿
",
+ value: "黄绿,#99FF00"
+ }, {
+ text: "绿
",
+ value: "绿,#00FF00"
+ }, {
+ text: "蓝绿
",
+ value: "蓝绿,#00FFFF"
+ }, {
+ text: "蓝
",
+ value: "蓝,#0000FF"
+ }, {
+ text: "蓝紫
",
+ value: "蓝紫,#6600FF"
+ }, {
+ text: "紫
",
+ value: "紫,#FF00FF"
+ }, {
+ text: "紫红
",
+ value: "紫红,#FF0066"
+ }]
+ })
+
+ formPanel = new top.Ext4.form.Panel({
+ id: 'configForm',
+ frame: true,
+ labelSeparator: ':',
+ bodyStyle: 'padding:5px 5px 0px 5px;',
+ width: 600,
+ fieldDefaults: {
+ labelAlign: 'right',
+ labelWidth: 100
+ },
+ buttonAlign: 'center',
+ items: [{
+ xtype: 'hidden',
+ id: 'id',
+ name: 'id',
+ value: id || ''
+ }, {
+ layout: 'column',
+ items: [{
+ columnWidth: 0.48,
+ layout: 'form',
+ border: 0,
+ style: 'margin-bottom:10px;margin-right: 15px;',
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: '名称',
+ id: 'name',
+ name: 'name',
+ allowBlank: false,
+ anchor: '100%',
+ value: name
+ }]
+ }, {
+ columnWidth: 0.48,
+ layout: 'form',
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'combo',
+ fieldLabel: "是否启用",
+ valueField: 'value',
+ displayField: 'value',
+ store: new Ext4.data.SimpleStore({
+ fields: ['value'],
+ data: [['是'], ['否']]
+ }),
+ allowBlank: false,
+ editable: false,
+ value: enable,
+ triggerAction: 'all',
+ mode: 'local',
+ name: "enable",
+ id: "enable",
+ anchor: '95%'
+ }]
+ }, {
+ columnWidth: 0.48,
+ layout: 'form',
+ border: 0,
+ style: 'margin-bottom:10px;margin-right: 15px;',
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: '条形码',
+ id: 'barcode',
+ name: 'barcode',
+ disabled: true,
+ allowBlank: true,
+ value: barcode,
+ anchor: '100%'
+ }]
+ }, {
+ columnWidth: 0.48,
+ layout: 'form',
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'hidden',
+ id: 'colorCode',
+ name: 'colorCode',
+ value: colorCode
+ }, {
+ xtype: 'combo',
+ fieldLabel: "感染类型名称",
+ id: 'colorName',
+ name: 'colorName',
+ minChars: 0,
+ valueField: 'value',
+ displayField: 'text',
+ value: '',
+ mode: 'local',
+ store: colorStore,
+ forceSelection: true,
+ lazyInit: false,
+ triggerAction: 'all',
+ hideTrigger: false,
+ typeAhead: false,
+ selectOnFocus: true,
+ allowBlank: false,
+ editable: false,
+ width: 180,
+ value: colorName,
+ listeners: {
+ 'select': function (combo, records, eOpts) {
+ var value = combo.getValue();
+ var colorName = value.split(",")[0];
+ var colorCode = value.split(",")[1];
+ top.Ext4.getCmp('colorCode').setValue(colorCode);
+ combo.setRawValue(colorName);
+ var bkcolor = "";
+ var tempColorValue = colorName;
+ if (tempColorValue == "红") {
+ bkcolor = "#ff0000";
+ } else if (tempColorValue == "橙红") {
+ bkcolor = "#ff3300";
+ } else if (tempColorValue == "橙") {
+ bkcolor = "#ff6600";
+ } else if (tempColorValue == "橙黄") {
+ bkcolor = "#ff9900";
+ } else if (tempColorValue == "黄") {
+ bkcolor = "#ffff00";
+ } else if (tempColorValue == "黄绿") {
+ bkcolor = "#99ff00";
+ } else if (tempColorValue == "绿") {
+ bkcolor = "#00ff00";
+ } else if (tempColorValue == "蓝绿") {
+ bkcolor = "#00ffff";
+ } else if (tempColorValue == "蓝") {
+ bkcolor = "#0000ff";
+ } else if (tempColorValue == "蓝紫") {
+ bkcolor = "#6600ff";
+ } else if (tempColorValue == "紫") {
+ bkcolor = "#ff00ff";
+ } else if (tempColorValue == "紫红") {
+ bkcolor = "#ff0066";
+ }
+ combo.el.dom.querySelectorAll("input")[0].style.background = bkcolor;
+ },
+ 'blur': function (combo) {
+ if (combo.getValue() !== '' && combo.getValue() !== null) {
+ var colorName = combo.getValue().split(",")[0];
+ combo.setRawValue(colorName);
+ }
+ return false;
+ }
+ }
+ }]
+ }]
+ }],
+ buttons: [{
+ id: 'saveBtn',
+ text: '保存',
+ handler: function () {
+ if (formPanel.getForm().isValid()) {
+ var colorCode = top.Ext4.getCmp('colorCode').getValue();
+ var id = top.Ext4.getCmp('id').getValue();
+ var msg = '';
+ if (listStore.getCount() > 0) {
+ for (var i = 0; i < listStore.getCount(); i++) {
+ var item = listStore.getAt(i);
+ if (id == '') {
+ if (colorCode == item.data.colorCode) {
+ msg = '当前选择的颜色已经存在，是否继续？';
+ break;
+ }
+ } else {
+ if (colorCode == item.data.colorCode && parseInt(id) !== item.data.id) {
+ msg = '当前选择的颜色已经存在，是否继续？';
+ break;
+ }
+ }
+ }
+ }
+ if (msg == '') {
+ saveConfig();
+ } else {
+ top.Ext4.MessageBox.confirm("请确认", msg, function (btn) {
+ if (btn == 'yes') {
+ saveConfig();
+ }
+ })
+ }
+ } else {
+ showResult('请填写表单！');
+ return false;
+ }
+ }
+ }, {
+ text: '取消',
+ handler: function () {
+ configWin.close();
+ }
+ }]
+ });
+
+ configWin = new top.Ext4.window.Window({
+ id: 'configWin',
+ layout: 'border',
+ title: '特殊感染类型信息',
+ width: 600,
+ height: 170,
+ border: false,
+ plain: true,
+ modal: true,
+ items: [{
+ region: 'center',
+ width: 400,
+ layout: 'fit',
+ items: [formPanel]
+ }]
+ });
+
+ configWin.show();
+
+ if (record) {
+ top.Ext4.getCmp('id').setValue(record.data.id);
+ top.Ext4.getCmp('name').setValue(record.data.name);
+ top.Ext4.getCmp('enable').setValue(record.data.enable);
+ top.Ext4.getCmp('barcode').setValue(record.data.barcode);
+ top.Ext4.getCmp('colorCode').setValue(record.data.colorCode);
+ top.Ext4.getCmp('colorName').setRawValue(record.data.colorName);
+ top.Ext4.getCmp('colorName').el.dom.querySelectorAll("input")[0].style.background = record.data.colorCode;
+ }
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/specialInfection/specialInfectionView.js (revision 35334)
@@ -0,0 +1,175 @@
+var listStore;
+var grid;
+
+function bgColorRenderer(v, p, record) {
+ return "";
+}
+
+function moveSequence(id, type) {
+ top.Ext4.MessageBox.wait('请稍候……', '请等待');
+ var orderType = '';
+ if (type == 0) {//top
+ orderType = 'top';
+ } else if (type == 1) {//up
+ orderType = 'up';
+ } else if (type == 2) {//down
+ orderType = 'down';
+ } else if (type == 3) {//bottom
+ orderType = 'bottom';
+ }
+ Ext4.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!sortSpecialInfection.do',
+ params: {
+ id: id,
+ orderType: orderType
+ },
+ success: function (response, options) {
+ var result = Ext4.decode(response.responseText);
+ if (result.success) {
+ showResult('已重新排序');
+ listStore.loadPage(1);
+ } else {
+ showResult(result.message);
+ }
+ hideMessageBox4(true);
+ },
+ failure: function (response, options) {
+ showResult('排序失败!');
+ }
+ });
+}
+
+Ext4.onReady(function () {
+ Ext4.QuickTips.init();
+ var pageSize = 99;
+
+ var columns = [
+ { header: "名称", dataIndex: 'name', width: 150, sortable: false },
+ { header: "是否启用", dataIndex: 'enable', width: 150, sortable: false },
+ { header: "条形码", dataIndex: 'barcode', width: 150, sortable: false },
+ { header: "序号", dataIndex: 'sequence', width: 150, sortable: false },
+ { header: "感染类型颜色", dataIndex: 'colorCode', width: 150, sortable: false, renderer: bgColorRenderer },
+ {
+ header: "操作", dataIndex: 'depart', id: 'depart', width: 150, sortable: false,
+ renderer: function (v, p, record) {
+ var id = record.data.id;
+ var str = "![](" + WWWROOT + "/images/web/tango-icon-go-top.png)
"
+ + "![](" + WWWROOT + "/images/web/tango-icon-go-up.png)
"
+ + "![](" + WWWROOT + "/images/web/tango-icon-go-down.png)
"
+ + "![](" + WWWROOT + "/images/web/tango-icon-go-bottom.png)
";
+ return str;
+ }
+ }
+ ];
+
+ listStore = Ext4.create('Ext.data.Store', {
+ pageSize: pageSize,
+ proxy: {
+ type: 'ajax',
+ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!findSpecialInfectionTableList.do',
+ reader: {
+ root: 'data',
+ totalProperty: 'totalCount'
+ },
+ actionMethods: {
+ read: 'POST'
+ }
+ },
+ sorters: [{ property: "sequence", direction: "ASC" }],
+ fields: [
+ { name: 'id' },
+ { name: 'name' },
+ { name: 'enable' },
+ { name: 'barcode' },
+ { name: 'colorCode' },
+ { name: 'colorName' },
+ { name: 'sequence' }
+ ],
+ autoLoad: true
+ });
+
+ var tbar = [{
+ text: '添加',
+ iconCls: 'btn_ext_application_add',
+ handler: function () {
+ showAddOrUpdateSpecialInfectionWin();
+ }
+ }, '-', {
+ text: '修改',
+ iconCls: 'btn_ext_application_edit',
+ handler: function () {
+ var selectedRecords = grid.getSelectionModel().getSelection();
+ var selectedCount = grid.getSelectionModel().getCount();
+ if (selectedCount < 1) {
+ showResult("请选择要修改的数据");
+ } else if (selectedCount > 1) {
+ showResult("只能修改一条数据");
+ } else {
+ showAddOrUpdateSpecialInfectionWin(selectedRecords[0]);
+ }
+ }
+ }, '-', {
+ text: '删除',
+ iconCls: 'btn_ext_application_del',
+ handler: function () {
+ var selectedRecords = grid.getSelectionModel().getSelection();
+ var selectedCount = grid.getSelectionModel().getCount();
+ if (selectedCount < 1) {
+ showResult("请选择要修改的数据");
+ } else {
+ top.Ext4.MessageBox.confirm("请确认", '是否删除数据？', function (btn) {
+ if (btn == 'yes') {
+ var ids = [];
+ for (var i = 0; i < selectedRecords.length; i++) {
+ ids[i] = selectedRecords[i].data.id;
+ }
+ deleteConfig(ids.join(';'));
+ }
+ })
+ }
+ }
+ }, '-', {
+ text: '打印标签',
+ iconCls: 'icon_print',
+ handler: function () {
+ var selectedRecords = grid.getSelectionModel().getSelection();
+ var selectedCount = grid.getSelectionModel().getCount();
+ if (selectedCount < 1) {
+ showResult("请选择要打印的数据");
+ } else {
+ top.Ext4.MessageBox.confirm("请确认", '是否打印数据？', function (btn) {
+ if (btn == 'yes') {
+ var ids = [];
+ for (var i = 0; i < selectedRecords.length; i++) {
+ var barcode = selectedRecords[i].data.barcode;
+ var name = selectedRecords[i].data.name;
+ print_commonFun(barcode, name, '', 'print', '特殊感染类型');
+ }
+ }
+ })
+ }
+ }
+ }]
+
+ grid = new Ext4.grid.GridPanel({
+ title: '',
+ columns: columns,
+ frame: false,
+ autoScroll: false,
+ store: listStore,
+ viewConfig: {
+ autoFill: true
+ },
+ tbar: tbar,
+ selModel: new Ext4.selection.CheckboxModel()
+ });
+
+ new Ext4.container.Viewport({
+ layout: 'border',
+ items: [{
+ region: 'center',
+ layout: 'fit',
+ items: [grid]
+ }]
+ });
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/ext-4.2.3/resources/common.css
===================================================================
diff -u -r33980 -r35334
--- ssts-web/src/main/webapp/ext-4.2.3/resources/common.css (.../common.css) (revision 33980)
+++ ssts-web/src/main/webapp/ext-4.2.3/resources/common.css (.../common.css) (revision 35334)
@@ -24,6 +24,6 @@
}
/*DGSETYY-39：特殊感染类型颜色*/
-#specialInfection label , #specialInfection input {
+#specialInfection label {
color: red !important;
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r34802 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 34802)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 35334)
@@ -183,7 +183,6 @@
if (status == '未确认') {
trColor = 'bgcolor="#FF8C69"';
}
-
if (result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) {
trColor = 'bgcolor="yellow"';
}
@@ -713,14 +712,19 @@
// color = '#ffa500';
// }
var specialInfection = msg[i].specialInfection || '';
+ var specialInfectionColorCode = msg[i].specialInfectionColorCode || '';
if (sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList) {
var arr = sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList;
var tbodyHtml = '';
for (var k = 0; k < arr.length; k++) {
if (arr[k] == '科室') {
tbodyHtml += '';
if (specialInfection !== '') {
- tbodyHtml += ' ';
+ if(specialInfectionColorCode !== ''){
+ tbodyHtml += "! ";
+ }else {
+ tbodyHtml += '';
+ }
}
tbodyHtml += ' ';
tbodyHtml += ' ';
@@ -752,7 +756,11 @@
} else {
var html = '';
if (specialInfection !== '') {
- html = '';
+ if(specialInfectionColorCode !== ''){
+ html = "! ";
+ }else {
+ html = '';
+ }
}
var tbodyHtml = ' |
';
tbodyHtml += '| ' + html + '' + defaultString(departName) + ' | ';
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r35242 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35242)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 35334)
@@ -1017,6 +1017,9 @@
if (patientInfo.specialInfection) {
top.Ext.getCmp('specialInfection').setValue(patientInfo.specialInfection);
}
+ if(patientInfo.specialInfectionJson){
+ top.Ext.getCmp('specialInfectionID').setValue(patientInfo.specialInfectionJson.id || '');
+ }
if (patientInfo.opRoomId) {
top.Ext.getCmp('operationRoom').setValue(patientInfo.opRoomId);
}
@@ -1162,6 +1165,7 @@
if (specialInfection == ' ') {
specialInfection = '';
top.Ext.getCmp('specialInfection').setValue('');
+ top.Ext.getCmp('specialInfectionID').setValue('');
}
//如果不为科室使用记录时
if (!fromDepartmentUseRecord) {
@@ -2224,6 +2228,51 @@
)
});
+ //特殊感染类型
+ var specialInfectionStore = new Ext.data.Store({
+ proxy: new Ext.data.HttpProxy({
+ url: WWWROOT + '/disinfectSystem/baseData/specialInfectionAction!loadEnableSpecialInfectionList.do',
+ method: 'POST'
+ }),
+ reader: new Ext.data.JsonReader({
+ totalProperty: 'totalCount',
+ root: 'data'
+ }, [
+ { name: 'id' },
+ { name: 'name' },
+ { name: 'displayName' },
+ { name: 'colorCode' }
+ ]),
+ listeners: {
+ load: function (thiz, records, options) {
+ specialInfectionStore.removeAll();
+ if (records && records.length > 0) {
+ var specialInfectionRecord = Ext.data.Record.create([
+ { name: 'id' },
+ { name: 'name' },
+ { name: 'displayName' },
+ { name: 'colorCode' }
+ ]);
+ specialInfectionStore.add(new specialInfectionRecord({
+ 'id': '',
+ 'name': '',
+ 'colorCode':'',
+ 'displayName': " "
+ }));
+ for (var i = records.length-1; i >=0; i--) {
+ var recordItem = records[i].data;
+ specialInfectionStore.add(new specialInfectionRecord({
+ 'id': recordItem.id,
+ 'name': recordItem.name,
+ 'colorCode':recordItem.colorCode,
+ 'displayName': ""+recordItem.name+"
"
+ }));
+ }
+ }
+ }
+ }
+ });
+
var tousseCm = new top.Ext.grid.ColumnModel([sm,
{ id: 'id', dataIndex: 'id', hidden: true },
{ header: "条码", dataIndex: 'barcode', width: 60, menuDisabled: true, renderer: renderTousseInstanceInfoShowFun },
@@ -3094,34 +3143,39 @@
columnWidth: .33,
hidden: fromDepartmentUseRecord,
items: [{
+ xtype:'hidden',
+ id:'specialInfectionID',
+ name:'specialInfectionID'
+ },{
xtype: 'combo',
fieldLabel: specialInfectionName,
- valueField: 'specialInfection',
- displayField: 'specialInfection',
- id: 'specialInfection',
- name: 'specialInfection',
- mode: 'local',
- listWidth: '200',
- triggerAction: 'all',
+ minChars: 0,
+ valueField: 'name',
+ displayField: 'displayName',
+ store: specialInfectionStore,
forceSelection: true,
- editable: false,
+ lazyInit: true,
+ triggerAction: 'all',
+ hideTrigger: false,
+ typeAhead: false,
allowBlank: specialInfectionAllowBlank,
- store: new Ext.data.SimpleStore({
- fields: ['specialInfection'],
- autoLoad: false,
- data: specialInfectionList,
- listeners: {
- load: function (thiz, records, options) {
- if (thiz.getCount() > 1) {
- var specialInfectionRecord = top.Ext.data.Record.create([
- { name: 'specialInfection' }
- ]);
- thiz.insert(0, new specialInfectionRecord({ specialInfection: ' ' }));
- }
- }
+ editable: false,
+ id: 'specialInfection',
+ name: 'specialInfection',
+ anchor: '98%',
+ listeners: {
+ 'select': function (combo, records, eOpts) {
+ var colorCode = records.data.colorCode;
+ var name = records.data.name;
+ var id = records.data.id;
+ top.Ext.getCmp('specialInfectionID').setValue(id);
+ combo.setRawValue(name);
+ combo.el.dom.style.background = colorCode;
+ },
+ 'blur': function (combo) {
+ return false;
}
- }),
- anchor: '96%'
+ }
}]
}, {
layout: 'form',
@@ -3502,6 +3556,13 @@
setOriginalFormParams(form, ['id', 'washHandNurse', 'circuitNurse', 'operationRoom', 'treatmentNum',
'hospitalNum', 'patientName', 'patientAge', 'patientSex', 'roomNumber',
'bedNumber', 'patientIDCard', 'doctorName', 'surgeon', 'operationName', 'specialInfection', 'remark', 'departCodeOfpatient']);
+
+ if(action.result.data.specialInfectionJson){
+ top.Ext.getCmp('specialInfectionID').setValue(action.result.data.specialInfectionJson.id || '');
+ if(action.result.data.specialInfectionJson.colorCode){
+ top.Ext.getCmp('specialInfection').el.dom.style.background = action.result.data.specialInfectionJson.colorCode;
+ }
+ }
},
failure: function (form, action) {
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r35050 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 35050)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp (.../useRecordView.jsp) (revision 35334)
@@ -21,19 +21,8 @@
request.setAttribute("currentOrgUnitName",currentOrgUnitName);
request.setAttribute("currentOrgUnitCode",currentOrgUnitCode);
- //拿特殊感染类型数据
- HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager");
- List specialInfectionList = httpOptionManager.getHttpOptionTextById("specialInfection");
- String tem = "[";
- if(specialInfectionList!=null && specialInfectionList.size() !=0){
- for(String specialInfection : specialInfectionList){
- tem += "['"+specialInfection+"'],";
- }
- tem = tem.substring(0, tem.length()-1);
- }
- tem += "]";
- request.setAttribute("specialInfectionList", tem);
+ HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager");
List patientAreaList = httpOptionManager.getHttpOptionTextById("patientArea");
String tem2 = "[";
if(patientAreaList!=null && patientAreaList.size() !=0){
@@ -144,7 +133,6 @@
var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>';
//视频类型(申请采集视频)
var videoTypeApplication = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>';
-var specialInfectionList = ${specialInfectionList};
var patientAreaList = ${patientAreaList};
//1.使用记录(病人使用记录)相关的操作权限
var SSTS_UseRecord_Create = true;
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r35140 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 35140)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 35334)
@@ -463,7 +463,7 @@
.add-form .specialInfection {
width:500px;
height:30px;
- top: 180px;
+ bottom: 10px;
left: 25px;
display: none;
}
@@ -644,7 +644,7 @@
- 特殊感染类型：
+ 特殊感染类型：
沟通人
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r34475 -r35334
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 34475)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 35334)
@@ -298,6 +298,35 @@
height: 733px;
width: 940px;
}
+.border {
+ width: 0;
+ height: 0;
+ border-style: solid;
+ border-width: 0 12px 20px;
+ border-color: transparent transparent #d9534f;
+ position: relative;
+ float: left;
+}
+
+.border:after {
+ content: '';
+ border-style: solid;
+ border-width: 0 8px 15px;
+ border-color: transparent transparent #fff;
+ position: absolute;
+ top: 3px;
+ left: -8px;
+}
+
+.border span {
+ position: absolute;
+ left: -3px;
+ top: 6px;
+ font-size: 12px;
+ z-index: 1000;
+ color: #d9534f;
+ font-weight: bold;
+}