提交merge1.3

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue

@@ -19,11 +19,7 @@
           <span>{{ item.prescriptionNo }}</span>
         </div>
         <div style="text-align: center">
-<<<<<<< HEAD
-          <h2>长春大学医院</h2>
-=======
           <h2>长春市朝阳区中医院医院</h2>
->>>>>>> v1.3
         </div>
         <div style="text-align: center">
           <h3>处方单</h3>

openhis-ui-vue3/src/views/doctorstation/components/prescription/refundListDialog.vue

@@ -59,17 +59,6 @@
         <el-table-column label="数量" align="center" prop="quantity" />
         <el-table-column label="单位" align="center" prop="unitCode_dictText" />
         <el-table-column label="收款金额" align="center" prop="totalPrice" />
-<<<<<<< HEAD
-        <el-table-column label="发放状态" align="center">
-          <template #default="scope">
-            <el-tag v-if="scope.row.dispenseStatus != 0" type="danger">
-              {{ scope.row.dispenseStatus_enumText }}
-            </el-tag>
-            <el-tag v-else type="default">{{ scope.row.serviceStatus_enumText }}</el-tag>
-          </template>
-        </el-table-column>
-=======
->>>>>>> v1.3
         <el-table-column label="支付状态" align="center" prop="refundStatus_enumText">
           <template #default="scope">
             <el-tag