wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
openhis-ui-vue3/src/views/charge/cliniccharge/components/template.json
View File

@@ -6,8 +6,11 @@
"paperType": "自定义",
"height": 160,
"width": 80,
"paperHeader": 0,
"paperFooter": 450.7086614173229,
"paperNumberDisabled": true,
"paperNumberContinue": true,
"expandCss": "",
"overPrintOptions": {
"content": "",
"opacity": 0.7,
@@ -28,8 +31,6 @@
"layoutRowGap": 0,
"layoutColumnGap": 0
},
"paperHeader": 0,
"paperFooter": 841.8897637795277,
"printElements": [
{
"options": {
@@ -258,10 +259,10 @@
},
{
"options": {
"left": 138,
"left": 99,
"top": 147,
"height": 9.75,
"width": 84,
"height": 15,
"width": 123,
"title": "合计金额",
"field": "itemTotalAmount",
"coordinateSync": false,
@@ -278,7 +279,7 @@
"left": 6,
"top": 171,
"height": 14,
"width": 88.5,
"width": 108,
"title": "应收金额",
"coordinateSync": false,
"widthHeightSync": false,
@@ -292,10 +293,10 @@
},
{
"options": {
"left": 132,
"left": 124.5,
"top": 171,
"height": 14,
"width": 88.5,
"width": 97.5,
"title": "实收金额",
"coordinateSync": false,
"widthHeightSync": false,
@@ -310,9 +311,43 @@
{
"options": {
"left": 6,
"top": 190.5,
"top": 193.5,
"height": 14,
"width": 117,
"width": 108,
"title": "全自费金额",
"coordinateSync": false,
"widthHeightSync": false,
"qrCodeLevel": 0,
"field": "FULAMT_OWNPAY_AMT"
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 124.5,
"top": 193.5,
"height": 13.5,
"width": 97.5,
"title": "医保政策金额",
"coordinateSync": false,
"widthHeightSync": false,
"qrCodeLevel": 0,
"field": "INSCP_SCP_AMT"
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 6,
"top": 216,
"height": 14,
"width": 108,
"title": "基金支付",
"coordinateSync": false,
"widthHeightSync": false,
@@ -326,10 +361,10 @@
},
{
"options": {
"left": 132,
"top": 190.5,
"left": 124.5,
"top": 216,
"height": 13.5,
"width": 88.5,
"width": 97.5,
"title": "统筹支付",
"coordinateSync": false,
"widthHeightSync": false,
@@ -344,9 +379,9 @@
{
"options": {
"left": 6,
"top": 211.5,
"top": 240,
"height": 14,
"width": 117,
"width": 216,
"title": "个人医保账户支付",
"coordinateSync": false,
"widthHeightSync": false,
@@ -361,43 +396,9 @@
{
"options": {
"left": 6,
"top": 235.5,
"top": 268.5,
"height": 14,
"width": 115.5,
"title": "全自费金额",
"coordinateSync": false,
"widthHeightSync": false,
"qrCodeLevel": 0,
"field": "FULAMT_OWNPAY_AMT"
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 133.5,
"top": 235.5,
"height": 14,
"width": 87,
"title": "应找零",
"coordinateSync": false,
"widthHeightSync": false,
"qrCodeLevel": 0,
"field": "returnedAmount"
},
"printElementType": {
"title": "文本",
"type": "text"
}
},
{
"options": {
"left": 6,
"top": 256.5,
"height": 14,
"width": 100,
"width": 106.5,
"title": "收费员",
"coordinateSync": false,
"widthHeightSync": false,
@@ -412,9 +413,9 @@
{
"options": {
"left": 6,
"top": 277.5,
"top": 294,
"height": 14,
"width": 170,
"width": 214.5,
"title": "收费时间",
"coordinateSync": false,
"widthHeightSync": false,