Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r22696 -r22726
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 22696)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js (.../config.js) (revision 22726)
@@ -29,20 +29,46 @@
//提交申请单前显示申请的物品清单
showAppliedGoodsBeforeSubmit : false,
//是否启用聚合包功能
- enableComboTousse : true,
+ // enableComboTousse : true,
// 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
useRecordAuditMode : 2,
- hideApplyDepartColumn : true, // 隐藏申请科室
- hideSettleDepartColumn : false, // 隐藏结算科室
+ hideApplyDepartColumn : false, // 隐藏申请科室
+ hideSettleDepartColumn : true, // 隐藏结算科室
companyName : "dingxiang",
// 是否启用高值耗材功能，默认为否
enableExpensiveGoods: true,
//回收一键入筐
recycleAllTousseIntoBasket : true,
- //回收时，申请数量与回收数量不一致，是否要确认
- confirmRecyclingAmount:false,
- //回收时是否可以修改申请单备注
- modifyRemarkInRecycling:true,
+ //是否显示按照时间查询
+ showTimeSearch : true,
+ //科室申领时间过滤,开始日期是否为当天
+ startDateIsToday : true,
+ //是否显示科室分组选择框
+ isShowDeptGroup : true,
+ //不覆盖发货计划的打印时间
+ overWriteInvoicePlanPrintTime:false,
+ //装配界面显示包装人字段
+ showWrapperField : true,
+ //打印发货计划设置页的版本:2
+ printRecyclingConfigFormVersion : 2,
+ //安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开
+ expandAddTousseGroupInAndroidSterileView : true,
+ //是否显示打印过滤选择框
+ showPrintFilter: true,
+ //清洗筐是否装配完成才能回收
+ recycleClassifyBasketAfterPacked:false,
+ //是否禁用人员同步
+ hiddenUserSyncButton: true,
+ //自定义装配后是否保留装配数量
+ packAmountProcessTypeInDirectPackingView: true,
+ //自定义装配后是否保留灭菌日期
+ disinfectionDateProcessTypeInDirectPackingView: true,
+ //是否显示辅助发货按钮
+ showAuxiliaryInvoiceBtn: true,
+ //科室申领中，是否重复打印当天已经打印的申领物品
+ reprintTodayPrintedTousseItem : true,
+ //是否显示按器械包分组选择框
+ isShowTousseGroup : true,
// 高值耗材自助入库验收后是否发货，默认为否
checkedAfterSubmitInvoice : false
}
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml
===================================================================
diff -u -r20381 -r22726
--- ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml (.../HIS.xml) (revision 20381)
+++ ssts-web/src/main/resources/spring/projects/gzszyy/HIS.xml (.../HIS.xml) (revision 22726)
@@ -53,9 +53,9 @@
class="com.mchange.v2.c3p0.ComboPooledDataSource"
destroy-method="close">
-
-
-
+
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
===================================================================
diff -u -r22414 -r22726
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 22414)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 22726)
@@ -171,35 +171,35 @@
fixed:true,//打印表格的时候,表格是否固定。如果固定,就不会有某一列内容比较长而挤压其他列的情况
headerFooter : [
// 页眉名称
- {label : "广州市中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
+ {label : "广州市中医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]},
// 标题
- {label : "消毒、无菌物品出库单", dataIndex : '', fontSize : 13, position : ["5","35%","99%",5]},
- {label : "部门：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["30","2%","90%",5]},
+ {label : "供应室消毒物品出库单", dataIndex : '', fontSize : 13, position : ["5","35%","99%",5]},
+ {label : "科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["30","2%","90%",5]},
{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["30","35%","90%",5]},
- {label : "仓库:供应室", dataIndex : '', fontSize : 11, position : ["30","80%","90%",5]},
- {label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["50","35%","90%",5]},
- {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["50","60%","90%",5]},
+ //{label : "仓库:供应室", dataIndex : '', fontSize : 11, position : ["30","80%","90%",5]},
+ {label : "申请时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["50","35%","90%",5]},
+ {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["50","65%","90%",5]},
{label : "申请人:", dataIndex : 'applicant', fontSize : 11, position : ["50","2%","90%",5]},
- {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["8.0cm","2%","90%",5]},
- {label : "收货人: ", dataIndex : '', fontSize : 11, position : ["8.0cm","18%","90%",5]},
- {label : "发货人: ", dataIndex : 'printUser', fontSize : 11, position : ["8.0cm","35%","90%",5]},
- {label : "发货日期:", dataIndex : 'printTime', fontSize : 11, position : ["8.0cm","53%","90%",5]}
+ {label : "发放人:", dataIndex : '', fontSize : 11, position : ["7.0cm","2%","90%",5]},
+ {label : "送物人: ", dataIndex : '', fontSize : 11, position : ["7.0cm","20%","90%",5]},
+ {label : "领用人: ", dataIndex : '', fontSize : 11, position : ["7.0cm","35%","90%",5]},
+ {label : "签收时间:", dataIndex : '', fontSize : 11, position : ["7.0cm","60%","90%",5]}
],
- currentPageNumber : {label : "第#页", fontSize : 11, position : ["8.0cm","180mm","90%",5]},
- totalPageAmount : {label : "/共&页", fontSize : 11, position : ["8.0cm","190mm","90%",5]},
+ currentPageNumber : {label : "第#页", fontSize : 11, position : ["7.0cm","180mm","90%",5]},
+ totalPageAmount : {label : "/共&页", fontSize : 11, position : ["7.0cm","190mm","90%",5]},
goodsTable :{
rowHeight : 22,
fontSize : 15,
- position : ["70","1%","99%","55mm"],
+ position : ["70","1%","99%","50mm"],
headRepeat:true,
columns : [
{header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
{header : "名称", dataIndex : 'goodsName', width : 220, align : 'left', fontSize : 11},
- {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11},
+ {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11},
{header : "规格", dataIndex : 'sp', width : 120, align : 'center', fontSize : 11},
{header : "单位", dataIndex : 'unit', width : 60, align : 'center', fontSize : 11},
- {header : "包装规格", dataIndex : 'packageSpec', width : 120, align : 'center', fontSize : 11},
+ // {header : "包装规格", dataIndex : 'packageSpec', width : 120, align : 'center', fontSize : 11},
{header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11},
{header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
]
@@ -215,7 +215,7 @@
// ]
// },
barcodes : [
- {codeType : "128Auto", dataIndex : 'serialNum', position : ["5","60%","40mm","8mm"],
+ {codeType : "128Auto", dataIndex : 'serialNum', position : ["5","75%","40mm","8mm"],
styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
{itemNameID: 0, styleName: 'FontSize', styleValue: 6},
{itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
Index: ssts-web/src/main/resources/config/gzszyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r20381 -r22726
--- ssts-web/src/main/resources/config/gzszyy/mybatis/SyncOrgUnitAndUserMapper.xml (.../SyncOrgUnitAndUserMapper.xml) (revision 20381)
+++ ssts-web/src/main/resources/config/gzszyy/mybatis/SyncOrgUnitAndUserMapper.xml (.../SyncOrgUnitAndUserMapper.xml) (revision 22726)
@@ -7,15 +7,15 @@