Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r22527 -r22579 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22527) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22579) @@ -372,6 +372,7 @@ ,{name : 'depart'} ,{name : 'remark'} ,{name : 'applicationGoodsVos'} + ,{name : 'sent'} ,{name : 'urgency'} ] }) @@ -401,6 +402,11 @@ if (remark.indexOf("借物单") != -1){ return 'BorrowList'; } + if(sstsConfig.invoicePlanList_notice_auxiliaryInvoice_history){ + if(record.data.sent){ + return 'invoicePlanList_notice_auxiliaryInvoice_history'; + } + } } }, loadMask:{msg:'正在加载，请稍候...'}, Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js =================================================================== diff -u -r22403 -r22579 --- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 22403) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js (.../auxiliaryInvoiceForm.js) (revision 22579) @@ -289,6 +289,11 @@ name : 'id', id : 'id' },{ + xtype :'hidden', + id : 'auxiliaryInvoice', + name : 'auxiliaryInvoice', + value: true + },{ xtype : 'hidden', name : 'sendOutGoodsStoreData', id : 'sendOutGoodsStoreData' Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp =================================================================== diff -u -r22464 -r22579 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 22464) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp (.../invoicePlanExtractedView.jsp) (revision 22579) @@ -14,7 +14,9 @@ .BorrowList table{ background-color:yellow; } - + .invoicePlanList_notice_auxiliaryInvoice_history { + background-color: #ffff80; + } Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js =================================================================== diff -u -r22403 -r22579 --- ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 22403) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy/config.js (.../config.js) (revision 22579) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 禁用标识牌功能 disableIdCard : false, // 审核器械包必须入篮筐（一级供应室） @@ -120,6 +120,8 @@ messagePauseTimeOnSterilizationRecordPage:1, //发货计划页面消息提示筐的默认停留时间(单位:秒) messagePauseTimeOnInvoiceplanPage:1, + // 发货计划列表提示辅助发货的历史 + invoicePlanList_notice_auxiliaryInvoice_history: true, //是否启用新的年度消毒供应中心工作量统计报表 enableNewYearWorkloadReport : true } \ No newline at end of file