Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r24922 -r24929 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24922) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24929) @@ -59,8 +59,20 @@ columns.push({id: "submitTimeStr",name : '最后修改时间',field : 'submitTimeStr'}); columns.push({id: "printTimeStr",name : '打印时间',field : 'printTimeStr'}); columns.push({id: "type",name : '类型',field : 'type'}); - columns.push({id: "committedStatus",name : '已提交',field : 'committedStatus'}); - columns.push({id: "printed",name : '已打印',field : 'printed'}); + columns.push({id: "committedStatus", + name : '已提交', + field : 'committedStatus', + formatter:function(row,cell,value,columnDef,dataContext){ + return value == true ? "是":"否"; + } + }); + columns.push({id: "printed", + name : '已打印', + field : 'printed', + formatter:function(row,cell,value,columnDef,dataContext){ + return value == '0' ? "是":"否"; + } + }); columns.push({id: "recyclingStatus",name : '回收状态',field : 'recyclingStatus'}); columns.push({id: "deliverStatus",name : '发货状态',field : 'deliverStatus'}); columns.push({id: "returnStatus",name : '归还状态',field : 'returnStatus'}); Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r24922 -r24929 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 24922) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 24929) @@ -238,7 +238,7 @@ tousseName_tousse_select.text(''); tousseName_tousse_number.val(''); appToussesArr.push(appendContent); - $("#tousseAppForm").s_validate('destroy','tousseName_tousse_select'); +// $("#tousseAppForm").s_validate('destroy','tousseName_tousse_select'); } });