Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js =================================================================== diff -u -r38727 -r38774 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js (.../headerColumn.js) (revision 38727) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/headerColumn.js (.../headerColumn.js) (revision 38774) @@ -39,29 +39,35 @@ width: '25%', align: 'left' }, { - header: "申请", - dataIndex: 'totalAmount', + header: "加急待处理(包)", + dataIndex: 'tiUrgentAmount', width: '15%', align: 'center' }, { - header: "已回收", + header: "当前申请", + dataIndex: 'notRecycledUrgentAmount', + width: '12%', + align: 'center' +}, { + header: "当前已回收", dataIndex: 'recyUrgentAmount', - width: '15%', + width: '12%', align: 'center' }, { - header: "已装配", + header: "当前已装配", dataIndex: 'packAmount', - width: '15%', + width: '12%', align: 'center' }, { - header: "已灭菌", + header: "当前已灭菌", dataIndex: 'steMount', - width: '15%', + width: '12%', align: 'center' }, { header: "已发货", dataIndex: 'invoiceAmount', - width: '15%', + width: '12%', + color: '#ffff00', align: 'center' }]; //今日器械包汇总 Index: ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js =================================================================== diff -u -r38735 -r38774 --- ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38735) +++ ssts-web/src/main/webapp/disinfectsystem/realTimeDashboards/js/index.js (.../index.js) (revision 38774) @@ -421,7 +421,7 @@ var html = ''; html += '
'; for (var k = 0; k < urgentGoodsDetailsHeaders.length; k++) { - html += '' + urgentGoodsDetailsHeaders[k].header + ''; + html += '' + urgentGoodsDetailsHeaders[k].header + ''; } html += '
'; html += '
'; @@ -434,15 +434,15 @@ for (var i = 0; i < data.length; i++) { html += '
'; for (var k = 0; k < urgentGoodsDetailsHeaders.length; k++) { - html += '' + (data[i][urgentGoodsDetailsHeaders[k].dataIndex] || 0) + ''; + html += '' + (data[i][urgentGoodsDetailsHeaders[k].dataIndex] || 0) + ''; } html += ''; html += '
'; } } html += '
'; $('#urgentGoodsDetails').html(html) - $('#invoicePlanUrgentAmountID').text(urgentSumInfo.invoicePlanUrgentAmount); + $('#totalUrgentAmountID').text(urgentSumInfo.totalUrgentAmount); $('#sendOutUrgentAmountID').text(urgentSumInfo.sendOutUrgentAmount); $('#toBeSendOutUrgentAmountID').text(urgentSumInfo.toBeSendOutUrgentAmount); } @@ -1005,7 +1005,7 @@ function urgentGoodsDetailsBox(title) { var html = ''; html += '
'; - html += '

' + title + '

加急总包数
0

加急发放包数
0

加急待发放包数
0

'; + html += '

' + title + '

加急总包数
0

加急发放包数
0

加急待发放包数
0

'; html += '
'; html += '
'; html += '
数据加载中,请稍后...
';