Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r20183 -r20197 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 20183) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 20197) @@ -2185,13 +2185,13 @@ } //预览表格列 content +="" - +" " + itemsList[i].diposableGoods.name+ (b == false?"":" ["+specification+"]") - +""+ itemsList[i].batchNumber - +""+ amount - +""+ cost - +""+ amount*cost - +"" + itemsList[i].supplierName - +"" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd"); + +" " + itemsList[i].diposableGoods.name+ (b == false?"":" ["+specification+"]") + +""+ itemsList[i].batchNumber + +""+ amount + +""+ cost + +""+ amount*cost + +"" + (itemsList[i].supplierName == ""?' ':itemsList[i].supplierName) + +"" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd"); +""+""; } } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js =================================================================== diff -u -r19757 -r20197 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 19757) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownOutView.js (.../godownOutView.js) (revision 20197) @@ -1277,12 +1277,12 @@ //预览表格列 content +="" +" " + itemsList[i].diposableGoods.name+ (b == false?"":" ["+specification+"]") - +""+ itemsList[i].batchNumber - +""+ amount - +""+ cost - +""+ amount*cost - +""+ itemsList[i].supplierName - +"" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd") + +""+ itemsList[i].batchNumber + +""+ amount + +""+ cost + +""+ amount*cost + +""+ (itemsList[i].supplierName == ""?' ':itemsList[i].supplierName) + +"" + new Date(itemsList[i].expDate.time).Format("yyyy-MM-dd") +""+""; } }