Fisheye: Tag 27541 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js'.
Fisheye: No comparison available. Pass `N' to diff?
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r27527 -r27541
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27527)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27541)
@@ -277,11 +277,6 @@
var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>';
var projectName = '<%=request.getAttribute("projectName")%>';
var parm_s_type ="质量监测";
-var routineMonitoring_type ="定期监测";
-var formType_routineMonitoring = '<%=FormDefinition.FOMRTYPE_PERIODICMONITORING%>';
-var formType_qualityMonitoring = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>';
-var moduleNameArr2 = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
-
//回收记录
var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>';
//申请单
@@ -341,11 +336,6 @@
SSTS_SystemWarning_TousseGoods_delete = false;
-var SSTS_RoutineMonitoring_Create = true;
-
" + v + "
"; -} - -function openSterilizerRecord(id){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerRecordView.jsp?popType=true&sterilizationRecordId='+id,'', '灭菌器参数', '1000', '550'); -} - -function openSterilizerRecordLineChart(id){ - openModalWindowForExt(WWWROOT+'/disinfectsystem/sterilizationmanager/sterilizerRecord/sterilizerLineChart.jsp?sterilizationRecordId='+id,'', '灭菌器参数', '1050', '550'); -} -function renderBiologicalMonitoringStatus(v, p, record) { - if (v == '进行中') { - return "" + v + ""; - }else if(v == '已结束'){ - return "
" + v + ""; - } else if(v == '已确认') { - return "
" + v + "";
- } else {
- return v;
- }
-}
-/**
- * 请求服务器,生成时间筛选对应的值
- * @returns {[*,*,*,*,*]}
- */
-function getTimeComboData() {
- var dateHelper = new DateHelper();
- var applyDateDataArray = [];
- var format = 'yyyy-MM-dd HH:mm';
- var url = WWWROOT + '/system/serverTimeAction!getInvoicePlanComboTime.do';
- dateHelper.getServerTimeByJQ(format, Ext, url, function (result) {
- var time = result.time;
- applyDateDataArray.push(['今天', time.todayTime]);
- applyDateDataArray.push(['昨天', time.yesterdayTodayTime]);
- applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
- applyDateDataArray.push(['一周内', time.withinWeekTodayTime]);
- });
- return applyDateDataArray;
-}
-Ext.onReady(function() {
- Ext.QuickTips.init();
- // 记录cookie(3步)
-
- var columns = [
- {header : "灭菌员",width : 120,dataIndex : 'sterilizationUser', renderer : renderCallModifyFunction},
- {header : "开始时间",width : 125,dataIndex : 'startDate',renderer : myDateFormatByMinute},
- {header : "确认完成人",width : 70,dataIndex : 'finishComfirmer'},
- {header : confirmUserName,width : 110,dataIndex : 'srSituationComfirmer',hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm)},
- {header : confirmTimeName,width : 130,dataIndex : 'srSituationComfirmTime',hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm)},
- {header : "结束时间",width : 125,dataIndex : 'endDate',renderer : myDateFormatByMinute},
- {header : "灭菌目的",width : 120,dataIndex : 'sterilizationPurpose'},
- {header : "灭菌炉",width : 160,dataIndex : 'sterilizer.name'},
- {header : "炉次",width : 40,dataIndex : 'frequency'},
- {header : "灭菌状态",width : 60,dataIndex : 'status', renderer : renderColor},
- {header : "生物监测状态",width : 80,dataIndex : 'biologicalMonitoringStatus',renderer : renderBiologicalMonitoringStatus, hidden : !sstsConfig.showBiologicalMonitoringStatus},
- {header : "物理监测结果",width : 105,dataIndex : 'physicsResult'},
- {header : "化学监测结果",width : 105,dataIndex : 'chemistryResult'},
- {header : "生物监测结果",width : 105,dataIndex : 'biologyResult'},
- {id : 'SterilizationType',header : "灭菌程序",width : 60,dataIndex : 'sterilizationType'},
- {header : "灭菌总数量",width : 70,dataIndex : 'amount'},
- {header : "灭菌器参数",width : 70,dataIndex : 'sterilizerRecordAmount',sortable :false,renderer: function(v,p,record){
- if(record.data.sterilizerRecordAmount > 0){
- return "";
- }else{
- return null;
- }
- }},
- {header : "打印状态",width : 70,dataIndex : 'printStatus',hidden : !printConfig.sterilizationRecordDetail},
- {header : "备注",width : 150,dataIndex : 'remark'},
- {header : "查看灭菌图片",width : 150,dataIndex : 'isExist',hidden:showSterilizationImgIcon,renderer:function(v,p,record){
- if(record.data.isExist ==true){
- return "
";
- }else{
- return null
- }
- },sortable: false,menuDisabled : true},
- {id : 'action',header : "操作",width : 70,dataIndex : 'status',renderer : actionFun}
-
- ];
-
- var filters = new Ext.grid.GridFilters({
- filters : [
- {type : 'string',dataIndex : 'sterilizationUser'},
- {type : 'string',dataIndex : 'finishComfirmer'},
- {type : 'string',dataIndex : 'srSituationComfirmer'},
- {type : 'string',dataIndex : 'srSituationComfirmTime'},
- {type : 'date',dataIndex : 'startDate'},
- {type : 'date',dataIndex : 'endDate'},
- {type : 'string',dataIndex : 'sterilizationPurpose'},
- {type : 'string',dataIndex : 'sterilizationType'},
- {type : 'string',dataIndex : 'sterilizer.name'},
- {type : 'numeric',dataIndex : 'frequency'},
- {type : 'string',dataIndex : 'biologicalMonitoringStatus'},
- {type : 'string',dataIndex : 'physicsResult'},
- {type : 'string',dataIndex : 'chemistryResult'},
- {type : 'string',dataIndex : 'biologyResult'},
- {type : 'string',dataIndex : 'printStatus'},
- {type : 'string',dataIndex : 'isExist'},
- {type : 'list',dataIndex : 'status',options : [statusBegin, statusEnd, statusFailure],phpMode : true
- }]
- });
-
- var readerDetail = [
- {name : 'id'},
- {name : 'sterilizationUser'},
- {name : 'finishComfirmer'},
- {name : 'srSituationComfirmer'},
- {name : 'srSituationComfirmTime'},
- {name : 'startDate'},
- {name : 'sterilizationPurpose'},
- {name : 'sterilizationType'},
- {name : 'sterilizer.name'},
- {name : 'status'},
- {name : 'endDate'},
- {name : 'packageSterilizationCount'},
- {name : 'frequency'},
- {name : 'sterilizerRecordAmount'},
- {name : 'amount'},
- {name : 'printStatus'},
- {name : 'physicsResult'},
- {name : 'chemistryResult'},
- {name : 'biologyResult'},
- {name : 'biologicalMonitoringStatus'},
- {name : 'remark'},
- {name : 'isExist'}
- ];
-
- var sign = true;
- var tbar = null;
- if(isQueryToday){
- tbar = [{
- text : '添加',
- hidden : SSTS_Sterilization_Create,
- iconCls : 'btn_ext_application_add',
- id : 'addBtn',
- handler : function() {
- addAndEditSterilizationRecord(0,'',false);
- }
- }, '-', {
- text : '修改',
- hidden : SSTS_Sterilization_Update,
- iconCls : 'btn_ext_application_edit',
-// id : 'editTbar',
- id : 'modifyBtn',
- handler : function() {
- loadFormData(grid);
- }
- }, '-', {
- text : '完成灭菌',
- hidden : SSTS_Sterilization_Update,
- iconCls : 'btn_ext_application_save',
-// id : 'editTbar',
- id : 'completeSterilizationBtn',
- handler : function() {
- sterilizationComplete(grid,statusEnd);
- }
- }, '-', {
- text : '灭菌中断',
- hidden : SSTS_Sterilization_Update,
- iconCls : 'btn_ext_application_error',
-// id : 'failureTbar',
- id : 'sterilizationInterruptBtn',
- handler : function() {
- sterilizerStatus = statusInterrupt;
- sterilizationInterrupt(grid,statusInterrupt);
- }
- }, '-', {
- text : '灭菌失败',
- hidden : SSTS_Sterilization_Update,
- iconCls : 'btn_ext_application_error',
-// id : 'failureTbar',
- id : 'sterilizationFailureBtn',
- handler : function() {
- sterilizerStatus = statusFailure;
- sterilizationFailure(grid,statusFailure);
- }
- },{
- text : confirmBtn,
- hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm),
- iconCls : 'btn_ext_application_error',
-// id : 'confirmTbar',
- id : 'confirmBtn',
- handler : function() {
- sterilizationConfirm(grid);
- }
-
- }, {
- text : '删除',
- hidden : SSTS_Sterilization_Delete,
- iconCls : 'btn_ext_application_del',
- id : 'deleteBtn',
- handler : function() {
- deleteSterilizationRecord(grid);
- }
- },'-', {
- text : '查看灭菌记录图片',
- hidden : SSTS_Sterilization_Update,
- iconCls : 'btn_ext_application_search',
- handler : function() {
- showSterilizationRecordPicture(grid);
- }
- },'-',{
- text : '添加质量监测',
- hidden:SSTS_QualityRecord_Create,
- iconCls : 'btn_ext_application_add',
- handler : function() {
- addQualityMonitoring1();
- }
- },'-',{
- text : '添加定期监测',
- hidden:SSTS_RoutineMonitoring_Create,
- iconCls : 'btn_ext_application_add',
- handler : function() {
- addRoutineMonitoringSterilization();
- }
- },'-',{
- text : '刷新',
- iconCls : 'btn_ext_refresh1',
- handler : function() {
- grid.getStore().reload();
- }
- },'-',{
- text : '打印',
- iconCls : 'icon_print',
- hidden : !printConfig.sterilizationRecordDetail,
- handler : function() {
- printSterilizationRecord(grid);
- }
- },{id:'formSubmitResult',xtype:'hidden',value:'0'},{id:'continueSubmitResult',xtype:'hidden',value:'0'},{id:'qmSubmitResult',xtype:'hidden',value:'0'}];
- }else{
- tbar = [{
- text : '删除',
- hidden : SSTS_Sterilization_Delete,
- iconCls : 'btn_ext_application_del',
- handler : function() {
- deleteSterilizationRecord(grid);
- }
- },'-', {
- text : '查看灭菌记录图片',
- hidden : SSTS_Sterilization_Update,
- tooltip : '查看灭菌记录图片',
- iconCls : 'btn_ext_application_search',
- handler : function() {
- showSterilizationRecordPicture(grid);
- }
- },'-',{
- text : '添加质量监测',
- hidden:SSTS_QualityRecord_Create,
- iconCls : 'btn_ext_application_add',
- handler : function() {
- addQualityMonitoring1();
- }
- },'-',{
- text : '刷新',
- iconCls : 'btn_ext_refresh1',
- handler : function() {
- grid.getStore().reload();
- }
- },'-',{
- text : '打印',
- iconCls : 'icon-print',
- hidden : !printConfig.sterilizationRecordDetail,
- handler : function() {
- printSterilizationRecord(grid);
- }
- },{id:'formSubmitResult',xtype:'hidden',value:'0'},{id:'continueSubmitResult',xtype:'hidden',value:'0'},{id:'qmSubmitResult',xtype:'hidden',value:'0'}];
- }
+ <%--引入dwr框架 --%>
+
+
+
+
+
+
+
+
- if(pop){
- tbar= [{
- text:'确定',
- iconCls:'btn_create',
- handler:okData
- },{id:'formSubmitResult',xtype:'hidden',value:'0'},{id:'continueSubmitResult',xtype:'hidden',value:'0'},{id:'qmSubmitResult',xtype:'hidden',value:'0'}]
- }
+ <%--引入自己的js --%>
+
+
+
+ <%--完成灭菌 --%>
+ <%--灭菌监测 --%>
+ <%--完成查看灭菌记录图片 --%>
+ <%--填写质量监测 --%>
- var dwrCallParams = null;
+
+
+
+
+
- Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {
-
- };
-
- if((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm){
- $Id("parm_s_needFinishConfirm").value = "true";
- }
+
+ + | +