Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r34767 -r34984 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 34767) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 34984) @@ -302,6 +302,16 @@ {header : "回收状态",width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor}, {header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor}, {header : "终止状态",width : 70,dataIndex : 'endStatus'}, + {header : "已打印统计表",width : 100,dataIndex : 'printedStatisticalTable',hidden:!sstsConfig.enableTheFunctionOfPrintProcessingOfForeignTousse,renderer:function(v, p, record){ + var fontColor = '#000'; + var color = ''; + if(v == '是'){ + color = '#fff';//白色 + }else { + color = "red"; + } + return "
" + v + "
"; + }}, {header : "查看发货单",hidden : true,width : 70,align :'center',renderer: function(v,p,record){ var invoiceStatus = record.data.deliverStatus; if(invoiceStatus == "已发货" || invoiceStatus == "部分发货"){ @@ -345,6 +355,7 @@ {name : 'remark'}, {name : 'urgencyNum'}, {name : 'handleDepartCoding'}, + {name : 'printedStatisticalTable'}, {name : 'handleDepart'}, {name : 'supplierContactName'} ]; @@ -369,6 +380,7 @@ {type: 'string', dataIndex: 'returnMan'}, {type: 'string', dataIndex: 'returneeOfSupplier'}, {type: 'date', dataIndex: 'returnTime'}, + {type: 'string', dataIndex: 'printedStatisticalTable'}, {type: 'string', dataIndex: 'remark'} ] });