Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
===================================================================
diff -u -r37416 -r39437
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 37416)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 39437)
@@ -375,7 +375,14 @@
xtype : 'panel',
margins : '0 0 0 0',
layout:'fit',
- items:grid
+ items:grid,
+ listeners: {
+ render: function (store, records) {
+ if(create){
+ addAndEditTousse(0,'');
+ }
+ }
+ }
}];
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/receivingGood.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r39362 -r39437
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 39362)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 39437)
@@ -339,6 +339,8 @@
canChangeDepartInRecyclingForwaitRecycleInvoicePlan : true,
//开启科室使用记录功能
enableDepartmentUseRecord : true,
+//启用回收时自动创建标识牌功能
+enableRecyclingAutomaticallyCreatesIDCard:true,
//是否启用装配管理的加急功能
enableSetUrgentOfPackin:true,
//启用发货记录的结算科室干预拆分功能
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js
===================================================================
diff -u -r35504 -r39437
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 35504)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 39437)
@@ -56,6 +56,7 @@
{ name: 'status' },
{ name: 'barcode' },
{ name: 'curIdCardInstanceBarcode' },
+ { name: 'medicalConsumablesId' },
{ name: 'idCardInstances' },
{ name: 'packageType' },
{ name: 'useAmount' },
@@ -67,6 +68,146 @@
IDCard = Ext.data.Record.create(idCardFields);
var TraceableMaterial = Ext.data.Record.create(traceableMaterialFields);
+//SZSDSRMYY-176：查询标识牌定义的医用耗材SPD信息
+function loadIDCardDefinitionMedicalConsumablesSPDInfo(id){
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadIDCardDefinitionMedicalConsumablesSPDInfo.do',
+ params: { idCardDefinitionId: id},
+ success: function (response, options) {
+ var result = Ext.decode(response.responseText);
+ var success = result.success;
+ if(success){
+ var data = result.data[0];
+ var formPanel = new top.Ext.FormPanel({
+ bodyPadding: 5,
+ frame: true,
+ height: 300,
+ width: 500,
+ labelSeparator: ':',
+ labelWidth: 80,
+ labelAlign: 'right',
+ items: [{
+ layout : 'column',
+ columnWidth : 1,
+ items : [{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '名称',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.goodsName || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '生产商',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.factoryName || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '标签号',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.barcode || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : 'UDI',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.udi || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '规格',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.goodsTypeModel || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '批号',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value : data.batchNo || '',
+ anchor : '98%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ labelWidth : 60,
+ height:30,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '有效期',
+ readOnly : true,
+ cls : 'fieldReadOnlyNoRemove',
+ value :data.endDT ? Ext.util.Format.date(new Date(data.endDT.time), 'Y-m-d H:i') : '',
+ anchor : '98%'
+ }]
+ }]
+ }]
+
+ })
+ var win = new top.Ext.Window({
+ id: 'win',
+ layout: 'fit',
+ title: "SPD信息",
+ width: 510,
+ modal: true,
+ height: 300,
+ border: false,
+ items: [formPanel],
+ buttonAlign: 'center',
+ buttons: [{
+ text: '关闭',
+ handler: function () {
+ win.close();
+ }
+ }]
+
+ });
+ win.show();
+ }
+ }
+ });
+}
+
// 显示标识牌表单
function showIDCardListView() {
supplementResult = false;
@@ -106,10 +247,18 @@
{ header: "使用次数", dataIndex: 'useAmount', width: 30 },
{ header: "包装类型", dataIndex: 'packageType', width: 120, hidden: !sstsConfig.enableIdCardDefaultPackageType },
{ header: "状态", dataIndex: 'status', width: 50 },
+ { header: "SPD信息", width: 50, dataIndex: 'medicalConsumablesId', hidden: !sstsConfig.enableRecyclingAutomaticallyCreatesIDCard,renderer:function(v, p, record){
+ if(v == ''){
+ return ''
+ }else {
+ var str = "![](\"")
";
+ return str
+ }
+ } },
{
id: 'description', header: "描述",
dataIndex: 'description',
- width: 200,
+ width: 150,
editor: new top.Ext.form.TextField({
})
}
@@ -787,7 +936,6 @@
if (!isUndefinedOrNullOrEmpty(idCardPaperType2)) {
idCardInstance.idCardPaperType = idCardPaperType2;
}
-
printIDCardInstance(idCardInstance);
}
function printIDCardInstanceByID(idCardInstanceID, idCardDefinitionID) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r39236 -r39437
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 39236)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 39437)
@@ -643,6 +643,35 @@
newSaveMsgWin.show();
top.Ext.getCmp('newName').focus(false, 100);
}
+
+//SZSDSRMYY-176：SPD物品
+function loadMedicalConsumablesSPDInfo(spdGoods){
+ if(spdGoods == ''){
+ showResult('请输入条码！');
+ return
+ }
+ Ext.Ajax.request({
+ url: WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadMedicalConsumablesSPDInfo.do',
+ params: { medicalConsumablesBarcode: spdGoods },
+ success: function (response, options) {
+ var result = Ext.decode(response.responseText);
+
+ var p = new materialDefinitionConfig({
+ id: '',
+ name: result.data[0].goodsName,
+ type: '',
+ cost: '',
+ count: 1,
+ countShow: 1,
+ isImplant: ''
+ });
+ top.Ext.getCmp('configGrid').stopEditing();
+ configStore.add(p);
+ top.Ext.getCmp('name').setValue(result.data[0].goodsName);
+ setMaterialCostPrice(top.Ext.getCmp('configGrid'));
+ }
+ });
+}
/**
* 设置标识牌信息页面的“标识牌标签”属性
* @returns
@@ -1398,6 +1427,46 @@
layout: 'column',
autoHeight: true,
items: [{
+ columnWidth: .84,
+ layout: 'form',
+ labelAlign: "right",
+ labelWidth: fontSize == 12 ? 90 : 100,
+ hidden:!(sstsConfig.enableRecyclingAutomaticallyCreatesIDCard && id == ''),
+ items: [{
+ xtype: 'textfield',
+ fieldLabel: "SPD物品",
+ allowBlank: true,
+ blankText: 'SPD物品!',
+ name: "spdGoods",
+ id: "spdGoods",
+ anchor: '98%',
+ listeners: {
+ render: function (p) {
+ p.getEl().on('keypress', function (e) {
+ if (e.getKey() == 13) {
+ var spdGoods = top.Ext.getCmp('spdGoods').getValue();
+ loadMedicalConsumablesSPDInfo(spdGoods);
+ }
+ });
+ }
+ }
+ }]
+ }, {
+ columnWidth: .15,
+ layout: 'form',
+ labelAlign: "right",
+ hidden:!(sstsConfig.enableRecyclingAutomaticallyCreatesIDCard && id == ''),
+ items: [{
+ xtype: 'button',
+ text: "查询",
+ listeners: {
+ click: function (thiz) {
+ var spdGoods = top.Ext.getCmp('spdGoods').getValue();
+ loadMedicalConsumablesSPDInfo(spdGoods);
+ }
+ }
+ }]
+ }, {
columnWidth: .99,
layout: 'form',
labelWidth: fontSize == 12 ? 90 : 100,
@@ -3790,7 +3859,9 @@
//ZSWY-206：显示或隐藏灭菌包装类型和灭菌标签纸类型
var tousseType = top.Ext.getCmp('tousseType').getValue();
setPackageTypeAndPaperTypeBox(tousseType,'是');
-
+ if(create){
+ loadMedicalConsumablesSPDInfo(spdBarcode);
+ }
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r36247 -r39437
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 36247)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp (.../tousseView.jsp) (revision 39437)
@@ -78,6 +78,8 @@
var WARNING_TYPE_NEVERWARN = '<%=TousseDefinition.WARNING_TYPE_NEVERWARN%>';
var WARNING_TYPE_ALLWARN = '<%=TousseDefinition.WARNING_TYPE_ALLWARN%>';
var fontSize = '${fontSize}';
+var create = '${param.create}';
+var spdBarcode = '${param.barcode}';