Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js
===================================================================
diff -u -r34753 -r34758
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js (.../unReturnTousseList.js) (revision 34753)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js (.../unReturnTousseList.js) (revision 34758)
@@ -20,7 +20,7 @@
var columns = [
{ header: "仪器名称", dataIndex: 'tousseName', width: 150, sortable: false },
{ header: "器械包条码", dataIndex: 'barcode', width: 100, sortable: false },
- { header: "标识牌条码", dataIndex: '', width: 100, sortable: false },
+ { header: "标识牌条码", dataIndex: 'idCardInstanceBarcode', width: 100, sortable: false },
{ header: "数量", dataIndex: 'invoiceAmount', width: 80, sortable: false },
{ header: "出库操作人", dataIndex: 'invoiceOperator', width: 80, sortable: false },
{ header: "签收操作人", dataIndex: 'signOperator', width: 80, sortable: false, hidden: isEnableTousseOpSign == 'false' },
@@ -45,7 +45,7 @@
fields: [
{ name: 'tousseName' },
{ name: 'barcode' },
- { name: '' },
+ { name: 'idCardInstanceBarcode' },
{ name: 'invoiceAmount' },
{ name: 'invoiceOperator' },
{ name: 'signOperator' },
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp
===================================================================
diff -u -r34757 -r34758
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp (.../tousseTraceabilityInquiry.jsp) (revision 34757)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp (.../tousseTraceabilityInquiry.jsp) (revision 34758)
@@ -12,15 +12,17 @@
-
+
+
+
+
<%
SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
boolean isEnableTousseOpRecipient = supplyRoomConfig.getIsEnableTousseOpRecipient();
boolean isEnableTousseOpDestLocation = supplyRoomConfig.getIsEnableTousseOpDestLocation();
String filterDepartCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
%>
-