Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js =================================================================== diff -u -r36669 -r38067 --- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js (.../accessListView.js) (revision 36669) +++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js (.../accessListView.js) (revision 38067) @@ -78,7 +78,7 @@ { header: "操作内容", dataIndex: 'operateDetail', width: 130, menuDisabled: true }, { header: "操作员", dataIndex: 'operator', width: 120, menuDisabled: true }, { header: "器械包条码", dataIndex: 'barcode', width: 120, menuDisabled: true }, - { header: "抽屉名称", dataIndex: 'storageName', width: 120, menuDisabled: true }, + { header: "库位名称", dataIndex: 'storageName', width: 120, menuDisabled: true }, { header: "上级库位", dataIndex: 'parentStorageName', width: 120, menuDisabled: true }, { header: "仓库", dataIndex: 'wareHouseName', width: 120, menuDisabled: true }, { header: "所属科室名称", dataIndex: 'orgUnitName', width: 120, menuDisabled: true } Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js =================================================================== diff -u -r37789 -r38067 --- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 37789) +++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/storageLocationLookView.js (.../storageLocationLookView.js) (revision 38067) @@ -84,7 +84,7 @@ //扫描条码 function putInOrTakeOutTousse(barcode, changeType, changeMode) { - //抽屉名称条码 + //库位名称条码 var drawerCode = Ext.getCmp('drawerCode').getValue(); var checkedType = Ext.getCmp('queryType').getValue(); @@ -98,7 +98,7 @@ var result = obj.data; if (obj.success) { var returnType = result.returnType; - if (returnType == "storageLocation") {//扫描的是库位,即货架或者抽屉 + if (returnType == "storageLocation") {//扫描的是库位,即货架或者库位 $Id("parm_s_orgUnitCoding").value = result.storageLocation.orgUnitCode; Ext.getCmp('warsehouse').setValue(result.storageLocation.wareHouseName);//仓库 Ext.getCmp('superiorWarsehouse').setValue(result.storageLocation.parentStorageLocationPath);//上级库位 @@ -112,13 +112,13 @@ $Id("parm_s_parentStorageLocationId").value = result.storageLocation.parentStorageLocationId; if (changeType !== 'drawer') { if (changeMode !== 1) { - Ext.getCmp("drawerName").setValue(result.storageLocation.name);//抽屉名称 + Ext.getCmp("drawerName").setValue(result.storageLocation.name);//库位名称 Ext.getCmp('drawerCode').setValue(result.storageLocation.barcode);//库位条码 grid.dwrReload(); warseIsOut = false; } else { if (Ext.getCmp("drawerName").getRawValue() == '') { - Ext.getCmp("drawerName").setValue(result.storageLocation.name);//抽屉名称 + Ext.getCmp("drawerName").setValue(result.storageLocation.name);//库位名称 Ext.getCmp('drawerCode').setValue(result.storageLocation.barcode);//库位条码 grid.dwrReload(); } @@ -558,19 +558,21 @@ var columns = [{ header: "物品名称", width: 200, dataIndex: 'tousseName' }, - { header: "灭菌日期", width: 150, dataIndex: 'sterileEndTime' }, - { header: "失效日期", width: 150, dataIndex: 'validUntil', renderer: checkDate }, - { header: "器械包条码", width: 120, dataIndex: 'tousseBarcode' }, - { header: "库位状态", width: 80, dataIndex: 'storageStatus', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, - { header: "目的科室", width: 80, dataIndex: 'depart2', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, - { header: "目的位置", width: 80, dataIndex: 'location2', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, - { header: "抽屉名称", width: 100, dataIndex: 'storageLocationName' }, - { header: "库位编码", width: 120, dataIndex: 'storageLocationCode' }, - { header: "上级库位", width: 200, dataIndex: 'parentStorageLocationPath', menuDisabled: true }, - { header: "仓库", width: 120, dataIndex: 'wareHouseName' }, - { header: "所属科室", width: 120, dataIndex: 'orgUnitName', id: "orgUnitName" } + { header: "灭菌日期", width: 120, dataIndex: 'sterileEndTime' }, + { header: "失效日期", width: 90, dataIndex: 'validUntil', renderer: checkDate }, + { header: "器械包条码", width: 80, dataIndex: 'tousseBarcode' }, + { header: "库位状态", width: 70, dataIndex: 'storageStatus', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, + { header: "目的科室", width: 90, dataIndex: 'depart2', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, + { header: "目的位置", width: 90, dataIndex: 'location2', hidden: !enableWarehousePositionAndSurgicalInstrumentsCanBeOperatedInTandemFunction }, + { header: "库位名称", width: 190, dataIndex: 'storageLocationName' }, + { header: "库位编码", width: 80, dataIndex: 'storageLocationCode' }, + { header: "上级库位", width: 130, dataIndex: 'parentStorageLocationPath', menuDisabled: true }, + { header: "仓库", width: 260, dataIndex: 'wareHouseName' }, + { header: "所属科室", width: 90, dataIndex: 'orgUnitName', id: "orgUnitName" } ]; + var columnsWidthArr = [20,200,120,90,80,70,90,90,190,80,130,260,90]; + var filters = new Ext.grid.GridFilters({ filters: [ { type: 'string', dataIndex: 'tousseName' }, @@ -626,7 +628,7 @@ ) }); - //抽屉名称 + //库位名称 drawerStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ url: WWWROOT + '/disinfectSystem/baseData/storageLocationAction!loadStorageLocationByOrgUnitCode.do', @@ -950,7 +952,7 @@ xtype: 'combo', id: 'drawerName', name: 'drawerName', - fieldLabel: '抽屉名称', + fieldLabel: '库位名称', queryParam: 'spell', minChars: 0, valueField: 'name', @@ -1193,6 +1195,10 @@ }, render: function () { new Ext.Toolbar({ items: [{ text: '', id: 'sumCount' }] }).render(this.tbar); + for(var i=0;i 0){ //判断上一次的状态和本次点击的状态是否一致，不一致就删除 @@ -60,8 +60,8 @@ Ext.getCmp('stasticsGrid').setTitle('统计信息:0个物品'); } } - Ext.getCmp("drawerName").setValue(result.name);//抽屉名称 - Ext.getCmp("storageLocationId").setValue(result.id);//抽屉id + Ext.getCmp("drawerName").setValue(result.name);//库位名称 + Ext.getCmp("storageLocationId").setValue(result.id);//库位id Ext.getCmp('warsehouse').setValue(result.wareHouseName);//仓库 Ext.getCmp('superiorWarsehouse').setValue(result.parentStorageLocationPath);//上级库位 Ext.getCmp('drawerCode').setValue(result.barcode);//库位条码 @@ -325,7 +325,7 @@ xtype : 'textfield', id : 'drawerName', name : 'drawerName', - fieldLabel : '抽屉名称', + fieldLabel : '库位名称', disabled : true }] },{ @@ -401,7 +401,7 @@ port:kardexContainerPort } if(storageLocationId == ''){ - showResult('抽屉不能为空'); + showResult('库位不能为空'); return; } if(addr == ''){