Index: ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js
===================================================================
diff -u -r37820 -r37883
--- ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 37820)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsdsrmyy/config.js (.../config.js) (revision 37883)
@@ -312,6 +312,8 @@
recycleAllTousseIntoBasketInExpressRecycle:true,
//启用器械包信息模块不导出已过滤的数据
enableFilteredDataIsNotExportedOfTousseInstanceView:true,
+//是否在回收清点模块显示回收时间
+enableDisplayRecyclingTimeOfrecyclingRecordList:true,
//回收是否修改申请单备注,true修改
modifyRemarkInRecycling:true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r37873 -r37883
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37873)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 37883)
@@ -108,6 +108,19 @@
font-size:22px;
color:#2e6271;
}
+.recycleTimeTr {
+ display: none;
+}
+.recycleTime{
+ padding: 5px 0;
+ font-size: 14px !important;
+}
+.recycleTime span{
+ font-size: 14px !important;
+ cursor: pointer;
+ color:blue;
+}
+
.recycleRemarkTr{
display: none;
}
@@ -380,6 +393,25 @@
+
+
+
+
+
+
+ 回收时间 |
+ 器械包名称 |
+ 回收数量 |
+
+
+
+
+
+
+
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37873 -r37883
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37873)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37883)
@@ -2594,21 +2594,33 @@
}
//SZSDSRMYY-128:显示对应物品的所有已回收物品的回收时间
-// function openRecyclingTimeList(row){
-// $("#recycleTimeList").dialog({
-// resizable: false,
-// height: 530,
-// width: 800,
-// title: '回收时间列表',
-// modal: true,
-// open: function () {
-// $("#recycleTimeListBox").show()
-// },
-// close: function () {
-// //$("#confirmMsg").html("");
-// }
-// });
-// }
+function openRecyclingTimeList(row){
+ $("#recycleTimeList").dialog({
+ resizable: false,
+ height: 530,
+ width: 800,
+ title: '回收时间列表',
+ modal: true,
+ open: function () {
+ var html = '';
+ var recyclingDateDetails = $('#recyclingDateDetails' + row).val();
+ recyclingDateDetails = JSON.parse(recyclingDateDetails);
+ var tousseName = $('#tousseName' + row).val();
+ for(var i=0;i';
+ html += ''+recyclingDateDetails[i].recyclingDate+' | ';
+ html += ''+tousseName+' | ';
+ html += ''+recyclingDateDetails[i].amount+' | ';
+ html += '';
+ }
+ $("#recycleTimeListTbody").html(html)
+ $("#recycleTimeListBox").show()
+ },
+ close: function () {
+ $("#recycleTimeListTbody").html("");
+ }
+ });
+}
// 打开器械包加急的窗口
function openSetUrgentAmountPage(row, packed) {
@@ -4095,6 +4107,9 @@
var barcode = toussItem.barcode ? toussItem.barcode : "";
var materials = "";
var taskGroup = toussItem.taskGroup || '';
+ var lastRecyclingDate = toussItem.lastRecyclingDate || '';
+ var recyclingDateDetails = toussItem.recyclingDateDetails || [];
+
var b = true;
$('#tousseItemTable').children().first().children().each(function (i, element) {
var newTousseDefinitionID = $('#tousseDefinitionID' + i).val();
@@ -4288,7 +4303,10 @@
'丢失 | ' +
'报损 | ' +
'删除 | ';
- //trStr += ' | 上次回收时间:2023-02-02 23:15 查看详细 |
';
+ if(lastRecyclingDate !== ''){
+ trStr += '';
+ trStr += ' | 上次回收时间:' + lastRecyclingDate + ' 查看详细 |
';
+ }
trStr += '';
trStr += '';
trStr += '';
@@ -7277,7 +7295,9 @@
taskGroup: tousseItem.taskGroup,
recyclingItemId: tousseItem.id,
colorCode: tousseItem.colorCode || '',
- packed: tousseItem.packed
+ packed: tousseItem.packed,
+ lastRecyclingDate: tousseItem.lastRecyclingDate,
+ recyclingDateDetails: tousseItem.recyclingDateDetails
};
if (application != null && application.applicationItems != null) {
for (var k = 0; k < application.applicationItems.length; k++) {
@@ -7549,9 +7569,9 @@
}
$('.btn-box').css('display', 'block');
//SZSDSRMYY-128:显示回收时间
- // if(sstsConfig.enableDisplayRecyclingTimeOfrecyclingRecordList){
- // $('.recycleTimeTr').show();
- // }
+ if(sstsConfig.enableDisplayRecyclingTimeOfrecyclingRecordList){
+ $('.recycleTimeTr').show();
+ }
}
$('#tousseItemTable').children().first().children().each(function (i, element) {
var tousseDefinitionID = $('#tousseDefinitionID' + i).val();