提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/api.js
@@ -92,8 +92,6 @@ export function printBloodCode (query) {
    params: query,
  });
 }
-<<<<<<< HEAD
-=======


 /**
@@ -106,4 +104,3 @@ export function getEnPrescriptionInfo(data) {
    params: data,
  });
 }
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/disposalTemplate.json
@@ -33,13 +33,8 @@
            "left": 0,
            "top": 22.5,
            "height": 12,
-<<<<<<< HEAD
-            "width": 88.5,
-            "title": "长春大学医院",
-=======
            "width": 420,
            "title": "长春市朝阳区中医院",
->>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontSize": 13.5,
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue
@@ -8,11 +8,7 @@
    @close="close"
  >
    <el-table :data="recordList" highlight-current-row max-height="650" style="width: 100%" border>
-<<<<<<< HEAD
-      <el-table-column prop="occurrenceTime" label="执行时间" align="center" />
-=======
      <el-table-column prop="recordTime" label="执行时间" align="center" />
->>>>>>> v1.3
      <el-table-column prop="statusEnum_enumText" label="执行状态" align="center" />
      <el-table-column prop="orgName" label="执行科室" align="center" />
      <el-table-column prop="practitionerName" label="执行人" align="center" />
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/components/prescriptionTemplate.json
@@ -37,11 +37,7 @@
            "top": 16.5,
            "height": 22.5,
            "width": 120,
-<<<<<<< HEAD
-            "title": "长春大学医院",
-=======
            "title": "长春市朝阳区中医院医院",
->>>>>>> v1.3
            "coordinateSync": false,
            "widthHeightSync": false,
            "fontFamily": "Microsoft YaHei",
--- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue
@@ -44,24 +44,16 @@
                <el-table-column prop="patientName" label="姓名" align="center" />
                <el-table-column prop="genderEnum_enumText" label="性别" align="center" />
                <el-table-column prop="age" label="年龄" align="center" />
-<<<<<<< HEAD
-=======
                <el-table-column prop="receptionTime" label="挂号时间" align="center" />
->>>>>>> v1.3
              </el-table>
              <pagination
                v-show="total > 0"
                :total="total"
                v-model:page="queryParams.pageNo"
                v-model:limit="queryParams.pageSize"
-<<<<<<< HEAD
-                layout="total, sizes, prev, pager, next"
-                @pagination="getPatientList"
-=======
                @pagination="getPatientList"
                :pager-count="1"
                :layout="'total, prev, pager, next'"
->>>>>>> v1.3
              />
            </el-col>
          </el-row>
@@ -106,10 +98,7 @@
            >
              打印处置单
            </el-button>
-<<<<<<< HEAD
-=======
            <el-button type="primary" plain @click.stop="getEnPrescription()"> 处方单 </el-button>
->>>>>>> v1.3
          </el-col>
          <el-col :xs="24" :sm="12" :md="6">
            <el-form
@@ -296,28 +285,16 @@
                </template>
              </el-table-column>
              <el-table-column align="center" header-align="center" prop="unitPrice" label="单价">
-<<<<<<< HEAD
-                <template #default="scope">
-                  <span>
-                    {{ scope.unitPrice ? scope.unitPrice.toFixed(2) : '0.00' + ' 元' }}
-=======
                <template #default="{ row }">
                  <span>
                    {{ row.unitPrice ? row.unitPrice.toFixed(2) : '0.00' + ' 元' }}
->>>>>>> v1.3
                  </span>
                </template>
              </el-table-column>
              <el-table-column align="center" header-align="center" prop="totalPrice" label="总价">
-<<<<<<< HEAD
-                <template #default="scope">
-                  <span>
-                    {{ scope.totalPrice ? scope.totalPrice.toFixed(2) : '0.00' + ' 元' }}
-=======
                <template #default="{ row }">
                  <span>
                    {{ row.totalPrice ? row.totalPrice.toFixed(2) : '0.00' + ' 元' }}
->>>>>>> v1.3
                  </span>
                </template>
              </el-table-column>
@@ -358,11 +335,8 @@ import { formatDateStr } from '@/utils';
 import { hiprint } from 'vue-plugin-hiprint';
 import useUserStore from '@/store/modules/user';
 import { getGroupMarkers } from '@/utils/his';
-<<<<<<< HEAD
-=======

 import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js';
->>>>>>> v1.3
 // 患者搜索
 const queryParams = ref({
  pageNo: 1,
@@ -450,10 +424,6 @@ function handleServiceCategoryChange(value) {
      deviceList.value = res.data.records.filter((item) => {
        return item.requestTable == 'wor_device_request';
      });
-<<<<<<< HEAD
-=======
-
->>>>>>> v1.3
      activityList.value = res.data.records.filter((item) => {
        return (
          item.requestTable == 'wor_service_request' ||
@@ -537,8 +507,6 @@ function handleBatchValidate(type) {
        };
      });

-<<<<<<< HEAD
-=======
 // 批量操作校验
 function handleBatchValidate(type) {
  let params = [];
@@ -577,7 +545,6 @@ function handleBatchValidate(type) {
        };
      });

->>>>>>> v1.3
    return [...activityList, ...deviceList];
  } else if (type === 'cancel') {
    let list = [...activitySelectedList.value, ...deviceSelectedList.value];
@@ -742,8 +709,6 @@ function printPrescription() {
    }); //开始打印
  });
 }
-<<<<<<< HEAD
-=======
 // 查看本次就诊处方单
 function getEnPrescription() {
  getEnPrescriptionInfo({ encounterId: currentPatient.value.encounterId }).then((res) => {
@@ -761,7 +726,6 @@ function getEnPrescription() {
  });
 }

->>>>>>> v1.3
 // 打印处置单
 function printDisposal() {
  let requestIds = deviceActivityList.value
@@ -869,9 +833,6 @@ function handleCancel(row) {
  });
 }
 // 打印瓶贴
-<<<<<<< HEAD
-function printBottleLabel() {
-=======
 // function printBottleLabel() {
 //   let result = [];
 //   // 过滤出全部输液药品
@@ -966,7 +927,6 @@ function printBottleLabel() {
 //   });
 // }
 async function printBottleLabel() {
->>>>>>> v1.3
  let result = [];
  // 过滤出全部输液药品
  let selectRows = activityListRef.value.getSelectionRows();
@@ -1045,16 +1005,6 @@ async function printBottleLabel() {
      infuseData: item,
    };
  });
-<<<<<<< HEAD
-  const printElements = templateJson;
-  var hiprintTemplate = new hiprint.PrintTemplate({ template: printElements }); // 定义模板
-  console.log(result, '打印机列表');
-  hiprintTemplate.print2(result, {
-    // printer: 'Xprinter XP-365B',
-    height: 210,
-    width: 148,
-  });
-=======
  console.log(result, '打印数据');
  await simplePrint(PRINT_TEMPLATE.OUTPATIENT_INFUSION, result);
  // console.log('打印成功');
@@ -1065,7 +1015,6 @@ async function printBottleLabel() {
  //   height: 210,
  //   width: 148,
  // });
->>>>>>> v1.3
  // 直接打印回调
  // 发送任务到打印机成功
  // hiprintTemplate.on('printSuccess', function (e) {
@@ -1285,8 +1234,4 @@ function getRecord(row) {
 :deep(.el-table__body) tr:hover td.no-hover-column {
  background-color: inherit !important;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3