提交merge1.3

openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/medicineList.vue

@@ -46,7 +46,7 @@
         align="center"
         prop="doseUnitCode_dictText"
       /> -->
-      <el-table-column label="生产厂家" align="center" prop="manufacturer" />
+      <el-table-column label="生产厂家" align="center" prop="manufacturerText" />
     </el-table>
   </div>
 </template>

openhis-ui-vue3/src/views/medicationmanagement/purchaseDocument/components/templateJson.json

@@ -33,7 +33,11 @@
             "top": 13.5,
             "height": 12,
             "width": 75,
+<<<<<<< HEAD
             "title": "长春大学医院",
+=======
+            "title": "长春市朝阳区中医院医院",
+>>>>>>> v1.3
             "coordinateSync": false,
             "widthHeightSync": false,
             "fontSize": 12,
@@ -84,7 +88,11 @@
             "top": 33,
             "height": 9.75,
             "width": 120,
+<<<<<<< HEAD
             "title": "机构：长春大学医院",
+=======
+            "title": "机构：长春市朝阳区中医院医院",
+>>>>>>> v1.3
             "coordinateSync": false,
             "widthHeightSync": false,
             "qrCodeLevel": 0
@@ -161,9 +169,9 @@
                   "tableSummaryTitle": true,
                   "tableSummary": "",
                   "width": 84.09807741407441,
-                  "field": "manufacturer",
+                  "field": "manufacturerText",
                   "checked": true,
-                  "columnId": "manufacturer",
+                  "columnId": "manufacturerText",
                   "fixed": false,
                   "rowspan": 1,
                   "colspan": 1
@@ -336,4 +344,4 @@
       ]
     }
   ]
-}
+}