Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r14236 -r14265
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14236)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14265)
@@ -25,15 +25,6 @@
var currentImageType;
var page = 1;
var totalPage = 0;
-var toolbarPage = new Ext.Toolbar.TextItem({
- text : '第 1 页'
-});
-var toolbarTotalPage = new Ext.Toolbar.TextItem({
- text : '共 0 页'
-});
-var pageNameStr = new Ext.Toolbar.TextItem({
- text : ' '
-});
function editBasket(basketBarcode,basketName){
var basketTousseInstanceStore = new Ext.data.Store({
@@ -634,17 +625,17 @@
var taskGroup = $Id('parm_s_taskGroup').value;
function loadPackageImage(id,name){
- Ext.getCmp('imagePanel').setTitle("[" + name + "] 图片");
+ top.Ext4.getCmp('imagePanel').setTitle("[" + name + "] 图片");
var url = WWWROOT + '/disinfectSystem/tousseInstanceAction!getTousseDefinitionImage.do?id='+id;
- var image = Ext.get('imageBrowse').dom;
- image.src = '',
- image.src = url;// 覆盖原来的图片
+ var image = top.Ext4.getCmp('browseImage');
+ image.setSrc('');
+ image.setSrc(url);// 覆盖原来的图片
//image.filters.item("DXImageTransform.Microsoft.AlphaImageLoader").src = url;
}
function loadTousseIncludeMaterials(id,name){
Ext.getCmp('materialGrid').setTitle('[' + name + '] 包含的材料');
materialStore.on("beforeload", function(thiz, options) {
- thiz.baseParams["tousseInstanceId"] = id;
+ thiz.proxy.extraParams["tousseInstanceId"] = id;
});
materialStore.load();
}
@@ -653,7 +644,7 @@
page = 1;
totalPage = 0;
//加载当前包图片总页数
- Ext.Ajax.request({
+ top.Ext4.Ajax.request({
url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getInsideTousseDefinitionImageByName.do',
params : {
name : name,
@@ -663,18 +654,25 @@
success : function(result){
var pageStr = result.responseText;
totalPage = parseInt(pageStr);
- var element = Ext.get(toolbarTotalPage.el);
- element.update(' 共 ' + totalPage + ' 页');
+ var element = top.Ext4.getCmp("toolbarTotalPage");
+ if(element){
+ element.update(' 共 ' + totalPage + ' 页');
+ }
+
//加载图片
var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(name) + '&page=' + page + '&imageType='+imageType +'&time='+new Date();
- var imageBrowse = top.Ext.get('imageBrowse');
- var image = imageBrowse.dom;
- image.src = url;// 覆盖原来的图片
- var element = top.Ext.get(toolbarPage.el);
- element.update('第 ' + page + ' 页');
+ var image = top.Ext4.getCmp('browseImage');
+ image.setSrc('');
+ image.setSrc(url);// 覆盖原来的图片
+ var element = top.Ext4.getCmp("toolbarPage");
+ if(element){
+ element.update('第 ' + page + ' 页');
+ }
- var element = Ext.get(pageNameStr.el);
- element.update("["+name+"]");
+ var element = top.Ext4.getCmp("pageName");
+ if(element){
+ element.update("["+name+"]");
+ }
},
failure : function(){}
});
@@ -711,68 +709,107 @@
loadImage('',tousseName,currentImageType);
}
}];
- var materialStore = new Ext.data.Store({
- proxy : new Ext.data.HttpProxy({
+ var materialStore = new top.Ext4.data.Store({
+ proxy : {
+ type : 'ajax',
url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
- method : 'POST'
- }),
- baseParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
- reader : new Ext.data.JsonReader({
- fields : [
- {name : 'materialDefinitionId'},
- {name : 'name'},
- {name : 'count'}
- ]
- })
+ extraParams : {tousseName : tousseName,tousseDefinitionId:tousseDefinitionId},
+ reader : {
+ type : 'json'
+ }
+ },
+ fields : [
+ {name : 'materialDefinitionId'},
+ {name : 'name'},
+ {name : 'count'},
+ {name : 'notice'},
+ {name : 'hasNotice'}
+ ]
});
- var materialGrid = new top.Ext.grid.GridPanel({
+ function gridItemRender(v , ctx , record){
+ ctx.tdAttr = " data-qtip = '"+record.data['name']+"' data-qwidth=300 data-qtitle='材料名称（点击查看图片）:'";
+ return v;
+ }
+ var materialGrid = new top.Ext4.grid.Panel({
id :'materialGrid',
store: materialStore,
columns: [
{hidden : true, dataIndex : 'materialDefinitionId'},
- {header : "材料名称",width : 80, menuDisabled: true,dataIndex : 'name'},
- {header : "数量",width : 30, menuDisabled: true,dataIndex : 'count'}
+ {header : "材料名称",width : 100,flex: 1, menuDisabled: true,dataIndex : 'name',renderer:gridItemRender},
+ {header : "数量",width : 40, menuDisabled: true,dataIndex : 'count',renderer:gridItemRender}
],
- viewConfig: {
- forceFit: true
- },
+// viewConfig: {
+// forceFit: true
+// },
+ plugins: [{
+ ptype: 'rowexpander',
+ rowBodyTpl : new top.Ext4.XTemplate(
+ '',
+ '注意事项',
+ '',
+ '{.}
',
+ '',
+ ''
+ )
+ }],
autoExpandColumn : 'materialAmount',
width:400,
height:150,
frame:false,
+ border:false,
// title:'材料列表',
- bbar : materialToolbar
+ bbar : materialToolbar,
+ listeners: {
+ afterrender: function (grid) {
+ grid.getView().getHeaderAtIndex(0).hide();
+ },
+ itemclick:function(thiz, record, item, index, e, eOpts){
+ currentImageType = "材料图片";
+ var materialDefinitionId = record.data['materialDefinitionId'];
+ var materialName = record.data['name'];
+ if (materialDefinitionId != '') {
+ materialId = materialDefinitionId;
+ loadImage(materialDefinitionId,materialName,currentImageType);
+ }
+ }
+ }
});
- top.Ext.QuickTips.init();//别忘记加这句
- materialGrid.on('mouseover', function(e) {// 添加mouseover事件
- var index = materialGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
- if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
- var record = this.getStore().getAt(index);
- var rowEl = Ext.fly(e.getTarget());
- rowEl.set({'ext:qtip':''+record.data['name']+'','ext:qwidth':300,'ext:qtitle':'材料名称（点击查看图片）:'},false);
- }
- });
+ top.Ext4.QuickTips.init();//别忘记加这句
+// materialGrid.on('mouseover', function(e) {// 添加mouseover事件
+// var index = materialGrid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置
+// if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false）
+// var record = this.getStore().getAt(index);
+// var rowEl = Ext4.fly(e.getTarget());
+// rowEl.set({'ext:qtip':''+record.data['name']+'','ext:qwidth':300,'ext:qtitle':'材料名称（点击查看图片）:'},false);
+// }
+// });
- materialGrid.on('rowclick', function(grid, index, e){
- currentImageType = "材料图片";
- var selectionModel = grid.getSelectionModel().getSelections();
- if(selectionModel.length > 0) {
- var materialDefinitionId = selectionModel[0].data['materialDefinitionId'];
- var materialName = selectionModel[0].data['name'];
- if (materialDefinitionId != '') {
- materialId = materialDefinitionId;
- loadImage(materialDefinitionId,materialName,currentImageType);
- }
- }
- });
+// materialGrid.on('rowclick', function(grid, index, e){
+// currentImageType = "材料图片";
+// var selectionModel = grid.getSelectionModel().getSelections();
+// if(selectionModel.length > 0) {
+// var materialDefinitionId = selectionModel[0].data['materialDefinitionId'];
+// var materialName = selectionModel[0].data['name'];
+// if (materialDefinitionId != '') {
+// materialId = materialDefinitionId;
+// loadImage(materialDefinitionId,materialName,currentImageType);
+// }
+// }
+// });
/////////////////////////////////////////图片预览
- var imagePanel = new top.Ext.Panel({
+ var imagePanel = new top.Ext4.Panel({
id : 'imagePanel',
- layout : 'fit',
- bbar : [pageNameStr,'->',{
+ height :500,
+ border : false,
+ autoScroll: true,
+ layout : 'fit',
+ bbar : [{
+ xtype:'tbtext',
+ id:'pageName'
+ },'->',{
xtype : 'button',
text : '<<',
tooltip:'上一页',
@@ -784,15 +821,19 @@
page = page - 1;
var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page+'&imageType='+currentImageType;
- var imageBrowse = top.Ext.get('imageBrowse');
- var image = imageBrowse.dom;
- image.src = url;// 覆盖原来的图片
- var element = Ext.get(toolbarPage.el);
+ var image = top.Ext4.getCmp('browseImage');
+ image.setSrc('');
+ image.setSrc(url);// 覆盖原来的图片
+ var element = top.Ext4.getCmp("toolbarPage");
element.update('第 ' + page + ' 页');
}
- },
- toolbarPage,
- toolbarTotalPage,{
+ },{
+ xtype:'tbtext',
+ id:'toolbarPage'
+ },{
+ xtype:'tbtext',
+ id:'toolbarTotalPage'
+ },{
xtype : 'button',
text : '>>',
tooltip:'下一页',
@@ -804,31 +845,25 @@
page = page + 1;
var url = WWWROOT + '/disinfectSystem/recyclingApplicationAction!getImage.do?materialId='+materialId+'&name=' + encodeURIComponent(tousseName) + '&page=' + page +'&imageType='+currentImageType;;
- var imageBrowse = top.Ext.get('imageBrowse');
- var image = imageBrowse.dom;
- image.src = url;// 覆盖原来的图片
- var element = Ext.get(toolbarPage.el);
+ var image = top.Ext4.getCmp('browseImage');
+ image.setSrc('');
+ image.setSrc(url);// 覆盖原来的图片
+ var element = top.Ext4.getCmp("toolbarPage");
element.update('第 ' + page + ' 页');
}
}],
items : [{
- xtype : 'box',
- id : 'browseImage',
- fieldLabel : "预览图片",
- autoEl : {
- id : 'imageBrowse',
- tag : 'img',
- autoHeight:true,
- src : Ext.BLANK_IMAGE_URL,
- style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
- complete : 'off'
- }
- }]
+ xtype : 'image',
+ id : 'browseImage',
+ fieldLabel : "预览图片",
+ //title:'双击预览图片',
+ src : Ext.BLANK_IMAGE_URL
+ }]
});
/////////////////////////////////////////图片预览
- var window = new top.Ext.Window({
+ var window = new top.Ext4.Window({
id : 'packageImg',
title : tousseName + '信息',
width : 800,
@@ -852,7 +887,7 @@
//材料
//top.Ext.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料');
materialStore.on("beforeload", function(thiz, options) {
- thiz.baseParams["tousseInstanceId"] = id;
+ thiz.proxy.extraParams["tousseInstanceId"] = id;
});
materialStore.load();
window.show();