Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r38164 -r38226 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38164) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 38226) @@ -331,7 +331,8 @@ // 打开不同申请科室或者不同资产归属的器械包 function openApplicationTousseSplitByOrgUnit(newTousseArray, tousseArray) { - var table = '
该申请单中以下物品不属于当前回收科室(回收科室名称),请确认是否拆单回收:
'; + var depart = $('#depart').text(); + var table = '
该申请单中以下物品不属于当前回收科室"'+depart+'",请确认需要拆单回收的物品以及所属科室:
'; var name = (sstsConfig.methodOfSplitRecyclingApplication == 2) ? '资产归属' : '所属科室'; table += ''; table += ''; @@ -340,7 +341,7 @@ table += ''; for (var i = 0; i < newTousseArray.length; i++) { table += ''; - table += ''; + table += ''; table += ''; } table += ''; @@ -4941,6 +4942,7 @@ var k = 0; for (var j = 0; j < length; j++) { var tousseName = splitTousseArray2[j].tousseName; + var amount = splitTousseArray2[j].amount; var depart = splitTousseArray2[j].depart; var idCardInstanceBarcode = splitTousseArray2[j].splitTousseBarcodes[0].idCardInstanceBarcode || ''; for (var i = 0; i < tousseArray.length; i++) { @@ -4949,15 +4951,15 @@ if(idCardInstanceBarcode == tousseArray[i].idCardBarcode){ newTousseArray[k] = { tousseName: tousseName, - amount: tousseArray[i].amount, + amount: amount, depart: depart } k++ } }else { newTousseArray[k] = { tousseName: tousseName, - amount: tousseArray[i].amount, + amount: amount, depart: depart } k++
' + newTousseArray[i].tousseName + '' + newTousseArray[i].amount + '' + newTousseArray[i].depart + '' + newTousseArray[i].tousseName + '' + newTousseArray[i].amount + '' + newTousseArray[i].depart + '