Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r33292 -r33447
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33292)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 33447)
@@ -3312,7 +3312,7 @@
if (tousseType != '一次性物品') {
var isComboTousse = (tousseType == '聚合包');
//点击条码链接显示器械包实例的追溯信息
- content = "" + barcode + "";
+ content = "" + barcode + "";
} else {
content = barcode;
}
@@ -3334,7 +3334,7 @@
if (isShowColor) {
if (tousseType != '一次性物品') {
var isComboTousse = (tousseType == '聚合包');
- content = "" + barcode + "";
+ content = "" + barcode + "";
}
return '
' + content + '
';
} else {
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r33433 -r33447
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 33433)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 33447)
@@ -121,6 +121,7 @@
var ACTION_TYPE_UPDATE = '<%=ForeignTousseApplication.ACTION_TYPE_UPDATE%>'; //修改
var foreignTousseApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION%>';//外来器械包申请单
var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>';
+ var imageTypeTousseInstanceCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>';
//视频类型(装配采集视频)
var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>';
//包大小定义
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js
===================================================================
diff -u -r28639 -r33447
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 28639)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereUseRecordForm.js (.../interfereUseRecordForm.js) (revision 33447)
@@ -1455,7 +1455,7 @@
var barcode = v ? v : "";
if (tousseType != '一次性物品') {
var isComboTousse = (tousseType == '聚合包');
- return "" + barcode + "";
+ return "" + barcode + "";
} else {
return barcode;
}