Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r14553 -r16002 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 14553) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 16002) @@ -27,6 +27,7 @@ var statusUsed = '<%=TousseInstance.STATUS_USED%>'; var statusSigned = '<%=TousseInstance.STATUS_SIGNED%>'; var statusDiscard = '<%=TousseInstance.STATUS_DISCARD%>'; + var statusDelayConfirm = '<%=TousseInstance.STATUS_DELAY_CONFIRM%>'; var statusDisinfected = '<%=TousseInstance.STATUS_DISINFECTED%>'; //增加一个已消毒的过滤条件(陈家儒改) statusArr.push([statusPacked]); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r15921 -r16002 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15921) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 16002) @@ -902,9 +902,11 @@ if(sr != null){ map.put("sterilizationRecordID", sr.getId()); map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount()); + map.put("sterilizationFinishConfirm", sr.getSrSituationComfirmer()); }else{ map.put("sterilizationRecordID", 0); map.put("sterilizerRecordAmounts", 0); + map.put("sterilizationFinishConfirm", ""); } try { JSONObject jsonObject = JSONObject.fromObject(map, config); Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r15179 -r16002 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 15179) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 16002) @@ -77,7 +77,7 @@ {header : "科室",width : 80,dataIndex : 'depart'}, {header : "条码",width : 70,dataIndex : 'barcode'}, {header : "标识牌条码",width : 70,dataIndex : 'idCardInstanceBarcode'}, - {header : "状态",width : 50,dataIndex : 'status'}, + {header : "状态",width : 80,dataIndex : 'status'}, {header : "位置",width : 80,dataIndex : 'locationForDisplay'}, {header : "所属仓库",width : 80,dataIndex : 'wareHouseName'}, {header : "清洗人",width : 60,dataIndex : 'washOperator',sortable: false}, @@ -144,7 +144,7 @@ {type : 'string',dataIndex : 'idCardInstanceBarcode'}, {type : 'string',dataIndex : 'operator'}, {type : 'date',dataIndex : 'operationTime'}, - {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed, statusDiscard, statusDisinfected],phpMode : true}, //增加一个已消毒的过滤条件(陈家儒改) + {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, //增加一个已消毒的过滤条件(陈家儒改) {type : 'string',dataIndex : 'stockBarcode'}, {type : 'string',dataIndex : 'sterilingType'}, {type : 'date',dataIndex : 'validUntil'}, Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r15391 -r16002 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 15391) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 16002) @@ -275,7 +275,22 @@ cls : 'fieldReadOnlyNoRemove' }] },{ + columnWidth : .5, layout : 'form', + cls:'edit-part2-labelwidth', + hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm), + items : [{ + id : 'sterilizationFinishConfirm', + name : 'sterilizationFinishConfirm', + xtype : 'textfield', + fieldLabel : '灭菌确认人', + anchor : '100%', + readOnly : true, + cls : 'fieldReadOnlyNoRemove' + }] + + },{ + layout : 'form', columnWidth : .5, cls:'edit-part2-labelwidth', items : [{ @@ -824,6 +839,7 @@ top.Ext.getCmp('sterilizationType').setValue(instance.sterilingType); top.Ext.getCmp('frequency').setValue(instance.sterileFrequency); top.Ext.getCmp('sterilizationUser').setValue(instance.sterilizationUser); + top.Ext.getCmp('sterilizationFinishConfirm').setValue(result.sterilizationFinishConfirm); top.Ext.getCmp('sterilizationBasket').setValue(instance.sterilizationBasket); top.Ext.getCmp('startDate').setValue(instance.sterileStartTime); top.Ext.getCmp('endDate').setValue(instance.sterileEndTime);