Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (revision 25864)
@@ -0,0 +1,174 @@
+var form = null;
+var myMask;
+var tousseDefinitionIDQuery;
+var toussepackingNameQuery;
+function reloadReport(){
+ if (!form.getForm().isValid()) {
+ showResult('请正确填写表单各值');
+ return false;
+ }
+ myMask = new Ext.LoadMask(Ext.getBody(), {
+ msg: '正在加载，请稍候！',
+ removeMask: true
+ });
+ myMask.show();
+ var barcodeSearch = Ext.getCmp('barcodeSearch').getValue();
+ Ext4.Ajax.request({
+ url :WWWROOT+"/disinfectSystem/tousseInstanceAction!loadTousseDefintionByBarcode.do",
+ params : {
+ barcode:barcodeSearch
+ },
+ success : function(result){
+ myMask.hide();
+ Ext.getCmp('barcodeSearch').setValue("");
+ var jsonObj = Ext4.JSON.decode(result.responseText);
+ var tousseDefinitionID = jsonObj.data.tousseDefinitionId;
+ var tousseName = escapeText(jsonObj.data.name);
+ window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
+ "?resolution=1980" +
+ "&tousseDefinitionID=" + tousseDefinitionID +
+ "&tousseName=" + tousseName +
+ "&number=1&showToussePictures=true",
+ 'tousseImages', '_self');
+ }
+ })
+}
+function escapeText(texts){
+ texts = texts.replace(/\#/g,"%23");
+ return texts;
+}
+var appDepartJsonStore2 = new Ext.data.JsonStore({
+ autoLoad:false,
+ root : 'data',totalProperty : 'totalCount',
+ url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+ fields : [
+ {name : 'id',mapping : 'id'},
+ {name : 'name',mapping : 'name'}
+ ]
+});
+Ext.onReady(function(){
+ form = new Ext.form.FormPanel({
+ // title : "",
+ region : 'north',
+ labelAlign : 'right',
+ buttonAlign : 'center',
+ collapsible : true,
+ collapseMode : 'mini',
+ split : true,
+ border : 0,
+ frame : true,
+ bodyStyle : 'padding:0px auto;margin:0px',
+ height : 80,
+ buttons:[{
+ xtype : 'button',
+ text : '查询',
+ minWidth : 70,
+ iconCls : 'icon_search',
+ handler : function() {
+ var tousseDefinitionID = tousseDefinitionIDQuery;
+ var toussepackingName = escapeText(toussepackingNameQuery);
+ window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
+ "?resolution=1980" +
+ "&tousseDefinitionID=" + tousseDefinitionID +
+ "&tousseName=" + toussepackingName +
+ "&number=1&showToussePictures=true",
+ 'tousseImages', '_self');
+ }
+ },{
+ xtype : 'button',
+ text : '添加质量监测',
+ minWidth : 70,
+ iconCls : 'icon_set',
+ handler : function() {
+ var name = document.getElementById("materialNameWithAmount").value;
+ var amount = document.getElementById("materialNameWithAmount").getAttribute("amount");
+ var showModals = true;
+ materialCountRecords = [];
+ var data = {
+ "name":name,
+ "amount":amount
+ }
+ var datas = {
+ data:data
+ }
+ materialCountRecords.push(datas);
+ addQualityMonitoringByResponPart('清洗消毒');
+ }
+ }],
+ items : [{
+ layout : 'column',
+ labelWidth : 60,
+ width : 1000,
+ items : [{
+ columnWidth : .25,
+ layout : 'form',
+ labelWidth : 100,
+ items : [{
+ xtype : 'textfield',
+ fieldLabel : '扫描条码',
+ name : 'barcodeSearch',
+ id : 'barcodeSearch',
+ anchor : '95%',
+ listeners : {
+ specialkey : function(field, ee) {
+ if (ee.getKey() == Ext.EventObject.ENTER) {
+ reloadReport();
+ }
+ }
+ }
+ }]
+ },{
+ layout:'form',
+ columnWidth:.4,
+ labelWidth:100,
+ items:[{
+ xtype : 'combo',
+ id : 'toussepackingName',
+ name : 'toussepackingName',
+ fieldLabel : '器械包名称',
+ labelWidth : 50,
+ queryParam : 'spell',
+ minChars : 0,
+ valueField : 'name',
+ displayField : 'name',
+ pageSize : 10,
+ store : appDepartJsonStore2,
+ listWidth:400,
+ forceSelection : false,
+ lazyInit : true,
+ triggerAction : 'all',
+ hideTrigger : true,
+ typeAhead : false,
+ anchor : '95%',
+ listeners:{
+ select : function(thisCombo, record, index) {
+ tousseDefinitionIDQuery = record.data.id;
+ toussepackingNameQuery = record.data.name;
+ }
+ }
+ }]
+ }]
+ }]
+ });
+
+
+ var reportForm = new Ext.Panel({
+ frame:false,//渲染面板
+ autoScroll:true,//自动显示滚动条
+ collapsible:true,//允许展开和收缩
+ bodyPadding:5,
+ html:''
+
+ });
+
+ var viewport = new Ext.Viewport({
+ layout : 'border',
+ items : [form, {
+ region : 'center',
+ margins : '0 0 0 0',
+ layout : 'fit',
+ items : reportForm
+ }]
+ });
+});
+
Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
===================================================================
diff -u -r25857 -r25864
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 25857)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 25864)
@@ -1,175 +1,95 @@
-<%@ page contentType="text/html; charset=UTF-8"%>
-
-<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
-
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.Constants"%>
+<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%>
+<%@page import="java.util.Map"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
+<%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%>
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@page import="java.util.List"%>
+<%@page import="com.forgon.disinfectsystem.common.*"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
+<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
+<%@page contentType="text/html; charset=UTF-8"%>
+<%@include file="/common/taglibs.jsp"%>
+<%
+ LoginUserData loginUser = AcegiHelper.getLoginUser();
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ String orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig();
+ String orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig();
+ double toussePriceFluctuation = supplyRoomConfigManager.getSystemParamsObj().getToussePriceFluctuation();
+ SupplyRoomConfig syscfg = supplyRoomConfigManager.getSystemParamsObj();
+
+ request.setAttribute("toussePriceFluctuation",toussePriceFluctuation);
+ request.setAttribute("orgUnitName",orgUnitName);
+ request.setAttribute("orgUnitCoding",orgUnitCoding);
+ request.setAttribute("userName",loginUser.getUserFullName());
+ request.setAttribute("userLoginName",loginUser.getUserName());
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ request.setAttribute("today", dateFormat.format(new Date()));
+ request.setAttribute("hospitalName", loginUser.getHospitalName());
+ request.setAttribute("foreignDefaultLabelpaper", syscfg.getBarcodePaperType());
+ String projectName = CssdUtils.getConfigProperty("project");
+ request.setAttribute("projectName", projectName);
+ %>
+
+ <%@ include file="/common/include_Ext42_Css.jsp"%>
-
+
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/include_Ext42_Js.jsp"%>
+
+
+
+<
+
仪器图谱
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file