diff --git a/openhis-ui-vue3/src/components/Print/OutpatientBilling.json b/openhis-ui-vue3/src/components/Print/OutpatientBilling.json index 9dd59d69..a45165a5 100644 --- a/openhis-ui-vue3/src/components/Print/OutpatientBilling.json +++ b/openhis-ui-vue3/src/components/Print/OutpatientBilling.json @@ -2,7 +2,7 @@ "panels": [ { "index": 0, - "name": "门诊收费结算单", + "name": 1, "paperType": "自定义", "height": 500, "width": 80, @@ -11,9 +11,33 @@ "width": 80, "height": 500 }, + "panelPageRule": "none", "paperHeader": 0, "paperFooter": 1128, "paperNumberDisabled": true, + "paperNumberContinue": true, + "expandCss": "", + "panelAngle": 0, + "overPrintOptions": { + "content": "", + "opacity": 0.7, + "type": 1 + }, + "watermarkOptions": { + "content": "", + "fillStyle": "rgba(87, 13, 248, 0.5)", + "fontSize": "36px", + "rotate": 25, + "width": 200, + "height": 150, + "timestamp": true, + "format": "YYYY-MM-DD HH:mm" + }, + "panelLayoutOptions": { + "layoutType": "column", + "layoutRowGap": 0, + "layoutColumnGap": 0 + }, "printElements": [ { "options": { @@ -130,32 +154,59 @@ "field": "chargeItemsList", "textAlign": "center", "fontSize": 8, + "coordinateSync": false, + "widthHeightSync": false, "columns": [ [ { "title": "收费名称", "width": 62, - "field": "chargeItemName" + "field": "chargeItemName", + "checked": true, + "columnId": "chargeItemName", + "fixed": false, + "rowspan": 1, + "colspan": 1 }, { "title": "规格", "width": 37, - "field": "totalVolume" + "field": "totalVolume", + "checked": true, + "columnId": "totalVolume", + "fixed": false, + "rowspan": 1, + "colspan": 1 }, { "title": "数量", "width": 37, - "field": "quantityWithUnit" + "field": "quantityWithUnit", + "checked": true, + "columnId": "quantityWithUnit", + "fixed": false, + "rowspan": 1, + "colspan": 1 }, { "title": "金额", "width": 35, - "field": "totalPrice" + "field": "totalPrice", + "checked": true, + "columnId": "totalPrice", + "fixed": false, + "rowspan": 1, + "colspan": 1 }, { "title": "类别", "width": 37, - "field": "dirClass" + "field": "dirClass", + "checked": true, + "columnId": "dirClass", + "fixed": false, + "rowspan": 1, + "colspan": 1 } ] ] @@ -371,8 +422,8 @@ "borderColor": "#CCCCCC" }, "printElementType": { - "title": "线", - "type": "line" + "title": "横线", + "type": "hline" } }, { diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue index dfc6c56c..d0102d8a 100644 --- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue +++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/index.vue @@ -69,6 +69,16 @@ /> + + + + + @@ -368,16 +378,17 @@ const upload = reactive({ const data = reactive({ form: {}, - queryParams: { - pageNo: 1, - pageSize: 10, - searchKey: undefined, // 品名/商品名/英文品名/编码/拼音 - typeEnum: undefined, // 类型(包括 1:中药,2:成药) - statusEnum: undefined, // 状态(包括 1:预置,2:启用,3:停用) - ybMatchFlag: undefined, // 是否医保匹配(包括 1:是,0:否) - ruleId: undefined, // 执行科室 - categoryCode: undefined, // 目录分类 - }, + queryParams: { + pageNo: 1, + pageSize: 10, + searchKey: undefined, // 品名/商品名/英文品名/编码/拼音 + typeEnum: undefined, // 类型(包括 1:中药,2:成药) + statusEnum: undefined, // 状态(包括 1:预置,2:启用,3:停用) + ybMatchFlag: undefined, // 是否医保匹配(包括 1:是,0:否) + pricingFlag: undefined, // 划价标记(包括 1:允许,0:不允许) + ruleId: undefined, // 执行科室 + categoryCode: undefined, // 目录分类 + }, rules: {}, });