Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js =================================================================== diff -u -r27566 -r29345 --- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 27566) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 29345) @@ -110,6 +110,8 @@ showInvoiceAssistantSender : false, //是否显示发货计划下送责任人 showInvoicePersonInCharge : false, + //发货科室依据,departCoding为申请科室,settleAccountsDepartCoding为结算科室,默认为申请科室 + invoice_groupBy:'settleAccountsDepartCoding', //启用是否发货 enableIsInvoice : true, //发货界面,是否启用保存并打印按钮。 @@ -153,5 +155,9 @@ //发货计划页面消息提示筐的默认停留时间(单位:秒) messagePauseTimeOnInvoiceplanPage:6, //禁用基数限制 - disableCardinalNumLimit:true + disableCardinalNumLimit:true, +//PDA上是否启用器械包签收功能 + enablePDATousseSign:true, + //PDA签收模式 + signModeOfPDASignModule:3 } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js =================================================================== diff -u -r28855 -r29345 --- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 28855) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 29345) @@ -259,9 +259,10 @@ headRepeat : false, columns : [ {header : "序号", dataIndex : 'serialNumber', width :"10%", align : 'center', fontSize : 10}, - {header : "名称", dataIndex : 'name', width :"80%", fontSize : 11}, - {header : "数量", dataIndex : 'amount', width :"10%",align : 'center' , fontSize : 11} - + {header : "名称", dataIndex : 'name', width :"60%", fontSize : 11}, + {header : "数量", dataIndex : 'amount', width :"10%",align : 'center' , fontSize : 11}, + {header : "单价", dataIndex : 'price', width : "10%", align : 'right', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : "10%", align : 'right', fontSize : 11} ] } }