Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r26412 -r26923 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 26412) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 26923) @@ -1869,6 +1869,7 @@ {header : "住院号",width : 70,dataIndex : 'hospitalNumber'}, {header : "签收人",width : 70,dataIndex : 'receiptor'}, {header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute}, + {header : "签收状态",width : 100,dataIndex : 'signStatus'}, {header : "结算科室",width : 100,dataIndex : 'settleAccountsDepart'}, {header : "仓库",width : 100,dataIndex : 'warehouseName',id : 'warehouseName'}, {header : "总价",width : 70,dataIndex : 'totalPrice',align : 'right',renderer : formartPrice} @@ -1896,6 +1897,7 @@ {name : 'invoicePlan'}, {name : 'receiptor'}, {name : 'receiptingTime'}, + {name : 'signStatus'}, {name : 'personInCharge'}, {name : 'warehouseName'}, {name : 'applicant'}, @@ -1916,7 +1918,8 @@ {type : 'string',dataIndex : 'invoicePlanType'}, {type : 'numeric',dataIndex : 'totalPrice'}, {type : 'string',dataIndex : 'hospitalNumber'}, - {type : 'string',dataIndex : 'remark'} + {type : 'string',dataIndex : 'remark'}, + {type: 'list',dataIndex:'signStatus', phpMode:true ,options:receiptingStatusArr} ] });