Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js
===================================================================
diff -u -r23663 -r24066
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 23663)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.js (.../materialDefinitionView.js) (revision 24066)
@@ -1,42 +1,46 @@
var entityName = "材料管理";
var grid;
-var toussePackingTearchingStore;
-function moveUp2(id){
- ImageFileTableManager.moveUpImageFile(id, function(){
- toussePackingTearchingStore.reload();
- });
-}
-function moveDown2(id){
- ImageFileTableManager.moveDownImageFile(id, function(){
- toussePackingTearchingStore.reload();
- });
-}
-function deleteImageFile(id, imageType, objectId){
- if(id != null && id != ""){
- top.Ext.MessageBox.confirm("请确认","是否确定要删除此图片？",
- function(button, text) {
- if ("yes" == button){
- ImageFileTableManager.deleteImageFile(id,function(){
- showResult("删除成功");
- toussePackingTearchingStore.reload();
+//var toussePackingTearchingStore;
+//function moveUp2(id){
+// ImageFileTableManager.moveUpImageFile(id, function(){
+// toussePackingTearchingStore.reload();
+// });
+//}
+//function moveDown2(id){
+// ImageFileTableManager.moveDownImageFile(id, function(){
+// toussePackingTearchingStore.reload();
+// });
+//}
+//function deleteImageFile(id, imageType, objectId){
+// if(id != null && id != ""){
+// top.Ext.MessageBox.confirm("请确认","是否确定要删除此图片？",
+// function(button, text) {
+// if ("yes" == button){
+// ImageFileTableManager.deleteImageFile(id,function(){
+// showResult("删除成功");
+// toussePackingTearchingStore.reload();
+//
+// updateImageUploadStatus(imageType, objectId);
+// grid.dwrReload();
+//
+// });
+// }
+// });
+// }
+//}
- updateImageUploadStatus(imageType, objectId);
- grid.dwrReload();
-
- });
- }
- });
- }
-}
+//function updateImageUploadStatus(imageType, objectId){
+// if (imageType == imageTypeMaterial){
+// MaterialDefinitionTableManager.updateImageUploadStatus(objectId, imageType);
+// }
+// else if (imageType == imageTypeToussePacking){
+//
+// }
+//}
+//function downLoadImageFile(id){
+// location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id;
+// }
-function updateImageUploadStatus(imageType, objectId){
- if (imageType == imageTypeMaterial){
- MaterialDefinitionTableManager.updateImageUploadStatus(objectId, imageType);
- }
- else if (imageType == imageTypeToussePacking){
-
- }
-}
/**
* 材料停用背景顔色修改
*/
@@ -48,9 +52,6 @@
}
}
-function downLoadImageFile(id){
- location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id;
-}
// 删除
function deleteMaterialDefinition(grid) {
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java
===================================================================
diff -u -r19453 -r24066
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java (.../MaterialDefinitionManager.java) (revision 19453)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManager.java (.../MaterialDefinitionManager.java) (revision 24066)
@@ -161,4 +161,12 @@
* 根据Id获取材料信息并修改是否停用属性
*/
public void changeDisable(String id);
+
+ /**
+ * 更新是否图片上传
+ * @param id
+ * @param imageType
+ * @return
+ */
+ public boolean updateImageUploadStatus(String id,String imageType);
}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
===================================================================
diff -u -r23663 -r24066
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 23663)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js (.../materialDefinitionForm.js) (revision 24066)
@@ -22,6 +22,16 @@
]
});
+ //清洗方式数据
+ var washMethodStore = new Ext.data.JsonStore({
+ url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getHttpOptionResultSet.do',
+ root: 'data',
+ baseParams : {optionType : optionType_washMethod},
+ fields: [
+ {name : 'value',mapping : 'value'},
+ ]
+ });
+
var isTracebleStore = new Ext.data.SimpleStore({
fields : [ 'value' ],
data : [ ['是' ], ['否' ]]
@@ -32,7 +42,8 @@
data : [ [goodsType_materialGoods], [goodsType_expensiveGoods]]
});
-/////////////////////////////////////////图片预览
+
+/////////////////////////////////////////材料图片预览
var page = 1;
var totalPage = 0;
var toolbarPage = new top.Ext.Toolbar.TextItem({
@@ -67,7 +78,7 @@
items : [{
xtype : 'panel',
id : 'pageToolbar',
- bbar : ['->',{
+ bbar : ['预览图','->',{
xtype : 'button',
text : '上一页',
handler : function(){
@@ -126,9 +137,9 @@
data : [ ['否' ], ['是' ]]
});
- /////////////////////////////////////////图片预览
+ /////////////////////////////////////////材料图片预览
-
+ /*****form******/
formObj = new top.Ext.FormPanel({
id : 'materialDefinitionForm',
frame : true,
@@ -137,7 +148,7 @@
fileUpload : true,
labelWidth : 115,
bodyStyle : 'padding:5px 5px 0px 5px',
- autoScroll : false,
+ autoScroll : true,
items : [{
xtype : 'hidden',
name : 'id',
@@ -496,13 +507,102 @@
triggerAction : 'all',
anchor : '100%'
}]
- },{
+ }, {
columnWidth : .33,
layout : 'form',
+ items:[{
+ xtype: 'numberfield',
+ fieldLabel: "顺序号",
+ allowDecimals:false,
+ allowNegative:false,
+ name: "sequence",
+ id: "sequence",
+ anchor: '100%'
+ }]
+ },{
+ columnWidth : 1,
+ layout : 'form',
items : [{
xtype : 'textarea',
+ fieldLabel : '注意事项',
+ height : 40,
+ id : 'notice',
+ name : 'notice',
+ maxLength : 665,
+ allowBlank : true,
+ autoScroll:true,
+ anchor : '100%'
+ }]
+ },{
+ columnWidth : .5,
+ layout : 'form',
+ items:[{
+ xtype : 'combo',
+ fieldLabel : '清洗方式',
+ id : 'washMethod',
+ name : 'washMethod',
+ width : 130,
+ valueField : 'value',
+ displayField : 'value',
+ store : washMethodStore,
+ allowBlank: true,
+ editable:false,
+ forceSelection : true,
+ triggerAction : 'all',
+ anchor : '100%'
+ }]
+ },{
+ columnWidth : .25,
+ layout : 'form',
+ items:[{
+ xtype : 'combo',
+ fieldLabel : '是否可拆',
+ id : 'detachable',
+ name : 'detachable',
+ width : 130,
+ valueField : 'value',
+ displayField : 'value',
+ store : new Ext.data.SimpleStore({
+ fields : [ 'value' ],
+ data : [ ['是'], ['否']]
+ }),
+ editable:false,
+ forceSelection : true,
+ allowBlank: true,
+ mode : 'local',
+ triggerAction : 'all',
+ anchor : '100%',
+ listeners : {
+ select: function(combo, record, index){
+ if(id && record.data.value == '是' ){
+ top.Ext.getCmp('detachableImagPanel').show();
+ }else{
+ top.Ext.getCmp('detachableImagPanel').hide();
+ }
+ }
+ }
+ }]
+ },{
+ columnWidth : .25,
+ layout : 'form',
+ id:'detachableImagPanel',
+ hidden : true,
+ items:[{
+ xtype : 'button',
+ text : "材料可拆图片管理",
+ id : "detachableImageFile",
+ handler:function(){
+ uploadMaterialImageFile(imageTypeMaterialDetachable,id);
+ }
+
+ }]
+ },{
+ columnWidth : 1,
+ layout : 'form',
+ items : [{
+ xtype : 'textarea',
fieldLabel : '清洗质量检查关注点',
- height : 25,
+ height : 40,
id : 'washQualityCheckPoint',
name : 'washQualityCheckPoint',
maxLength : 665,
@@ -511,49 +611,80 @@
anchor : '100%'
}]
},{
- columnWidth : .33,
+ columnWidth : 1,
+ layout : 'form',
+ id:'washQualityCheckPointImagPanel',
+ hidden : id == 0?true:false,
+ items:[{
+ xtype : 'button',
+ style : 'margin-left:120px;margin-top: 4px;margin-bottom: 5px;',
+ text : "清洗质量检查关注点图片管理",
+ id : "washQualityCheckPointImageFile",
+ handler:function(){
+ uploadMaterialImageFile(imageTypeWashQualityCheckPoint,id);
+ }
+ }]
+ },{
+ columnWidth : 1,
layout : 'form',
items : [{
xtype : 'textarea',
- fieldLabel : '功能检查',
- height : 25,
- id : 'functionCheck',
- name : 'functionCheck',
+ fieldLabel : '清洗质量检查方法',
+ height : 40,
+ id : 'washQualityCheckMethod',
+ name : 'washQualityCheckMethod',
maxLength : 665,
allowBlank : true,
autoScroll:true,
anchor : '100%'
}]
- }, {
- columnWidth : .33,
- layout : 'form',
- items:[{
- xtype: 'numberfield',
- fieldLabel: "顺序号",
- allowDecimals:false,
- allowNegative:false,
- name: "sequence",
- id: "sequence",
- anchor: '100%'
- }]
},{
+ columnWidth : 1,
+ layout : 'form',
+ id:'washQualityCheckMethodImagPanel',
+ hidden : id == 0?true:false,
+ items:[{
+ style : 'margin-left:120px;margin-top: 4px;margin-bottom: 5px;',
+ xtype : 'button',
+ text : "清洗质量检查方法图片管理",
+ id : "washQualityCheckMethodImagFile",
+ handler:function(){
+ uploadMaterialImageFile(imageTypeWashQualityCheckMethod,id);
+ }
+ }]
+ },{
columnWidth : 1,
layout : 'form',
items : [{
xtype : 'textarea',
- fieldLabel : '注意事项',
+ fieldLabel : '功能检查',
height : 40,
- id : 'notice',
- name : 'notice',
+ id : 'functionCheck',
+ name : 'functionCheck',
maxLength : 665,
allowBlank : true,
autoScroll:true,
anchor : '100%'
}]
- }
+ },{
+ columnWidth : 1,
+ layout : 'form',
+ id:'functionCheckImagPanel',
+ hidden : id == 0?true:false,
+ items:[{
+ style : 'margin-left:120px;margin-top: 4px;margin-bottom: 5px;',
+ xtype : 'button',
+ text : "功能检查图片管理",
+ id : "functionCheckImagFile",
+ handler:function(){
+ uploadMaterialImageFile(imageTypeFunctionCheck,id);
+ }
+ }]
+ }
]},{
columnWidth: 1,
layout: 'form',
+ hidden : id == 0?true:false,
bodyStyle : 'border:1px solid #afd7af',
items: [
showTousseImage
@@ -573,16 +704,17 @@
id : 'uploadFile',
hidden:id == 0?true:false,
handler : function(){
- uploadMaterialImageFile(imageType);
+ uploadMaterialImageFile(imageTypeMaterial,id);
}
} ]
});
+
materialDefinitionWin = new top.Ext.Window( {
id : 'materialDefinitionWin',
layout : 'fit',
title : '材料信息',
width : 720,
- height : 650,
+ height : 590,
border : false,
modal : true,
plain : true,
@@ -599,6 +731,10 @@
waitMsg : '正在加载数据，请稍候!',
success : function(form, action) {
top.Ext.getCmp('storage').setValue(action.result.storage);
+ //加载时根据是否可拆显示：可拆图片管理
+ if(top.Ext.getCmp('detachable').getValue() == '是'){
+ top.Ext.getCmp('detachableImagPanel').show();
+ }
},
failure : function(form, action) {
},
@@ -615,153 +751,153 @@
top.Ext.getCmp('isStatisticWorkLoad').setValue('是'); //添加时默认是否统计工作量为是
}
- function moveUpDown(v, p, record){
- var html = '';
- html += '
';
- html += '';
- html += '
';
- return html;
- }
-
- function deleteOrDownLoad(v, p, record){
- var html = '';
- html += '
';
- html += '';
- html += '';
- return html;
- }
+// function moveUpDown(v, p, record){
+// var html = '';
+// html += ' ';
+// html += '';
+// html += '';
+// return html;
+// }
+//
+// function deleteOrDownLoad(v, p, record){
+// var html = '';
+// html += ' ';
+// html += '';
+// html += '';
+// return html;
+// }
- function uploadMaterialImageFile(imageType){
-
- toussePackingTearchingStore = new top.Ext.data.Store({
- proxy : new Ext.data.HttpProxy({
- url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id ,
- method : 'POST'
- }),
- reader : new Ext.data.JsonReader({
- totalProperty : 'totalCount',
- root : 'data'
- }, [
- {name : 'id',mapping : 'id'},
- {name : 'imageName',mapping : 'imageName'}
- ]
- )
- });
- toussePackingTearchingStore.load();
-
- var cm = new top.Ext.grid.ColumnModel([
- {
- name:'id',
- hidden :true,
- dataIndex : 'id'
- },{
- id:'imageName',
- menuDisabled: true,
- header : "图片名称",
- width:200,
- dataIndex : 'imageName'
- },{
- id:'moveUpDown',
- menuDisabled: true,
- header:'排序操作',
- width:100,
- renderer: moveUpDown,
- dataIndex:'button'
- },{
- id:'deleteAction',
- menuDisabled: true,
- header:'删除 | 下载',
- width:100,
- renderer: deleteOrDownLoad,
- dataIndex:'button'
- }]);
-
- var tbar = [{
- text : '上传图片',
- handler:function(){
- uploadWindow(imageType);
- }
- }];
-
- var uploadImageForm = new top.Ext.FormPanel({
- id : 'deviceMaintenanceForm',
- frame : true,
- labelAlign:'right',
- labelSeparator : '：',
- bodyStyle : 'padding:5px 5px 0px 5px',
- autoWidth : true,
- autoHeight : true,
- autoScroll : true,
- items:[{
- layout : 'column',
- items : [{
- xtype : 'hidden',
- name : 'id',
- id : 'id'
- },{
- columnWidth : 1,
- layout: 'form',
- items : [
- new top.Ext.grid.GridPanel({
- id : 'configGrid',
- store : toussePackingTearchingStore,
- tbar : tbar,
- cm : cm,
- height: 240,
- frame : false,
- autoExpandColumn : 'deleteAction',
- bodyStyle : 'border:1px solid #afd7af',
- anchor : '100%',
- selModel : new top.Ext.grid.RowSelectionModel({
- singleSelect : false
- })
- })
- ]
- }]
- }],
- buttons : [{
- id : 'cancleBtn',
- text : '取消',
- handler : function() {
- formWindow.close();
- }
- }]
- });
-
- formWindow = new top.Ext.Window( {
- id : 'deviceMaintenanceWin',
- layout : 'fit',
- title : imageType+"管理",
- width : 600,
- modal : true,
- autoHeight : true,
- border : false,
- plain : true,
- items : [uploadImageForm]
- });
- formWindow.show();
- }
- function uploadWindow(imageType){
- var dialog = new top.Ext.ux.UploadDialog.Dialog({
- title: "上传" + imageType,
- url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do?imageType='+imageType+'&objectId='+id , //这里我用struts2做后台处理
- post_var_name:'uploadFiles',//这里是自己定义的，默认的名字叫file
- width : 450,
- height : 300,
- minWidth : 450,
- minHeight : 300,
- draggable : true ,
- resizable : true ,
- constraintoviewport: true ,
- permitted_extensions:['JPG','jpg','jpeg','JPEG','GIF','gif','png','PNG'],
- modal: true ,
- reset_on_hide: false ,
- allow_close_on_upload: false , //关闭上传窗口是否仍然上传文件
- upload_autostart: false
- });
- dialog.show();
- dialog.on('uploadcomplete',onUploadComplete); //定义上传完成回调函数
- }
+// function uploadMaterialImageFile(imageType){
+//
+// toussePackingTearchingStore = new top.Ext.data.Store({
+// proxy : new Ext.data.HttpProxy({
+// url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id ,
+// method : 'POST'
+// }),
+// reader : new Ext.data.JsonReader({
+// totalProperty : 'totalCount',
+// root : 'data'
+// }, [
+// {name : 'id',mapping : 'id'},
+// {name : 'imageName',mapping : 'imageName'}
+// ]
+// )
+// });
+// toussePackingTearchingStore.load();
+//
+// var cm = new top.Ext.grid.ColumnModel([
+// {
+// name:'id',
+// hidden :true,
+// dataIndex : 'id'
+// },{
+// id:'imageName',
+// menuDisabled: true,
+// header : "图片名称",
+// width:200,
+// dataIndex : 'imageName'
+// },{
+// id:'moveUpDown',
+// menuDisabled: true,
+// header:'排序操作',
+// width:100,
+// renderer: moveUpDown,
+// dataIndex:'button'
+// },{
+// id:'deleteAction',
+// menuDisabled: true,
+// header:'删除 | 下载',
+// width:100,
+// renderer: deleteOrDownLoad,
+// dataIndex:'button'
+// }]);
+//
+// var tbar = [{
+// text : '上传图片',
+// handler:function(){
+// uploadWindow(imageType);
+// }
+// }];
+//
+// var uploadImageForm = new top.Ext.FormPanel({
+// id : 'deviceMaintenanceForm',
+// frame : true,
+// labelAlign:'right',
+// labelSeparator : '：',
+// bodyStyle : 'padding:5px 5px 0px 5px',
+// autoWidth : true,
+// autoHeight : true,
+// autoScroll : true,
+// items:[{
+// layout : 'column',
+// items : [{
+// xtype : 'hidden',
+// name : 'id',
+// id : 'id'
+// },{
+// columnWidth : 1,
+// layout: 'form',
+// items : [
+// new top.Ext.grid.GridPanel({
+// id : 'configGrid',
+// store : toussePackingTearchingStore,
+// tbar : tbar,
+// cm : cm,
+// height: 240,
+// frame : false,
+// autoExpandColumn : 'deleteAction',
+// bodyStyle : 'border:1px solid #afd7af',
+// anchor : '100%',
+// selModel : new top.Ext.grid.RowSelectionModel({
+// singleSelect : false
+// })
+// })
+// ]
+// }]
+// }],
+// buttons : [{
+// id : 'cancleBtn',
+// text : '取消',
+// handler : function() {
+// formWindow.close();
+// }
+// }]
+// });
+//
+// formWindow = new top.Ext.Window( {
+// id : 'deviceMaintenanceWin',
+// layout : 'fit',
+// title : imageType+"管理",
+// width : 600,
+// modal : true,
+// autoHeight : true,
+// border : false,
+// plain : true,
+// items : [uploadImageForm]
+// });
+// formWindow.show();
+// }
+// function uploadWindow(imageType){
+// var dialog = new top.Ext.ux.UploadDialog.Dialog({
+// title: "上传" + imageType,
+// url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadImage.do?imageType='+imageType+'&objectId='+id , //这里我用struts2做后台处理
+// post_var_name:'uploadFiles',//这里是自己定义的，默认的名字叫file
+// width : 450,
+// height : 300,
+// minWidth : 450,
+// minHeight : 300,
+// draggable : true ,
+// resizable : true ,
+// constraintoviewport: true ,
+// permitted_extensions:['JPG','jpg','jpeg','JPEG','GIF','gif','png','PNG'],
+// modal: true ,
+// reset_on_hide: false ,
+// allow_close_on_upload: false , //关闭上传窗口是否仍然上传文件
+// upload_autostart: false
+// });
+// dialog.show();
+// dialog.on('uploadcomplete',onUploadComplete); //定义上传完成回调函数
+// }
//文件上传成功后的回调函数
/*var onUploadSuccess = function(dialog, filename, resp_data, record){
@@ -772,11 +908,11 @@
alert(resp_data.data);
} */
//文件上传完成后的回调函数
- var onUploadComplete = function(dialog){
- showResult("文件上传成功！");
- toussePackingTearchingStore.reload();
- dialog.hide();
- };
+// var onUploadComplete = function(dialog){
+// showResult("文件上传成功！");
+// toussePackingTearchingStore.reload();
+// dialog.hide();
+// };
}
function isPositiveNum(s){//是否为正整数
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java
===================================================================
diff -u -r23696 -r24066
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 23696)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/ShowImageAction.java (.../ShowImageAction.java) (revision 24066)
@@ -329,7 +329,11 @@
|| StringTools.equals(ImageFile.IMAGE_TYPE_TOUSSEPACKING,imageType)){
TousseDefinition tousseDefinition = getTousseDefinition(parameters);
objectId = getObjectId(tousseDefinition);
- }else if(StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL, imageType)){
+ }else if(StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL, imageType)
+ ||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE, imageType)
+ ||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD, imageType)
+ ||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK, imageType)
+ ||StringTools.equals(ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKPOINT, imageType)){
MaterialDefinition md = getMaterialDefinition(parameters);
if(md != null){
objectId = md.getId();
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp
===================================================================
diff -u -r19456 -r24066
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 19456)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionView.jsp (.../materialDefinitionView.jsp) (revision 24066)
@@ -20,14 +20,21 @@
+