提交merge1.3

openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json

@@ -6,8 +6,11 @@
       "paperType": "A5",
       "height": 210,
       "width": 148,
+      "paperHeader": 0,
+      "paperFooter": 592.4409448818898,
       "paperNumberDisabled": true,
       "paperNumberContinue": true,
+      "expandCss": "",
       "overPrintOptions": {
         "content": "",
         "opacity": 0.7,
@@ -24,20 +27,24 @@
         "format": "YYYY-MM-DD HH:mm"
       },
       "panelLayoutOptions": {},
-      "paperHeader": 0,
-      "paperFooter": 841.8897637795277,
       "printElements": [
         {
           "options": {
-            "left": 169.5,
+            "left": 0,
             "top": 22.5,
             "height": 12,
+<<<<<<< HEAD
             "width": 88.5,
             "title": "长春大学医院",
+=======
+            "width": 420,
+            "title": "长春市朝阳区中医院",
+>>>>>>> v1.3
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 13.5,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "textAlign": "center"
           },
           "printElementType": {
             "title": "文本",
@@ -46,15 +53,16 @@
         },
         {
           "options": {
-            "left": 189,
+            "left": 0,
             "top": 45,
             "height": 9.75,
-            "width": 42,
+            "width": 420,
             "title": "处置单",
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 11.25,
-            "qrCodeLevel": 0
+            "qrCodeLevel": 0,
+            "textAlign": "center"
           },
           "printElementType": {
             "title": "文本",
@@ -331,4 +339,4 @@
       ]
     }
   ]
-}
+}