Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r18094 -r18213
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 18094)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 18213)
@@ -1456,6 +1456,11 @@
&& SSTS_Sterilizer && SSTS_Expiration && SSTS_SerialNumber_manager && SSTS_ImportBaseData_manager && SSTS_IPAndOrgUnitMapping
&& SSTS_GoodsBindingConfig && SSTS_GoodsFilterConfig && SSTS_Tousse && SSTS_Damage && SSTS_TousseGroup && SSTS_UrgentLevel_manager
&& SSTS_OperationRoom_manager;
+
+var enableSurgicalInstrumentsManagement = false;
+if (sstsConfig.enableSurgicalInstrumentsManagement) {
+ enableSurgicalInstrumentsManagement = true;
+}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r18160 -r18213
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 18160)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 18213)
@@ -125,5 +125,7 @@
//是否启用回收的丢失报损备注功能
enableRecycleMaterialErrorDamageRemark:true,
//是否启用装配的丢失报损备注功能
- enablePackingMaterialErrorDamageRemark:true
+ enablePackingMaterialErrorDamageRemark:true,
+ // 是否启用手术仪器管理，默认为不启用
+ enableSurgicalInstrumentsManagement: true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp (revision 18213)
@@ -0,0 +1,96 @@
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="com.forgon.disinfectsystem.entity.tousseitem.TousseItem"%>
+<%@page import="java.util.Calendar"%>
+<%@page import="com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+
+
+发货计划单管理
+
+
+
+<%
+ request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+
+ //设置日期定义
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar cal = Calendar.getInstance();
+ String today = sdf.format(cal.getTime());//今天
+ pageContext.setAttribute("today", today + ";" + today);
+
+ cal.add(Calendar.DATE, -1);
+ String yesterday = sdf.format(cal.getTime());//昨天
+ pageContext.setAttribute("yesterday", yesterday + ";" + yesterday);
+
+ cal.add(Calendar.DATE, -1);
+ String threeDaysAgo = sdf.format(cal.getTime());//前天(近三天的起始日)
+ pageContext.setAttribute("lastThreeDays", threeDaysAgo + ";" + today);
+
+ cal.add(Calendar.DATE, -4);
+ String sixDaysAgo = sdf.format(cal.getTime());//6天前(近一周的起始日)
+ pageContext.setAttribute("lastSixDays", sixDaysAgo + ";" + today);
+
+%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
===================================================================
diff -u -r17808 -r18213
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 17808)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 18213)
@@ -1021,6 +1021,43 @@
})
}
+ // 流转记录
+ if (!isComboTousse) {
+ tabsItemArr.push({
+ title: '流转记录',
+ items:[
+ new top.Ext.grid.GridPanel({
+ id : 'tousseOperation',
+ store : new Ext.data.Store({
+ reader : new Ext.data.JsonReader({
+ fields : [
+ {name : 'operator'},
+ {name : 'operationTime'},
+ {name : 'operation'},
+ {name : 'destDepart'},
+ {name : 'destLocation'}
+ ]
+ })
+ }),
+ cm : new Ext.grid.ColumnModel([
+ {header : "操作人",dataIndex : 'operator',width : 120, menuDisabled: true},
+ {header : "操作时间",dataIndex : 'operationTime',width : 160, menuDisabled: true,renderer : myDateFormatBySecond},
+ {header : "操作类型",dataIndex : 'operation',width : 60, menuDisabled: true},
+ {header : "科室",dataIndex : 'destDepart',width : 200, menuDisabled: true},
+ {header : "位置",dataIndex : 'destLocation',width : 200, menuDisabled: true}
+ ]),
+ enableHdMenu : false,
+ width : 900,
+ autoHeight : true,
+ autoExpandColumn : 'destLocation',
+ frame : false,
+ viewConfig: {
+ forceFit:true
+ }
+ })
+ ]
+ })
+ }
return tabsItemArr;
};
@@ -1160,6 +1197,19 @@
top.Ext.getCmp('washRecord').getStore().add(washRecordData);
}
+ //流转记录
+ var tousseOperationInfoArray = result.tousseOperationJSONs;
+ for(var j = 0;j < tousseOperationInfoArray.length ; j++){
+ var tousseOperationInfo = tousseOperationInfoArray[j];
+ var tousseOperationData = new Ext.data.Record({
+ operator : tousseOperationInfo.operator,
+ operationTime : tousseOperationInfo.operationTime,
+ destLocation : tousseOperationInfo.destLocation,
+ destDepart : tousseOperationInfo.destDepart,
+ operation : tousseOperationInfo.operation
+ });
+ top.Ext.getCmp('tousseOperation').getStore().add(tousseOperationData);
+ }
//发货记录
var invoiceInfo = result.invoice;
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r18190 -r18213
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 18190)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 18213)
@@ -353,6 +353,13 @@
{hidden :SSTS_DepartMentTousseManager,text:"科室器械包管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
+ text:"手术仪器管理",
+ singleClickExpand:singleClickExpandTree,
+ hidden:SSTS_TousseManagerView || !enableSurgicalInstrumentsManagement,
+ children:[
+ {hidden :SSTS_Tousse,text:"器械包位置管理",href:WWWROOT+'/disinfectsystem/toussemanager/position/changePosition.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+ ]
+},{
text:"干预管理",
singleClickExpand:singleClickExpandTree,
hidden:SSTS_InterfereManagerView,
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js (revision 18213)
@@ -0,0 +1,784 @@
+var sendOutGoodsStore;
+//定义首篮筐的label变量
+var beginBarcodeLabel = '扫描条码:';
+var hiddenEndBarcode = true;//隐藏尾篮筐
+var defaultFocusedFieldOnInvoiceForm = 'scanText';
+var lastLoadWarehouseId = null;
+var TYPE_CUSTOM = '自定义发货';
+var INVOICE_MODE_DEPART = 'invoicePlan';
+
+//申请科室Store
+var appDepartJsonStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getPositionJson.do',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ root : 'data'
+ },[
+ {name : 'id',mapping : 'id'},
+ {name : 'type',mapping : 'type'},
+ {name : 'name',mapping : 'name'},
+ {name : 'orgUnitCoding',mapping : 'orgUnitCoding'},
+ {name : 'orgUnitName',mapping : 'orgUnitName'},
+ {name : 'displayStr',mapping : 'displayStr'}
+ ]
+ )
+});
+
+var wareHouseStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/wareHouseAction!getWareHouseData.do',
+ method : 'POST'
+ }),
+ reader : new Ext.data.JsonReader({
+ totalProperty : 'totalCount',
+ root : 'data'
+ }, [
+ {name : 'id',mapping : 'id'},
+ {name : 'name',mapping : 'name'},
+ {name : 'orgUnitCode',mapping : 'orgUnitCode'},
+ ]),
+ listeners : {
+ load : function(store,records) {
+ var id = top.Ext.getCmp('sourceWarehouseId').getValue();
+ //var name = top.Ext.getCmp('sourceWarehouseName').getValue();
+ if(records.length > 0 && (id == null || id == '')){
+ //id=records[0].data.id;
+ //name = records[0].data.name;
+ var combo = top.Ext.getCmp("warehouse");
+ // 触发选中事件
+ combo.fireEvent('select', combo,records[0],0);
+ }
+ //top.Ext.getCmp('warehouse').setValue(id);
+ //top.Ext.getCmp('sourceWarehouseId').setValue(id);
+ //top.Ext.getCmp('sourceWarehouseName').setValue(name);
+ }
+ }
+});
+
+//条码扫描模式(单个条码逐个扫描或首尾条码段扫描两种模式)
+var currentScanMode = "single";
+if(sstsConfig.invoicePageScanMode && sstsConfig.invoicePageScanMode != null){
+ currentScanMode = sstsConfig.invoicePageScanMode;
+}
+
+function getDefaultAmount(v,p,record){
+ if (v==null || v.length <= 0){
+ return 0;
+ }else{
+ return v;
+ }
+}
+function formatStorage(v,p,record){
+ if (v==null || v.length <= 0){
+ return '';
+ }else{
+ return v;
+ }
+}
+function sayGoods(record){
+ if(record && record.data){
+ speaker.speak(record.data.showTousseName + ",数量为" + record.data.count);
+ }
+}
+
+//删除发货扫描的物品
+function removeSendOutGoods(id){
+ var rows = top.Ext.getCmp('sendOutGoods').getSelectionModel().getSelections();// 返回值为
+ if (rows) {
+ for ( var i = 0; i < rows.length; i++) {
+ var name = rows[i].data['name'];
+ var amount = rows[i].data['count'];
+ sendOutGoodsStore.remove(rows[i]);
+ updateAmount1(name,amount);
+ sendDeleteScannedGoodsLog(rows[i].data);
+ }
+ }
+}
+
+
+//删除发货明细项
+function removeSendOutTousseByBarcode(barcode){
+ var record = findRecordByNameAndValueFromStore(sendOutGoodsStore,'barcode',barcode);
+ if(record != null){
+ var name = record.data['name'];
+ sendOutGoodsStore.remove(record);
+ updateAmount1(name,1);
+ }
+}
+
+//验证条码是否重复扫描
+function isBarcodeRepeat(barcode){
+ if(barcode != null && barcode.length > 0){
+ for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
+ var record = sendOutGoodsStore.getAt(i);
+ var tempBarcode =record.get('barcode');
+ if(barcode == tempBarcode){
+ return true;
+ break;
+ }
+ }
+ }
+ return false;
+}
+
+
+
+//校验物品数量是否为数字
+function validGridAmount() {
+ //申请的物品
+ var b = true;
+ for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
+ var record = sendOutGoodsStore.getAt(i);
+ var count =record.get('count');
+ if(/[^0-9]/g.test(count)){
+ showResult('['+record.get('name')+'] 申请数量必须是数字，保存失败！');
+ top.Ext.getCmp('sendOutGoods').getView().getRow(i).style.backgroundColor = '#FFB5B5';
+ b = false;
+ break;
+ }
+ }
+ return b;
+}
+
+
+
+var addGridItem = Ext.data.Record.create([
+ {name : 'id'},
+ {name : 'barcode'},
+ {name : 'name'},
+ {name : 'showTousseName'},
+ {name : 'count'},
+ {name : 'diposable'},
+ {name : 'price'},
+ {name : 'fluctuationPrice'},
+ {name : 'storage'},
+ {name : 'batchNumber'},
+ {name : 'tousseType'},
+ {name : 'typeInfoOnScanned'},
+ {name : 'sterilizerName'},
+ {name : 'frequency'},
+ {name : 'isTracable'},
+ {name : 'tousseDefinitionId'}
+ ]);
+
+// 根据条码获取发送项
+function getSendOutGoodsByBarcode(barcode){
+ if(isUndefinedOrNullOrEmpty(barcode)){
+ return null;
+ }
+ for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
+ var record = sendOutGoodsStore.getAt(i);
+ var tempBarcode =record.get('barcode');
+ if(barcode == tempBarcode){
+ return record.data;
+ }
+ }
+ return null;
+}
+// 名字到数量的map
+function getTousseNameToAmountMap(scannedResult){
+ var map = {};
+ for(var i=0;i";
+// return str;
+// },
+// dataIndex:'button'
+// }
+ ]);
+
+ var recyclingErrorCm = new Ext.grid.ColumnModel([
+ {header : "材料名称",dataIndex : 'goodsName',width : 170,menuDisabled: true},
+ {header : "缺失数量",dataIndex : 'count',width : 60, menuDisabled: true},
+ {header : '单价',id : 'price',dataIndex : 'price',width : 60,value : 0,menuDisabled: true}
+ ]);
+
+ var cm = new Ext.grid.ColumnModel([
+ {header : "条码",dataIndex : 'barcode',width : 100,menuDisabled: true},
+ {header : "物品名称",dataIndex : 'showTousseName',width : 300,menuDisabled: true},
+ {id : 'deleteItem',header:'删除',width : 25, align:'center', menuDisabled: true,
+ renderer: function(v,p,record){
+ var str = "
";
+ return str;
+ },
+ dataIndex:'button'
+ }]);
+
+ var form = new top.Ext.FormPanel({
+ id : 'recyclingApplicationForm',
+ frame : true,
+ labelSeparator : '：',
+ bodyStyle : 'padding:5px 5px 0px 5px',
+ width : 1020,
+ autoHeight : true,
+ autoScroll : true,
+ labelAlign:'right',
+ layout : 'form',
+ items : [{
+ xtype : "fieldset",
+ title : "基础数据",
+ layout : 'column',
+ style: 'padding:0px',
+ autoHeight : true,
+ items : [{
+ layout : 'column',
+ columnWidth :1,
+ items:[{
+ xtype : 'hidden',
+ name : 'id',
+ id : 'id'
+ },{
+ xtype : 'hidden',
+ name : 'sendOutGoodsStoreData',
+ id : 'sendOutGoodsStoreData'
+ },{
+ xtype : 'hidden',
+ name : 'destType',
+ id : 'destType'
+ },{
+ xtype : 'hidden',
+ name : 'destId',
+ id : 'destId'
+ },{
+ layout : 'form',
+ labelWidth :70,
+ columnWidth :.33,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '登记人',
+ maxLength : '41',
+ id : 'operator',
+ name : 'operator',
+ readOnly:true,
+ allowBlank : false,
+ anchor : '99%',
+ value:$Id('userName').value,
+ cls:'fieldReadOnlyNoRemove'
+ }]
+ },{
+ layout : 'form',
+ labelWidth :70,
+ columnWidth :.33,
+ hidden: true,
+ items : [{
+ xtype : 'datefieldWithMin',
+ fieldLabel : '登记时间',
+ id : 'sendTime',
+ name : 'sendTime',
+ allowBlank : false,
+ altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+ format:'Y-m-d H:i',
+// value:new Date(),
+ anchor : '99%',
+ listeners : {
+ render : function() {
+ setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'sendTime'); //（发货时间，取服务器时间 cjr）
+ }
+ }
+ }]
+ },{
+ layout : 'form',
+ labelWidth :70,
+ columnWidth :.33,
+ items : [{
+ xtype : 'combo',
+ fieldLabel : '目的位置',
+ id : 'depart',
+ name : 'depart',
+ queryParam : 'spell',
+ minChars : 0,
+ valueField : 'id',
+ displayField : 'displayStr',
+ store : appDepartJsonStore,
+ forceSelection : true,
+ lazyInit : true,
+ triggerAction : 'all',
+ hideTrigger : true,
+ typeAhead : false,
+ allowBlank : false,
+ anchor : '99%',
+ listeners:{
+ select:function(combo, record, index){
+ var deptCoding = record.data.departCode;
+ top.Ext.getCmp("destType").setValue(record.data.type);
+ top.Ext.getCmp("destId").setValue(record.data.id);
+ },
+ focus : function(thiz){
+ thiz.selectText();
+ }
+ }
+ }]
+ },{
+ layout : 'form',
+ columnWidth : 1,
+ labelWidth :70,
+ items : [{
+ xtype : 'textarea',
+ fieldLabel : '备注',
+ id : 'remark',
+ name : 'remark',
+ anchor : '98.5%',
+ height : 40
+ }]
+ }]
+ }]
+ },{
+ layout:'column',
+ items:[{
+ layout : 'form',
+ columnWidth : 0.57,
+ items:[
+ new top.Ext.grid.EditorGridPanel({
+ id : 'sendOutGoods',
+ store : sendOutGoodsStore,
+ columnWidth : 0.5,
+ cm : cm,
+ width : 560,
+ height : 425,
+ autoExpandColumn : 'deleteItem',
+ enableHdMenu : false,
+ frame : false,
+ bodyStyle : 'border:1px solid #afd7af',
+ viewConfig: {
+ autoFit:true
+ },
+ clicksToEdit : 1,// 设置点击几次才可编辑
+ selModel : new top.Ext.grid.RowSelectionModel({
+ singleSelect : false
+ }),
+ tbar : [{
+ text : '扫描模式:',
+ hidden : true
+ },{
+ xtype:'combo',
+ id : 'scanMode',
+ name : 'scanMode',
+ hidden : true,
+ fieldLabel : '扫描模式',
+ valueField : 'scanModeCode',
+ displayField : 'scanModeName',
+ triggerAction : 'all',
+ width : 80,
+ allowBlank : true,
+ editable : false,
+ value:currentScanMode,
+ store : new Ext.data.SimpleStore({
+ fields : ['scanModeCode', 'scanModeName' ],
+ data : [['single','单个条码'],['area','首尾条码']]
+ }),
+ mode:'local',
+ forceSelection : true,
+ triggerAction : 'all',
+ listeners : {
+ select : function(combo, record, index){
+ //alert(record.get("scanModeCode"));
+ currentScanMode = record.get("scanModeCode");
+ }
+ },
+ anchor : '100%'
+ },{
+ text : beginBarcodeLabel
+ },{
+ xtype : 'textfield',
+ id : 'scanText',
+ name : 'scanText',
+ width : 200,
+ enableKeyEvents : true,
+ listeners : {
+ render : function(c) {
+ c.getEl().on('keypress',function(e) {
+ if (e.getKey() == 13) {// 输入;号键，grid重新加载
+ if(top.Ext.getCmp("scanText").getValue() != ''){
+ loadGoodsByBarcode(orgUnitCoding);
+ }else{
+ showResult("请扫描输入器械包/篮筐(首)条码!");
+ }
+ }
+ });
+ c.getEl().on('focus',function(e) {
+ top.Ext.getCmp('scanText').setValue('');
+ });
+ }
+ }
+ },{
+ text : '条码/篮筐(尾):',
+ hidden : true
+ },{
+ xtype : 'textfield',
+ id : 'scanTextEnd',
+ name : 'scanTextEnd',
+ hidden : true,
+ width : 90,
+ enableKeyEvents : true,
+ listeners : {
+ render : function(c) {
+ c.getEl().on('keypress',function(e) {
+ if (e.getKey() == 13) {// 输入;号键，grid重新加载
+ if(top.Ext.getCmp("scanTextEnd").getValue() != ''){
+ loadGoodsByBarcode(orgUnitCoding);
+ }else{
+ showResult("请扫描输入器械包/篮筐(尾)条码!");
+ }
+ }
+ });
+ c.getEl().on('focus',function(e) {
+ top.Ext.getCmp('scanTextEnd').setValue('');
+ });
+ }
+ }
+ }],
+ listeners : {
+ beforeedit : function(grid){//只有一次性物品才能编辑数量
+ var record = grid.record;
+ if(record.data.diposable == '否') {
+ return false;
+ }
+ },
+ afteredit :function(grid){
+ var id = grid.record.data['id'];
+ var name = grid.record.data['name'];
+ var count = grid.record.data['count'];
+ var storage = grid.record.data['storage'];
+ var storageInt = parseInt(storage);
+ if(id==0){
+ if(parseInt(count) <= storageInt){
+ updateAmount2(name,count);
+ } else {
+ showResult('库存量为：' + storage + '，已超过库存量！');
+ var index = recyclingapplicationStore.find("name",name);
+ var tempAmount = recyclingapplicationStore.getAt(index).data['tempAmount'];
+ grid.record.set('count',storageInt);
+ }
+ } else {
+ var record = getRecord(recyclingapplicationStore, "name", name, 0);
+ if(record != null) {
+ var tempAmount = record.data['tempAmount'];
+ if(parseInt(count) <= (storageInt + parseInt(tempAmount))){
+ updateAmount2(name,count);
+ } else {
+ showResult('库存量为：' + storage + '，已超过库存量！');
+ grid.record.set('count',tempAmount);
+ }
+ }
+ }
+ }
+ }
+ }
+ )]
+ }
+ ]
+ }],
+ buttons : [{
+ text : '保存',
+ id:'saveButton',
+ handler : function() {
+ if (!form.getForm().isValid()) {
+ showResult('请正确填写表单各值');
+ return false;
+ }
+ //验证发货物品表格
+ if(!sendOutGoodsStore || sendOutGoodsStore.getCount() == 0){
+ showResult('物品列表不能为空!');
+ return false;
+ }
+
+
+ getTousseGridData();
+ form.form.submit( {
+ //url : WWWROOT + '/disinfectSystem/invoiceAction!saveDepartInvoice.do',
+ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!saveChangePosition.do',
+ method : 'POST',
+ waitMsg : '正在保存数据，请稍候',
+ waitTitle : '提交表单',
+ success : function(form, action) {
+ // 一定要事务提交成功才返回发货计划列表界面
+ showResult(action.result.message);
+ if(action.result.success){
+ window.close();
+ }
+ },
+ failure : function(form, action) {
+ if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.message)){
+ showResult(action.result.message);
+ }else{
+ showResult("提交超时!");
+ window.close();
+ }
+ }
+ });
+ }
+ }, {
+ text : '取消',
+ handler : function() {
+ //切记注意:按取消关闭window后,一定要把已选择的申请单号变量清空
+ selectedInvoicePlanId = "";
+ window.close();
+ }
+ }]
+ });
+
+ var cookieSender = Ext.state.Manager.getProvider().get('cookieSender');
+ if(cookieSender){
+ top.Ext.getCmp('sender').setValue(cookieSender);
+ }
+
+ var window = new top.Ext.Window( {
+ id : 'recyclingApplicationWin',
+ layout : 'fit',
+ title : '更改位置',
+ width : 1020,
+ height : 680,
+ border : false,
+ modal : true,
+ plain : true,
+ items : [form]
+ });
+
+ window.on('close',function(w){
+ //切记注意:按取消关闭window后,一定要把已选择的申请单号变量清空
+ selectedInvoicePlanId = "";
+ });
+
+ window.show();
+// top.Ext.getCmp(defaultFocusedFieldOnInvoiceForm).focus(false, 100);
+ top.Ext.getCmp('departBarcode').focus(false, 100);
+
+ wareHouseStore.load();
+}
+
+//展示器械包信息
+function showDisinfectMaterial(tousseName) {
+ var materialStore = new Ext.data.Store({
+ proxy : new Ext.data.HttpProxy({
+ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
+ method : 'POST'
+ }),
+ baseParams : {tousseName : tousseName},
+ reader : new Ext.data.JsonReader({
+ fields : [
+ {name : 'materialDefinitionId'},
+ {name : 'name'},
+ {name : 'count'}
+ ]
+ })
+ });
+ materialStore.load();
+ var materialGrid = new top.Ext.grid.GridPanel({
+ id :'materialGrid',
+ store: materialStore,
+ columns: [
+ {hidden : true, dataIndex : 'materialDefinitionId'},
+ {header : "材料名称",width : 80, menuDisabled: true,dataIndex : 'name'},
+ {header : "数量",width : 27, menuDisabled: true,dataIndex : 'count'}
+ ],
+ viewConfig: {
+ forceFit: true
+ },
+ autoExpandColumn : 'materialAmount',
+ frame:false
+ });
+
+ var window = new top.Ext.Window({
+ title : tousseName + '信息',
+ width : 400,
+ height :200,
+ border : false,
+ autoScroll: true,
+ layout : 'fit',
+ modal : true,
+ items : [materialGrid]
+ });
+ window.show();
+}
+
+//获取扫描的物品
+function getTousseGridData() {
+ var submitItems = [];
+ for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
+ var record = sendOutGoodsStore.getAt(i);
+ record.data.sendAmount = record.data.count;
+ submitItems.push(record.data);
+ }
+ top.Ext.getCmp('sendOutGoodsStoreData').setValue(JSON.stringify(submitItems));
+}
+
+
+Ext.onReady(function() {
+ Ext.QuickTips.init();
+
+ addAndEditInvoicePlan('','');
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r18120 -r18213
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 18120)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 18213)
@@ -167,6 +167,11 @@
{header : "回收状态",width : 80,dataIndex : 'recyclingStatus',sortable: false,renderer : recyclingStatusFun, hidden : !sstsConfig.enableRecyclingStatusOfTousseInstance},
{header : "位置",width : 80,dataIndex : 'locationForDisplay'},
{header : "所属仓库",width : 80,dataIndex : 'wareHouseName'},
+
+ {header : "流转科室",width : 80,dataIndex : 'depart2'},
+ {header : "流转位置",width : 80,dataIndex : 'location2'},
+ {header : "流转状态",width : 80,dataIndex : 'status2'},
+
{header : "回收清点人",width : 100,dataIndex : 'recyclingOperator',sortable: false},
{header : "清洗人",width : 60,dataIndex : 'washOperator',sortable: false},
{header : "清洗时间",width : 125,dataIndex : 'washStartTime',sortable: false},
@@ -222,6 +227,9 @@
{name : 'signedDate'},
{name : 'locationForDisplay'},
{name : 'wareHouseName'},
+ {name : 'depart2'},
+ {name : 'status2'},
+ {name : 'location2'},
{name : 'orgUnitName'},
{name : 'warningUntil'},
{name : 'wasteDate'},