fix(#591): 请修复 Bug #591：【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗

根因：
- Bug #请修复 Bug #591 存在的问题

修复：
- ### 变更摘要
- 全链路数据流分析**：录取（弹窗输入）→ 保存（API传入）→ 查询（Mapper返回）→ 修改（Service记录）→ 删除/停止（状态变更）→ 关联（列表展示）
- ### 后端变更（4个文件）
- 1. `AdviceBatchOpParam.java`** — 停嘱参数添加 `stopTime` 字段
- 新增 `@JsonFormat Date stopTime`，支持前端传入停嘱时间
- 2. `RequestBaseDto.java`** — 查询DTO添加 `stopUserName`、`stopTime` 字段
- 新增 `String stopUserName`（停嘱医生姓名）
- 新增 `Date stopTime`（停嘱时间）
- 3. `AdviceManageAppServiceImpl.java`** — 停嘱Service增强
- 优先使用前端传入的 `stopTime`，兜底用当前时间
- 通过 `SecurityUtils.getNickName()` 获取当前操作用户昵称，记录到 `updateBy`
- 药品和诊疗两个更新入口均已同步修改
- 4. `AdviceManageAppMapper.xml`** — 三个UNION ALL子查询添加字段
- 药品子查询：`T1.effective_dose_end AS stop_time` + `T1.update_by AS stop_user_name`
- 耗材子查询：`NULL AS stop_time` + `'' AS stop_user_name`
- 诊疗子查询：`T1.occurrence_end_time AS stop_time` + `T1.update_by AS stop_user_name`
- ### 前端变更（1个文件）
- `order/index.vue`**：
- 1. **停嘱时间弹窗** — 点击「停嘱」后弹出 `el-dialog`，内含 `el-date-picker`（datetime类型，默认当前时间），确定后才调用API
- 2. **表格列** — 在「皮试」列后面、「诊断」列前面新增两列：
- 「停嘱医生」`prop="stopUserName"`，宽度120px
- 「停嘱时间」`prop="stopTime"`，宽度170px
- 3. **`handleStopAdvice`** — 保留原有校验（未保存/未签发/已停止检查），校验通过后弹出时间选择弹窗而非直接调API
- 4. **`confirmStopAdvice`** — 新增确认函数，将 `stopTime` 拼入请求参数后调用 `stopAdvice` API
- ### 验证结果
- ✅ 前端 Lint 检查通过（仅1个预存的 `vue/no-dupe-keys` 警告）
- ✅ 后端 Maven 编译通过（BUILD SUCCESS）

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/adviceBaseList.vue

@@ -1,26 +1,74 @@
 <template>
-  <div @keyup="handleKeyDown" tabindex="0" ref="tableWrapper">
+  <div
+    ref="tableWrapper"
+    tabindex="0"
+    @keyup="handleKeyDown"
+  >
     <el-table
       ref="adviceBaseRef"
       height="400"
       :data="adviceBaseList"
       highlight-current-row
-      @current-change="handleCurrentChange"
       row-key="patientId"
+      @current-change="handleCurrentChange"
       @cell-click="clickRow"
       @row-click="clickRow"
     >
-      <el-table-column label="名称" align="center" prop="adviceName" />
-      <el-table-column label="类型" align="center" prop="activityType_dictText" />
-      <el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
-      <el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
-      <el-table-column label="规格" align="center" prop="volume" />
-      <el-table-column label="用法" align="center" prop="methodCode_dictText" />
-      <el-table-column label="频次" align="center" prop="rateCode_dictText" />
-      <el-table-column label="单次剂量" align="center" prop="dose" />
-      <el-table-column label="剂量单位" align="center" prop="doseUnitCode_dictText" />
-      <el-table-column label="注射药品" align="center" prop="injectFlag_enumText" />
-      <el-table-column label="皮试" align="center" prop="skinTestFlag_enumText" />
+      <el-table-column
+        label="名称"
+        align="center"
+        prop="adviceName"
+      />
+      <el-table-column
+        label="类型"
+        align="center"
+        prop="activityType_dictText"
+      />
+      <el-table-column
+        label="包装单位"
+        align="center"
+        prop="unitCode_dictText"
+      />
+      <el-table-column
+        label="最小单位"
+        align="center"
+        prop="minUnitCode_dictText"
+      />
+      <el-table-column
+        label="规格"
+        align="center"
+        prop="volume"
+      />
+      <el-table-column
+        label="用法"
+        align="center"
+        prop="methodCode_dictText"
+      />
+      <el-table-column
+        label="频次"
+        align="center"
+        prop="rateCode_dictText"
+      />
+      <el-table-column
+        label="单次剂量"
+        align="center"
+        prop="dose"
+      />
+      <el-table-column
+        label="剂量单位"
+        align="center"
+        prop="doseUnitCode_dictText"
+      />
+      <el-table-column
+        label="注射药品"
+        align="center"
+        prop="injectFlag_enumText"
+      />
+      <el-table-column
+        label="皮试"
+        align="center"
+        prop="skinTestFlag_enumText"
+      />
     </el-table>
   </div>
 </template>

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -1,26 +1,57 @@
 <template>
   <div style="width: 100%">
     <div style="margin-bottom: 5px">
-      <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
+      <el-button
+        type="primary"
+        :disabled="false"
+        @click="handleAddPrescription()"
+      >
         新增
       </el-button>
-      <el-button type="primary" @click="handleSave()" :disabled="handleSaveDisabled"> 签发 </el-button>
-      <el-button type="warning" plain @click="handleSingOut()" :disabled="handleSingOutDisabled"> 签退 </el-button>
+      <el-button
+        type="primary"
+        :disabled="handleSaveDisabled"
+        @click="handleSave()"
+      >
+        签发
+      </el-button>
+      <el-button
+        type="warning"
+        plain
+        :disabled="handleSingOutDisabled"
+        @click="handleSingOut()"
+      >
+        签退
+      </el-button>
       <!-- <el-button type="primary" plain @click="open()" :disabled="false"> 组套 </el-button> -->
-      <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
+      <el-button
+        type="danger"
+        plain
+        :disabled="false"
+        @click="handleDelete()"
+      >
+        删除
+      </el-button>
     </div>
     <el-table
-      max-height="650"
       ref="prescriptionRef"
+      max-height="650"
       :data="prescriptionList"
       row-key="uniqueKey"
       border
-      @row-dblclick="clickRowDb"
       :expand-row-keys="expandOrder"
+      @row-dblclick="clickRowDb"
     >
-      <el-table-column type="expand" width="40">
+      <el-table-column
+        type="expand"
+        width="40"
+      >
         <template #default="scope">
-          <el-form :model="scope.row" :rules="rowRules" :ref="'formRef' + scope.$index">
+          <el-form
+            :ref="'formRef' + scope.$index"
+            :model="scope.row"
+            :rules="rowRules"
+          >
             <div style="padding: 16px; background: #f8f9fa; border-radius: 8px">
               <!-- 药品类型（adviceType == 1）和耗材类型（adviceType == 2）使用相同的界面 -->
               <template v-if="scope.row.adviceType == 1 || scope.row.adviceType == 2">
@@ -28,10 +59,10 @@
                   <span style="font-size: 16px; font-weight: 600">
                     {{
                       scope.row.adviceName +
-                      ' ' +
-                      (scope.row.volume ? scope.row.volume + ' ' : '') +
-                      (scope.row.unitPrice ? scope.row.unitPrice + ' 元/' : '') +
-                      (scope.row.unitCode_dictText || '')
+                        ' ' +
+                        (scope.row.volume ? scope.row.volume + ' ' : '') +
+                        (scope.row.unitPrice ? scope.row.unitPrice + ' 元/' : '') +
+                        (scope.row.unitCode_dictText || '')
                     }}
                   </span>
                   <div class="form-group">
@@ -48,23 +79,26 @@
                         :value="item.lotNumber"
                         :label="
                           item.locationName +
-                          '  ' +
-                          '批次号: ' +
-                          item.lotNumber +
-                          '  ' +
-                          '  库存：' +
-                          (item.quantity / scope.row.partPercent).toFixed(2) +
-                          item.unitCode_dictText +
-                          '  单价：' +
-                          item.price.toFixed(2) +
-                          '/' +
-                          item.unitCode_dictText
+                            '  ' +
+                            '批次号: ' +
+                            item.lotNumber +
+                            '  ' +
+                            '  库存：' +
+                            (item.quantity / scope.row.partPercent).toFixed(2) +
+                            item.unitCode_dictText +
+                            '  单价：' +
+                            item.price.toFixed(2) +
+                            '/' +
+                            item.unitCode_dictText
                         "
                         @click="handleNumberClick(item, scope.$index)"
                       />
                     </el-select>
                     <!-- 库存为空时显示提示 -->
-                    <span v-else style="color: #f56c6c; margin-right: 20px; font-size: 14px;">
+                    <span
+                      v-else
+                      style="color: #f56c6c; margin-right: 20px; font-size: 14px;"
+                    >
                       无可用库存
                     </span>
                     <el-form-item
@@ -74,8 +108,8 @@
                       data-prop="quantity"
                     >
                       <el-input-number
-                        placeholder="数量"
                         v-model="scope.row.quantity"
+                        placeholder="数量"
                         style="width: 70px"
                         controls-position="right"
                         :controls="false"
@@ -90,7 +124,10 @@
                       placeholder="单位"
                       @change="calculateTotalAmount(scope.row, scope.$index)"
                     >
-                      <template v-for="item in scope.row.unitCodeList" :key="item.value">
+                      <template
+                        v-for="item in scope.row.unitCodeList"
+                        :key="item.value"
+                      >
                         <el-option
                           v-if="item.type != unitMap['dose']"
                           :value="item.value"
@@ -102,7 +139,10 @@
                       总金额：{{ scope.row.totalPrice ? scope.row.totalPrice + ' 元' : '0.00 元' }}
                     </span>
                   </div>
-                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                  <el-button
+                    type="primary"
+                    @click="handleSaveSign(scope.row, scope.$index)"
+                  >
                     保存
                   </el-button>
                 </div>
@@ -124,9 +164,9 @@
                       data-prop="quantity"
                     >
                       <el-input-number
+                        v-model="scope.row.quantity"
                         placeholder="执行次数"
                         style="width: 100px; margin: 0 20px"
-                        v-model="scope.row.quantity"
                         controls-position="right"
                         :controls="false"
                         @keyup.enter.prevent="handleEnter('quantity', scope.row, scope.$index)"
@@ -134,8 +174,8 @@
                       />
                     </el-form-item>
                     <el-tree-select
-                      clearable
                       v-model="scope.row.orgId"
+                      clearable
                       :data="organization"
                       :props="{ value: 'id', label: 'name', children: 'children' }"
                       value-key="id"
@@ -151,7 +191,10 @@
                       <!-- 金额: {{ scope.row.priceList[0].price }} -->
                     </span>
                   </div>
-                  <el-button type="primary" @click="handleSaveSign(scope.row, scope.$index)">
+                  <el-button
+                    type="primary"
+                    @click="handleSaveSign(scope.row, scope.$index)"
+                  >
                     保存
                   </el-button>
                 </div>
@@ -160,11 +203,16 @@
           </el-form>
         </template>
       </el-table-column>
-      <el-table-column label="" align="center" prop="groupId" width="60">
+      <el-table-column
+        label=""
+        align="center"
+        prop="groupId"
+        width="60"
+      >
         <template #default="scope">
           <el-checkbox
-            :disabled = "scope.row.chargeStatus == 5"
             v-model="scope.row.check"
+            :disabled="scope.row.chargeStatus == 5"
             placeholder=""
             @click.stop=""
             @change="changeCheck(scope.row.check,scope.$index,scope.row)"
@@ -178,13 +226,18 @@
           }
         } -->
       </el-table-column>
-      <el-table-column label="项目" align="center" prop="productName" width="400">
+      <el-table-column
+        label="项目"
+        align="center"
+        prop="productName"
+        width="400"
+      >
         <template #default="scope">
           <template v-if="getRowDisabled(scope.row)">
             <el-select
-              style="width: 35%; margin-right: 20px"
-              v-model="scope.row.adviceTypeValue"
               :ref="'adviceTypeRef' + scope.$index"
+              v-model="scope.row.adviceTypeValue"
+              style="width: 35%; margin-right: 20px"
               placeholder="选择类型"
               @change="
                 (value) => {
@@ -195,30 +248,30 @@
                   // 根据 value 值直接判断
                   let adviceType, categoryCode, label;
                   switch (value) {
-                    case '1':
-                      adviceType = 1;
-                      categoryCode = '2';
-                      label = '西药';
-                      break;
-                    case '2':
-                      adviceType = 1;
-                      categoryCode = '1';
-                      label = '中成药';
-                      break;
-                    case '3':
-                      adviceType = 2;
-                      categoryCode = '';
-                      label = '耗材';
-                      break;
-                    case '4':
-                      adviceType = 3;
-                      categoryCode = '';
-                      label = '诊疗';
-                      break;
-                    default:
-                      adviceType = undefined;
-                      categoryCode = '';
-                      label = '';
+                  case '1':
+                    adviceType = 1;
+                    categoryCode = '2';
+                    label = '西药';
+                    break;
+                  case '2':
+                    adviceType = 1;
+                    categoryCode = '1';
+                    label = '中成药';
+                    break;
+                  case '3':
+                    adviceType = 2;
+                    categoryCode = '';
+                    label = '耗材';
+                    break;
+                  case '4':
+                    adviceType = 3;
+                    categoryCode = '';
+                    label = '诊疗';
+                    break;
+                  default:
+                    adviceType = undefined;
+                    categoryCode = '';
+                    label = '';
                   }
                   
                   prescriptionList[scope.$index].adviceType = adviceType;
@@ -255,16 +308,16 @@
             >
               <adviceBaseList
                 ref="adviceTableRef"
-                :popoverVisible="scope.row.showPopover"
-                :adviceQueryParams="adviceQueryParams"
-                :patientInfo="props.patientInfo"
-                @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
+                :popover-visible="scope.row.showPopover"
+                :advice-query-params="adviceQueryParams"
+                :patient-info="props.patientInfo"
+                @select-advice-base="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
               />
               <template #reference>
                 <el-input
                   :ref="'adviceRef' + scope.$index"
-                  style="width: 50%"
                   v-model="scope.row.adviceName"
+                  style="width: 50%"
                   placeholder="请选择项目"
                   @input="handleChange"
                   @click="handleFocus(scope.row, scope.$index)"
@@ -288,42 +341,89 @@
           <span v-else>{{ scope.row.adviceName }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="" width="90">
+      <el-table-column
+        label="状态"
+        align="center"
+        prop=""
+        width="90"
+      >
         <template #default="scope">
-          <el-tag v-if="scope.row.chargeStatus == 5" type="success">已收费</el-tag>
-          <el-tag v-else-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
-          <el-tag v-else-if="scope.row.statusEnum == 1" type="">待签发</el-tag>
+          <el-tag
+            v-if="scope.row.chargeStatus == 5"
+            type="success"
+          >
+            已收费
+          </el-tag>
+          <el-tag
+            v-else-if="scope.row.statusEnum == 2"
+            type="success"
+          >
+            已签发
+          </el-tag>
+          <el-tag
+            v-else-if="scope.row.statusEnum == 1"
+            type=""
+          >
+            待签发
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="总量" align="center" prop="">
+      <el-table-column
+        label="总量"
+        align="center"
+        prop=""
+      >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="总金额" align="right" prop="" header-align="center">
+      <el-table-column
+        label="总金额"
+        align="right"
+        prop=""
+        header-align="center"
+      >
         <template #default="scope">
-          <span v-if="!scope.row.isEdit" style="text-align: right">
+          <span
+            v-if="!scope.row.isEdit"
+            style="text-align: right"
+          >
             {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="药房/科室" align="center" prop="" width="240">
+      <el-table-column
+        label="药房/科室"
+        align="center"
+        prop=""
+        width="240"
+      >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.positionName }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="签发人" align="center" prop="" width="240">
+      <el-table-column
+        label="签发人"
+        align="center"
+        prop=""
+        width="240"
+      >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.requesterId_dictText }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="签发时间" align="center" prop="" width="240">
+      <el-table-column
+        label="签发时间"
+        align="center"
+        prop=""
+        width="240"
+      >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.requestTime }}

openhis-ui-vue3/src/views/clinicmanagement/bargain/index.vue

@@ -13,20 +13,29 @@
           @keyup.enter="getPatientList"
         >
           <template #append>
-            <el-button icon="Search" @click="getPatientList" />
+            <el-button
+              icon="Search"
+              @click="getPatientList"
+            />
           </template>
         </el-input>
         <el-scrollbar height="700px">
           <div
             v-for="(item, index) in patientList"
-            :class="item.active ? 'patient-card actived' : 'patient-card'"
             :key="item.id"
+            :class="item.active ? 'patient-card actived' : 'patient-card'"
             @click="handleCardClick(item, index)"
           >
             <div class="main-info-container">
               <div class="bed-container">
                 <div class="bed">
-                  <el-text truncated :tclass="bedfont" width="auto">初诊</el-text>
+                  <el-text
+                    truncated
+                    :tclass="bedfont"
+                    width="auto"
+                  >
+                    初诊
+                  </el-text>
                 </div>
                 <div class="bed_new" />
               </div>
@@ -35,8 +44,16 @@
             <div class="personal-info-container">
               <div class="name-container">
                 <!-- 患者姓名 -->
-                <div class="name" style="max-width: 70px">
-                  <el-text tclass="name" width="auto">{{ item.patientName || '未知' }}</el-text>
+                <div
+                  class="name"
+                  style="max-width: 70px"
+                >
+                  <el-text
+                    tclass="name"
+                    width="auto"
+                  >
+                    {{ item.patientName || '未知' }}
+                  </el-text>
                 </div>
                 <!-- 患者性别/年龄 -->
                 <div class="age">
@@ -51,7 +68,10 @@
     <div style="width: 85%; border: 1px solid #eee; position: relative">
       <div style="padding: 10px; border: 1px solid #eee; height: 50px; border-left: 0">
         <el-descriptions :column="4">
-          <el-descriptions-item label="患者信息:" width="150">
+          <el-descriptions-item
+            label="患者信息:"
+            width="150"
+          >
             {{
               Object.keys(patientInfo).length !== 0
                 ? patientInfo.patientName +
@@ -64,18 +84,35 @@
                 : '-'
             }}
           </el-descriptions-item>
-          <el-descriptions-item label="挂号时间" width="150">
+          <el-descriptions-item
+            label="挂号时间"
+            width="150"
+          >
             {{ Object.keys(patientInfo).length !== 0 ? formatDate(patientInfo.registerTime) : '-' }}
           </el-descriptions-item>
-          <el-descriptions-item label="医生" width="150">{{ userStore.name }}</el-descriptions-item>
-          <el-descriptions-item label="" width="150">
+          <el-descriptions-item
+            label="医生"
+            width="150"
+          >
+            {{ userStore.name }}
+          </el-descriptions-item>
+          <el-descriptions-item
+            label=""
+            width="150"
+          >
             <!-- {{ '' }} -->
           </el-descriptions-item>
         </el-descriptions>
       </div>
       <div style="padding: 10px">
-        <prescriptionlist :patientInfo="patientInfo" ref="prescriptionRef" />
-        <div class="overlay" v-if="disabled"></div>
+        <prescriptionlist
+          ref="prescriptionRef"
+          :patient-info="patientInfo"
+        />
+        <div
+          v-if="disabled"
+          class="overlay"
+        />
       </div>
     </div>
   </div>

openhis-ui-vue3/src/views/clinicmanagement/consultationconfirmation/index.vue

@@ -1,13 +1,36 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="时间类型" prop="timeType">
-        <el-select v-model="queryParams.timeType" placeholder="请选择时间类型" clearable>
-          <el-option label="会诊时间" value="consultation" />
-          <el-option label="申请时间" value="application" />
+    <el-form
+      v-show="showSearch"
+      ref="queryForm"
+      :model="queryParams"
+      size="small"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item
+        label="时间类型"
+        prop="timeType"
+      >
+        <el-select
+          v-model="queryParams.timeType"
+          placeholder="请选择时间类型"
+          clearable
+        >
+          <el-option
+            label="会诊时间"
+            value="consultation"
+          />
+          <el-option
+            label="申请时间"
+            value="application"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
+      <el-form-item
+        label="开始时间"
+        prop="startTime"
+      >
         <el-date-picker
           v-model="queryParams.startTime"
           type="datetime"
@@ -15,7 +38,10 @@
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
+      <el-form-item
+        label="结束时间"
+        prop="endTime"
+      >
         <el-date-picker
           v-model="queryParams.endTime"
           type="datetime"
@@ -23,32 +49,69 @@
           value-format="YYYY-MM-DD HH:mm:ss"
         />
       </el-form-item>
-      <el-form-item label="申请科室" prop="department">
+      <el-form-item
+        label="申请科室"
+        prop="department"
+      >
         <el-input
           v-model="queryParams.department"
           placeholder="请输入申请科室"
           clearable
         />
       </el-form-item>
-      <el-form-item label="申请医生" prop="requestingPhysician">
+      <el-form-item
+        label="申请医生"
+        prop="requestingPhysician"
+      >
         <el-input
           v-model="queryParams.requestingPhysician"
           placeholder="请输入申请医生"
           clearable
         />
       </el-form-item>
-      <el-form-item label="会诊状态" prop="consultationStatus">
-        <el-select v-model="queryParams.consultationStatus" placeholder="请选择会诊状态" clearable>
-          <el-option label="全部" value="" />
-          <el-option label="新开" :value="0" />
-          <el-option label="已提交" :value="10" />
-          <el-option label="已确认" :value="20" />
-          <el-option label="已签名" :value="30" />
-          <el-option label="已完成" :value="40" />
-          <el-option label="已取消" :value="50" />
+      <el-form-item
+        label="会诊状态"
+        prop="consultationStatus"
+      >
+        <el-select
+          v-model="queryParams.consultationStatus"
+          placeholder="请选择会诊状态"
+          clearable
+        >
+          <el-option
+            label="全部"
+            value=""
+          />
+          <el-option
+            label="新开"
+            :value="0"
+          />
+          <el-option
+            label="已提交"
+            :value="10"
+          />
+          <el-option
+            label="已确认"
+            :value="20"
+          />
+          <el-option
+            label="已签名"
+            :value="30"
+          />
+          <el-option
+            label="已完成"
+            :value="40"
+          />
+          <el-option
+            label="已取消"
+            :value="50"
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="病人姓名" prop="patientName">
+      <el-form-item
+        label="病人姓名"
+        prop="patientName"
+      >
         <el-input
           v-model="queryParams.patientName"
           placeholder="请输入病人姓名"
@@ -56,77 +119,158 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        <el-button type="primary" icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+        >
+          查询
+        </el-button>
+        <el-button
+          icon="el-icon-refresh"
+          size="mini"
+          @click="resetQuery"
+        >
+          重置
+        </el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-printer"
+          size="mini"
+          @click="handlePrint"
+        >
+          打印
+        </el-button>
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row
+      :gutter="10"
+      class="mb8"
+    >
       <el-col :span="1.5">
         <el-button
+          v-hasPermi="['consultation:request:add']"
           type="primary"
           plain
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['consultation:request:add']"
-        >新增</el-button>
+        >
+          新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-hasPermi="['consultation:request:submit']"
           type="warning"
           plain
           icon="el-icon-document-checked"
           size="mini"
           :disabled="single"
           @click="handleSubmit"
-          v-hasPermi="['consultation:request:submit']"
-        >提交</el-button>
+        >
+          提交
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-hasPermi="['consultation:request:end']"
           type="danger"
           plain
           icon="el-icon-circle-close"
           size="mini"
           :disabled="single"
           @click="handleEnd"
-          v-hasPermi="['consultation:request:end']"
-        >结束</el-button>
+        >
+          结束
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
+          v-hasPermi="['consultation:request:edit']"
           type="success"
           plain
           icon="el-icon-check"
           size="mini"
           @click="handleSave"
-          v-hasPermi="['consultation:request:edit']"
-        >保存</el-button>
+        >
+          保存
+        </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:show-search="showSearch"
+        @query-table="getList"
+      />
     </el-row>
 
-    <el-table v-loading="loading" :data="requestList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="急" align="center" prop="consultationUrgency" :formatter="urgentFormatter" />
-      <el-table-column label="申请单号" align="center" prop="consultationId" />
-      <el-table-column label="会诊时间" align="center" prop="consultationDate" width="180">
+    <el-table
+      v-loading="loading"
+      :data="requestList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center"
+      />
+      <el-table-column
+        label="ID"
+        align="center"
+        prop="id"
+      />
+      <el-table-column
+        label="急"
+        align="center"
+        prop="consultationUrgency"
+        :formatter="urgentFormatter"
+      />
+      <el-table-column
+        label="申请单号"
+        align="center"
+        prop="consultationId"
+      />
+      <el-table-column
+        label="会诊时间"
+        align="center"
+        prop="consultationDate"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.consultationDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="邀请对象" align="center" prop="invitedObject" />
-      <el-table-column label="申请科室" align="center" prop="department" />
-      <el-table-column label="申请医师" align="center" prop="requestingPhysician" />
-      <el-table-column label="申请时间" align="center" prop="consultationRequestDate" width="180">
+      <el-table-column
+        label="邀请对象"
+        align="center"
+        prop="invitedObject"
+      />
+      <el-table-column
+        label="申请科室"
+        align="center"
+        prop="department"
+      />
+      <el-table-column
+        label="申请医师"
+        align="center"
+        prop="requestingPhysician"
+      />
+      <el-table-column
+        label="申请时间"
+        align="center"
+        prop="consultationRequestDate"
+        width="180"
+      >
         <template #default="scope">
           <span>{{ parseTime(scope.row.consultationRequestDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="提交" align="center" prop="consultationStatus">
+      <el-table-column
+        label="提交"
+        align="center"
+        prop="consultationStatus"
+      >
         <template #default="scope">
           <el-switch
             v-model="scope.row.consultationStatus"
@@ -138,7 +282,11 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="结束" align="center" prop="consultationStatus">
+      <el-table-column
+        label="结束"
+        align="center"
+        prop="consultationStatus"
+      >
         <template #default="scope">
           <el-switch
             v-model="scope.row.consultationStatus"
@@ -150,76 +298,130 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template #default="scope">
           <el-button
+            v-hasPermi="['consultation:request:edit']"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['consultation:request:edit']"
-          >编辑</el-button>
+          >
+            编辑
+          </el-button>
           <el-button
+            v-hasPermi="['consultation:request:query']"
             size="mini"
             type="text"
             icon="el-icon-view"
             @click="handleView(scope.row)"
-            v-hasPermi="['consultation:request:query']"
-          >查看</el-button>
+          >
+            查看
+          </el-button>
           <el-button
+            v-hasPermi="['consultation:request:remove']"
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['consultation:request:remove']"
-          >删除</el-button>
+          >
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
       v-show="total>0"
-      :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
+      :total="total"
       @pagination="getList"
     />
 
     <!-- 会诊申请单弹窗 -->
-    <el-dialog :title="title" v-model="open" width="80%" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-dialog
+      v-model="open"
+      :title="title"
+      width="80%"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+      >
         <el-row>
           <el-col :span="12">
-            <el-form-item label="申请单号" prop="consultationId">
-              <el-input v-model="form.consultationId" placeholder="系统自动生成" readonly />
+            <el-form-item
+              label="申请单号"
+              prop="consultationId"
+            >
+              <el-input
+                v-model="form.consultationId"
+                placeholder="系统自动生成"
+                readonly
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请时间" prop="consultationRequestDate">
-              <el-input v-model="form.consultationRequestDate" readonly />
+            <el-form-item
+              label="申请时间"
+              prop="consultationRequestDate"
+            >
+              <el-input
+                v-model="form.consultationRequestDate"
+                readonly
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="病人姓名" prop="patientName">
-              <el-input v-model="form.patientName" readonly />
+            <el-form-item
+              label="病人姓名"
+              prop="patientName"
+            >
+              <el-input
+                v-model="form.patientName"
+                readonly
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="性别" prop="genderEnum">
-              <el-input v-model="form.genderEnum" readonly />
+            <el-form-item
+              label="性别"
+              prop="genderEnum"
+            >
+              <el-input
+                v-model="form.genderEnum"
+                readonly
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="年龄" prop="age">
-              <el-input v-model="form.age" readonly />
+            <el-form-item
+              label="年龄"
+              prop="age"
+            >
+              <el-input
+                v-model="form.age"
+                readonly
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="会诊时间" prop="consultationDate">
+            <el-form-item
+              label="会诊时间"
+              prop="consultationDate"
+            >
               <el-date-picker
                 v-model="form.consultationDate"
                 type="datetime"
@@ -229,55 +431,135 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="紧急程度" prop="consultationUrgency">
-              <el-checkbox v-model="form.consultationUrgency" true-label="紧急" false-label="一般">是否紧急</el-checkbox>
+            <el-form-item
+              label="紧急程度"
+              prop="consultationUrgency"
+            >
+              <el-checkbox
+                v-model="form.consultationUrgency"
+                true-label="紧急"
+                false-label="一般"
+              >
+                是否紧急
+              </el-checkbox>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="申请医师" prop="requestingPhysician">
-              <el-input v-model="form.requestingPhysician" readonly />
+            <el-form-item
+              label="申请医师"
+              prop="requestingPhysician"
+            >
+              <el-input
+                v-model="form.requestingPhysician"
+                readonly
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="申请科室" prop="department">
-              <el-input v-model="form.department" readonly />
+            <el-form-item
+              label="申请科室"
+              prop="department"
+            >
+              <el-input
+                v-model="form.department"
+                readonly
+              />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="门诊诊断" prop="provisionalDiagnosis">
-          <el-input v-model="form.provisionalDiagnosis" type="textarea" :rows="2" readonly />
+        <el-form-item
+          label="门诊诊断"
+          prop="provisionalDiagnosis"
+        >
+          <el-input
+            v-model="form.provisionalDiagnosis"
+            type="textarea"
+            :rows="2"
+            readonly
+          />
         </el-form-item>
-        <el-form-item label="会诊邀请对象" prop="invitedObject">
-          <el-input v-model="form.invitedObject" type="textarea" :rows="2" placeholder="请选择会诊专家" />
+        <el-form-item
+          label="会诊邀请对象"
+          prop="invitedObject"
+        >
+          <el-input
+            v-model="form.invitedObject"
+            type="textarea"
+            :rows="2"
+            placeholder="请选择会诊专家"
+          />
         </el-form-item>
-        <el-form-item label="会诊确认参加医师" prop="confirmingPhysicianParticipation">
-          <el-input v-model="form.confirmingPhysicianParticipation" type="textarea" :rows="2" />
+        <el-form-item
+          label="会诊确认参加医师"
+          prop="confirmingPhysicianParticipation"
+        >
+          <el-input
+            v-model="form.confirmingPhysicianParticipation"
+            type="textarea"
+            :rows="2"
+          />
         </el-form-item>
-        <el-form-item label="所属医生" prop="confirmingPhysicianName">
+        <el-form-item
+          label="所属医生"
+          prop="confirmingPhysicianName"
+        >
           <el-input v-model="form.confirmingPhysicianName" />
         </el-form-item>
-        <el-form-item label="代表科室" prop="confirmingDepartmentName">
+        <el-form-item
+          label="代表科室"
+          prop="confirmingDepartmentName"
+        >
           <el-input v-model="form.confirmingDepartmentName" />
         </el-form-item>
-        <el-form-item label="签名医生" prop="signature">
+        <el-form-item
+          label="签名医生"
+          prop="signature"
+        >
           <el-input v-model="form.signature" />
         </el-form-item>
-        <el-form-item label="签名时间" prop="signatureDate">
-          <el-input v-model="form.signatureDate" readonly />
+        <el-form-item
+          label="签名时间"
+          prop="signatureDate"
+        >
+          <el-input
+            v-model="form.signatureDate"
+            readonly
+          />
         </el-form-item>
-        <el-form-item label="病史及会诊目的" prop="consultationPurpose">
-          <el-input v-model="form.consultationPurpose" type="textarea" :rows="4" />
+        <el-form-item
+          label="病史及会诊目的"
+          prop="consultationPurpose"
+        >
+          <el-input
+            v-model="form.consultationPurpose"
+            type="textarea"
+            :rows="4"
+          />
         </el-form-item>
-        <el-form-item label="会诊意见" prop="consultationOpinion">
-          <el-input v-model="form.consultationOpinion" type="textarea" :rows="4" />
+        <el-form-item
+          label="会诊意见"
+          prop="consultationOpinion"
+        >
+          <el-input
+            v-model="form.consultationOpinion"
+            type="textarea"
+            :rows="4"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancel">取 消</el-button>
-          <el-button type="primary" @click="submitForm">保 存</el-button>
+          <el-button @click="cancel">
+            取 消
+          </el-button>
+          <el-button
+            type="primary"
+            @click="submitForm"
+          >
+            保 存
+          </el-button>
         </div>
       </template>
     </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/index.vue

@@ -62,26 +62,45 @@
         门诊收费日结单
       </div>
 
-      <el-row :gutter="20" class="info-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <el-row
+        :gutter="20"
+        class="info-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="info-cell">
             <span class="info-label">经办人姓名：</span>
             <span class="info-value">{{ userStore.nickName || '全部' }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="info-cell">
             <span class="info-label">科室：</span>
             <span class="info-value">{{ userStore.orgName || '-' }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="info-cell">
             <span class="info-label">机构：</span>
             <span class="info-value">{{ userStore.hospitalName || '-' }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="info-cell">
             <span class="info-label">时间：</span>
             <span class="info-value">{{ queryTime && queryTime.length === 2 ? queryTime[0] + ' ~ ' + queryTime[1] : '-' }}</span>
@@ -91,27 +110,48 @@
 
       <el-divider />
 
-      <div class="section-title">收入汇总</div>
-      <el-row :gutter="16" class="data-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <div class="section-title">
+        收入汇总
+      </div>
+      <el-row
+        :gutter="16"
+        class="data-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">总收入：</span>
             <span class="data-value">{{ formatValue(reportValue.cashSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">现金：</span>
             <span class="data-value">{{ formatValue(reportValue.rmbCashSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">微信：</span>
             <span class="data-value">{{ formatValue(reportValue.vxCashSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">支付宝：</span>
             <span class="data-value">{{ formatValue(reportValue.aliCashSum) }}</span>
@@ -121,27 +161,48 @@
 
       <el-divider />
 
-      <div class="section-title">医保支付</div>
-      <el-row :gutter="16" class="data-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <div class="section-title">
+        医保支付
+      </div>
+      <el-row
+        :gutter="16"
+        class="data-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">统筹支付：</span>
             <span class="data-value">{{ formatValue(reportValue.tcSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">账户支付：</span>
             <span class="data-value">{{ formatValue(reportValue.zhSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">基金支付总额：</span>
             <span class="data-value">{{ formatValue(reportValue.fundSum) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">医保统筹+账户：</span>
             <span class="data-value">{{ formatValue(Number(reportValue.zhSum || 0) + Number(reportValue.fundSum || 0)) }}</span>
@@ -151,93 +212,163 @@
 
       <el-divider />
 
-      <div class="section-title">费用明细</div>
-      <el-row :gutter="16" class="data-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <div class="section-title">
+        费用明细
+      </div>
+      <el-row
+        :gutter="16"
+        class="data-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">诊查费：</span>
             <span class="data-value">{{ formatValue(reportValue.DIAGNOSTIC_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">检查费：</span>
             <span class="data-value">{{ formatValue(reportValue.CHECK_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">化验费：</span>
             <span class="data-value">{{ formatValue(reportValue.DIAGNOSTIC_TEST_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">治疗费：</span>
             <span class="data-value">{{ formatValue(reportValue.MEDICAL_EXPENSE_FEE) }}</span>
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="16" class="data-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <el-row
+        :gutter="16"
+        class="data-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">西药费：</span>
             <span class="data-value">{{ formatValue(reportValue.WEST_MEDICINE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">中药饮片费：</span>
             <span class="data-value">{{ formatValue(reportValue.CHINESE_MEDICINE_SLICES_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">中成药费：</span>
             <span class="data-value">{{ formatValue(reportValue.CHINESE_MEDICINE_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">卫生材料费：</span>
             <span class="data-value">{{ formatValue(reportValue.SANITARY_MATERIALS_FEE) }}</span>
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="16" class="data-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <el-row
+        :gutter="16"
+        class="data-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">普通挂号费：</span>
             <span class="data-value">{{ formatValue(reportValue.GENERAL_CONSULTATION_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">挂号费：</span>
             <span class="data-value">{{ formatValue(reportValue.REGISTRATION_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">其他费用：</span>
             <span class="data-value">{{ formatValue(reportValue.OTHER_FEE) }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell">
             <span class="data-label">退费金额：</span>
             <span class="data-value">{{ formatValue(reportValue.returnFee) }}</span>
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="16" class="data-row summary-row">
-        <el-col :xs="24" :sm="12" :md="6">
+      <el-row
+        :gutter="16"
+        class="data-row summary-row"
+      >
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell summary-cell">
             <span class="data-label summary-label">费用总额：</span>
             <span class="data-value value-highlight">{{ totalFeeAmount }}</span>
           </div>
         </el-col>
-        <el-col :xs="24" :sm="12" :md="6">
+        <el-col
+          :xs="24"
+          :sm="12"
+          :md="6"
+        >
           <div class="data-cell summary-cell">
             <span class="data-label summary-label">医保报销：</span>
             <span class="data-value value-highlight">{{ insuranceReimbursement }}</span>

openhis-ui-vue3/src/views/clinicmanagement/dayEnd/indexccu.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
       v-show="showSearch"
+      ref="queryRef"
+      :model="queryParams"
+      :inline="true"
       label-width="90px"
     >
       <el-form-item label="查询日期：">
@@ -14,8 +14,8 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           style="width: 300px; margin-right: 20px"
-          @change="getValue"
           value-format="YYYY-MM-DD"
+          @change="getValue"
         />
       </el-form-item>
       <el-form-item label="费用性质：">
@@ -23,8 +23,8 @@
           v-model="contractNo"
           placeholder="费用性质"
           clearable
-          @change="getValue"
           style="width: 150px; margin-right: 30px"
+          @change="getValue"
         >
           <el-option
             v-for="item in contractList"
@@ -40,6 +40,7 @@
           placeholder="经办人"
           clearable
           filterable
+          style="width: 150px; margin-right: 30px"
           @change="
             (value) => {
               if (!value) {
@@ -48,7 +49,6 @@
               getValue();
             }
           "
-          style="width: 150px; margin-right: 30px"
         >
           <el-option
             v-for="item in userList"
@@ -64,16 +64,33 @@
         </el-select>
       </el-form-item>
 
-      <el-button type="primary" plain icon="Search" @click="getValue">查询</el-button>
-      <el-button type="primary" plain icon="Printer" @click="print">打印</el-button>
+      <el-button
+        type="primary"
+        plain
+        icon="Search"
+        @click="getValue"
+      >
+        查询
+      </el-button>
+      <el-button
+        type="primary"
+        plain
+        icon="Printer"
+        @click="print"
+      >
+        打印
+      </el-button>
     </el-form>
-    <div v-loading="loading" style="width: 1300px">
+    <div
+      v-loading="loading"
+      style="width: 1300px"
+    >
       <div style="text-align: center">
         <h2>门诊收费日结单</h2>
       </div>
       <el-row
         :gutter="5"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -99,10 +116,10 @@
           <span class="value"> {{ queryTime[0] + '~' + queryTime[1] }} </span>
         </el-col>
       </el-row>
-      <div class="divider"></div>
+      <div class="divider" />
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -113,18 +130,18 @@
       >
         <el-col
           v-for="(item, index) in fin_type_code"
-          :span="5"
           :key="index"
+          :span="5"
           style="margin-bottom: 15px"
         >
           <span class="label">{{ item.label + '：' }}</span>
           <span class="value">{{ formatValue(reportValue[item.value]) }}</span>
         </el-col>
       </el-row>
-      <div class="divider"></div>
+      <div class="divider" />
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -192,7 +209,7 @@
       </el-row> -->
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -234,7 +251,7 @@
       </el-row>
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -262,7 +279,7 @@
       </el-row>
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -298,7 +315,7 @@
       </el-row>
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;
@@ -322,7 +339,7 @@
       </el-row>
       <el-row
         :gutter="10"
-        outpatientNo="mb8"
+        outpatient-no="mb8"
         style="
           margin: 20px 0;
           display: flex;

openhis-ui-vue3/src/views/clinicmanagement/disposal/components/performRecordDialog.vue

@@ -7,15 +7,39 @@
     destroy-on-close
     @close="close"
   >
-    <el-table :data="recordList" highlight-current-row max-height="650" style="width: 100%" border>
-      <el-table-column prop="recordTime" label="执行时间" align="center" />
-      <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" />
+    <el-table
+      :data="recordList"
+      highlight-current-row
+      max-height="650"
+      style="width: 100%"
+      border
+    >
+      <el-table-column
+        prop="recordTime"
+        label="执行时间"
+        align="center"
+      />
+      <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"
+      />
     </el-table>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="close">取 消</el-button>
+        <el-button @click="close">
+          取 消
+        </el-button>
       </div>
     </template>
   </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue

@@ -1,11 +1,24 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="6">
+      <el-col
+        :xs="24"
+        :sm="24"
+        :md="8"
+        :lg="8"
+        :xl="6"
+      >
         <el-card>
-          <template #header>患者信息</template>
+          <template #header>
+            患者信息
+          </template>
           <el-row :gutter="10">
-            <el-col :span="10" :xs="24" :sm="10" :md="10">
+            <el-col
+              :span="10"
+              :xs="24"
+              :sm="10"
+              :md="10"
+            >
               <el-input
                 v-model="queryParams.searchKey"
                 placeholder="搜索患者"
@@ -15,59 +28,102 @@
                 @keydown.enter="getPatientList"
               >
                 <template #append>
-                  <el-button icon="Search" @click="getPatientList" />
+                  <el-button
+                    icon="Search"
+                    @click="getPatientList"
+                  />
                 </template>
               </el-input>
             </el-col>
-            <el-col :span="14" :xs="24" :sm="14" :md="14">
+            <el-col
+              :span="14"
+              :xs="24"
+              :sm="14"
+              :md="14"
+            >
               <el-date-picker
                 v-model="receptionTime"
-                @change="getPatientList"
                 type="daterange"
                 placeholder="挂号时间"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
+                @change="getPatientList"
               />
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24" :xs="24">
+            <el-col
+              :span="24"
+              :xs="24"
+            >
               <el-table
                 :data="patientList"
                 highlight-current-row
-                @row-click="handlePatientSelect"
                 style="width: 100%; height: calc(100vh - 300px)"
                 border
+                @row-click="handlePatientSelect"
               >
-                <el-table-column prop="encounterNo" label="就诊号" align="center" width="150" />
-                <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" />
-                <el-table-column prop="receptionTime" label="挂号时间" align="center" />
+                <el-table-column
+                  prop="encounterNo"
+                  label="就诊号"
+                  align="center"
+                  width="150"
+                />
+                <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"
+                />
+                <el-table-column
+                  prop="receptionTime"
+                  label="挂号时间"
+                  align="center"
+                />
               </el-table>
               <pagination
                 v-show="total > 0"
-                :total="total"
                 v-model:page="queryParams.pageNo"
                 v-model:limit="queryParams.pageSize"
-                @pagination="getPatientList"
+                :total="total"
                 :pager-count="1"
                 :layout="'total, prev, pager, next'"
+                @pagination="getPatientList"
               />
             </el-col>
           </el-row>
         </el-card>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="16" :lg="16" :xl="18">
+      <el-col
+        :xs="24"
+        :sm="24"
+        :md="16"
+        :lg="16"
+        :xl="18"
+      >
         <el-row :gutter="20">
-          <el-col :xs="24" :sm="24" :md="12" class="mb8">
+          <el-col
+            :xs="24"
+            :sm="24"
+            :md="12"
+            class="mb8"
+          >
             <el-button
               type="primary"
               plain
               icon="Printer"
-              @click="printBottleLabel()"
               :disabled="isCurrentPatient"
+              @click="printBottleLabel()"
             >
               打印瓶签
             </el-button>
@@ -75,8 +131,8 @@
               type="danger"
               plain
               icon="Printer"
-              @click="printBloodBarcode()"
               :disabled="isCurrentPatient"
+              @click="printBloodBarcode()"
             >
               打印采血条码
             </el-button>
@@ -84,8 +140,8 @@
               type="primary"
               plain
               icon="Printer"
-              @click="printPrescription()"
               :disabled="isCurrentPatient"
+              @click="printPrescription()"
             >
               打印处方
             </el-button>
@@ -93,14 +149,24 @@
               type="danger"
               plain
               icon="Printer"
-              @click="printDisposal()"
               :disabled="isCurrentPatient"
+              @click="printDisposal()"
             >
               打印处置单
             </el-button>
-            <el-button type="primary" plain @click.stop="getEnPrescription()"> 处方单 </el-button>
+            <el-button
+              type="primary"
+              plain
+              @click.stop="getEnPrescription()"
+            >
+              处方单
+            </el-button>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6">
+          <el-col
+            :xs="24"
+            :sm="12"
+            :md="6"
+          >
             <el-form
               ref="queryRef"
               :model="queryParams"
@@ -108,40 +174,49 @@
               label-width="150px"
               :rules="rules"
             >
-              <el-form-item label="处置类型" prop="serviceCategory" label-width="100px">
+              <el-form-item
+                label="处置类型"
+                prop="serviceCategory"
+                label-width="100px"
+              >
                 <el-select
                   v-model="queryParams.serviceCategory"
                   placeholder="请选择"
                   clearable
                   filterable
                   style="width: 100%"
-                  @change="handleServiceCategoryChange"
                   :disabled="isCurrentPatient"
+                  @change="handleServiceCategoryChange"
                 >
                   <el-option
                     v-for="item in activityCategoryList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
-                  ></el-option>
+                  />
                 </el-select>
               </el-form-item>
             </el-form>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="6" class="mb8">
+          <el-col
+            :xs="24"
+            :sm="12"
+            :md="6"
+            class="mb8"
+          >
             <el-button
               type="primary"
               icon="Check"
-              @click="handleBatchExecute()"
               :disabled="isMultiple"
+              @click="handleBatchExecute()"
             >
               批量执行
             </el-button>
             <el-button
               type="danger"
               icon="Delete"
-              @click="handleBatchCancel()"
               :disabled="isMultiple"
+              @click="handleBatchCancel()"
             >
               批量取消
             </el-button>
@@ -149,21 +224,41 @@
         </el-row>
         <div class="cards-column">
           <el-card class="half-card">
-            <template #header>处置项目</template>
+            <template #header>
+              处置项目
+            </template>
             <el-table
-              :data="activityList"
               ref="activityListRef"
+              v-loading="loading"
+              :data="activityList"
               style="width: 100%; height: 100%"
               border
-              v-loading="loading"
               :span-method="operationSpanMethod"
               @select="handleSelectionChange"
             >
-              <el-table-column type="selection" align="center" width="50" />
-              <el-table-column label="组" align="center" width="40" prop="groupIcon" />
+              <el-table-column
+                type="selection"
+                align="center"
+                width="50"
+              />
+              <el-table-column
+                label="组"
+                align="center"
+                width="40"
+                prop="groupIcon"
+              />
               <!-- <el-table-column label="序号" align="center" prop="sortNumber" width="60" /> -->
-              <el-table-column align="center" prop="busNo" label="项目编号" width="150" />
-              <el-table-column align="center" prop="itemName" label="项目名称" />
+              <el-table-column
+                align="center"
+                prop="busNo"
+                label="项目编号"
+                width="150"
+              />
+              <el-table-column
+                align="center"
+                prop="itemName"
+                label="项目名称"
+              />
               <el-table-column
                 align="center"
                 prop="serviceStatus_enumText"
@@ -171,7 +266,10 @@
                 width="100"
               >
                 <template #default="{ row }">
-                  <el-tag type="primary" size="small">
+                  <el-tag
+                    type="primary"
+                    size="small"
+                  >
                     {{
                       row.serviceStatus_enumText
                         ? row.serviceStatus_enumText
@@ -194,7 +292,12 @@
                   }}
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="size" label="数量" width="100">
+              <el-table-column
+                align="center"
+                prop="size"
+                label="数量"
+                width="100"
+              >
                 <template #default="scope">
                   <span v-if="scope.row.quantity !== 0 && scope.row.unitCode_dictText">
                     {{ scope.row.quantity + ' ' + scope.row.unitCode_dictText }}
@@ -202,9 +305,23 @@
                   <span v-else> - </span>
                 </template>
               </el-table-column>
-              <el-table-column align="center" prop="size" label="规格" width="100" />
-              <el-table-column align="center" prop="executeNum" label="执行次数" width="90" />
-              <el-table-column align="center" label="已执行次数" width="120">
+              <el-table-column
+                align="center"
+                prop="size"
+                label="规格"
+                width="100"
+              />
+              <el-table-column
+                align="center"
+                prop="executeNum"
+                label="执行次数"
+                width="90"
+              />
+              <el-table-column
+                align="center"
+                label="已执行次数"
+                width="120"
+              >
                 <template #default="scope">
                   {{ scope.row.performCount - scope.row.cancelCount }}
                 </template>
@@ -252,7 +369,12 @@
                 <template #default="{ row }">
                   <!-- <el-button type="text" @click="handleExecute(row)"> 执行 </el-button> -->
                   <!-- <el-button type="danger" link @click="handleCancel(row)"> 取消 </el-button> -->
-                  <el-button link type="primary" icon="EditPen" @click="getRecord(row)">
+                  <el-button
+                    link
+                    type="primary"
+                    icon="EditPen"
+                    @click="getRecord(row)"
+                  >
                     执行记录
                   </el-button>
                 </template>
@@ -260,38 +382,78 @@
             </el-table>
           </el-card>
           <el-card class="half-card">
-            <template #header> 耗材使用 </template>
+            <template #header>
+              耗材使用
+            </template>
             <el-table
-              :data="deviceList"
-              style="width: 100%; height: 100%"
               ref="deviceListRef"
               v-loading="loading"
+              :data="deviceList"
+              style="width: 100%; height: 100%"
               border
             >
-              <el-table-column type="selection" align="center" width="50" />
-              <el-table-column type="index" label="序号" align="center" width="60" />
-              <el-table-column prop="itemName" align="center" label="耗材名称" />
-              <el-table-column align="center" prop="serviceStatus_enumText" label="状态">
+              <el-table-column
+                type="selection"
+                align="center"
+                width="50"
+              />
+              <el-table-column
+                type="index"
+                label="序号"
+                align="center"
+                width="60"
+              />
+              <el-table-column
+                prop="itemName"
+                align="center"
+                label="耗材名称"
+              />
+              <el-table-column
+                align="center"
+                prop="serviceStatus_enumText"
+                label="状态"
+              >
                 <template #default="{ row }">
-                  <el-tag type="primary" size="small">
+                  <el-tag
+                    type="primary"
+                    size="small"
+                  >
                     {{ row.dispenseStatus_enumText }}
                   </el-tag>
                 </template>
               </el-table-column>
-              <el-table-column prop="size" align="center" label="规格" />
-              <el-table-column prop="quantity" align="center" label="使用数量">
+              <el-table-column
+                prop="size"
+                align="center"
+                label="规格"
+              />
+              <el-table-column
+                prop="quantity"
+                align="center"
+                label="使用数量"
+              >
                 <template #default="scope">
                   <span>{{ scope.row.quantity + ' ' + scope.row.unitCode_dictText }}</span>
                 </template>
               </el-table-column>
-              <el-table-column align="center" header-align="center" prop="unitPrice" label="单价">
+              <el-table-column
+                align="center"
+                header-align="center"
+                prop="unitPrice"
+                label="单价"
+              >
                 <template #default="{ row }">
                   <span>
                     {{ row.unitPrice ? row.unitPrice.toFixed(2) : '0.00' + ' 元' }}
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column align="center" header-align="center" prop="totalPrice" label="总价">
+              <el-table-column
+                align="center"
+                header-align="center"
+                prop="totalPrice"
+                label="总价"
+              >
                 <template #default="{ row }">
                   <span>
                     {{ row.totalPrice ? row.totalPrice.toFixed(2) : '0.00' + ' 元' }}
@@ -303,10 +465,14 @@
         </div>
       </el-col>
     </el-row>
-    <PerformRecordDialog :open="openDialog" :recordList="recordList" @close="openDialog = false" />
+    <PerformRecordDialog
+      :open="openDialog"
+      :record-list="recordList"
+      @close="openDialog = false"
+    />
     <PrescriptionInfo
       :open="openPrescriptionDialog"
-      :precriptionInfo="prescriptionInfo"
+      :precription-info="prescriptionInfo"
       @close="openPrescriptionDialog = false"
     />
   </div>

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/ePrescribingDetailDialog.vue

@@ -1,9 +1,18 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="详情" v-model="visible" width="1200px" append-to-body>
+    <el-dialog
+      v-model="visible"
+      :title="详情"
+      width="1200px"
+      append-to-body
+    >
       <div style="width: 100%">
-        <el-table max-height="650" :data="ePrescribingDetailList" border>
+        <el-table
+          max-height="650"
+          :data="ePrescribingDetailList"
+          border
+        >
           <el-table-column
             label="处方号"
             align="center"
@@ -11,10 +20,26 @@
             sortable
             width="100"
           />
-          <el-table-column label="门诊号" align="center" prop="iptOtpNo" />
-          <el-table-column label="患者姓名" align="center" prop="patnName" />
-          <el-table-column label="身份证号" align="center" prop="certno" />
-          <el-table-column label="诊断名" align="center" prop="conditionName" />
+          <el-table-column
+            label="门诊号"
+            align="center"
+            prop="iptOtpNo"
+          />
+          <el-table-column
+            label="患者姓名"
+            align="center"
+            prop="patnName"
+          />
+          <el-table-column
+            label="身份证号"
+            align="center"
+            prop="certno"
+          />
+          <el-table-column
+            label="诊断名"
+            align="center"
+            prop="conditionName"
+          />
           <el-table-column
             label="慢性诊断名"
             align="center"
@@ -22,42 +47,134 @@
             width="180"
           />
 
-          <el-table-column label="请求数量" align="center" prop="quantity" />
-          <el-table-column label="请求单位" align="center" prop="unitCode" />
-          <el-table-column label="审核状态" align="center" prop="statusEnum_enumText" />
-          <el-table-column label="药品名" align="center" prop="medicationName" />
-          <el-table-column label="药品规格" align="center" prop="drugSpecification" />
-          <el-table-column label="药品剂量" align="center" prop="medDosage" />
-          <el-table-column label="药品剂量单位" align="center" prop="medDosageUnitCode" />
-          <el-table-column label="使用频次" align="center" prop="medFrequency_dictText" />
-          <el-table-column label="途径" align="center" prop="medRoute_dictText" />
-          <el-table-column label="取药状态" align="center" prop="medStatus" />
-          <el-table-column label="处方状态" align="center" prop="prescriptionStatus" />
-          <el-table-column label="处方类别" align="center" prop="rxTypeCode_enumText" />
-          <el-table-column label="支持用药信息" align="center" prop="supportInfo" />
-          <el-table-column label="服药时间(开始)" align="center" prop="effectiveDoseStart">
+          <el-table-column
+            label="请求数量"
+            align="center"
+            prop="quantity"
+          />
+          <el-table-column
+            label="请求单位"
+            align="center"
+            prop="unitCode"
+          />
+          <el-table-column
+            label="审核状态"
+            align="center"
+            prop="statusEnum_enumText"
+          />
+          <el-table-column
+            label="药品名"
+            align="center"
+            prop="medicationName"
+          />
+          <el-table-column
+            label="药品规格"
+            align="center"
+            prop="drugSpecification"
+          />
+          <el-table-column
+            label="药品剂量"
+            align="center"
+            prop="medDosage"
+          />
+          <el-table-column
+            label="药品剂量单位"
+            align="center"
+            prop="medDosageUnitCode"
+          />
+          <el-table-column
+            label="使用频次"
+            align="center"
+            prop="medFrequency_dictText"
+          />
+          <el-table-column
+            label="途径"
+            align="center"
+            prop="medRoute_dictText"
+          />
+          <el-table-column
+            label="取药状态"
+            align="center"
+            prop="medStatus"
+          />
+          <el-table-column
+            label="处方状态"
+            align="center"
+            prop="prescriptionStatus"
+          />
+          <el-table-column
+            label="处方类别"
+            align="center"
+            prop="rxTypeCode_enumText"
+          />
+          <el-table-column
+            label="支持用药信息"
+            align="center"
+            prop="supportInfo"
+          />
+          <el-table-column
+            label="服药时间(开始)"
+            align="center"
+            prop="effectiveDoseStart"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.effectiveDoseStart) }}
             </template>
           </el-table-column>
-          <el-table-column label="服药时间(结束)" align="center" prop="effectiveDoseEnd">
+          <el-table-column
+            label="服药时间(结束)"
+            align="center"
+            prop="effectiveDoseEnd"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.effectiveDoseEnd) }}
             </template>
           </el-table-column>
-          <el-table-column label="给药间隔" align="center" prop="dispenseInterval" />
-          <el-table-column label="单次发药数" align="center" prop="dispensePerQuantity" />
-          <el-table-column label="每次发药供应天数" align="center" prop="dispensePerDuration" />
+          <el-table-column
+            label="给药间隔"
+            align="center"
+            prop="dispenseInterval"
+          />
+          <el-table-column
+            label="单次发药数"
+            align="center"
+            prop="dispensePerQuantity"
+          />
+          <el-table-column
+            label="每次发药供应天数"
+            align="center"
+            prop="dispensePerDuration"
+          />
 
-          <el-table-column label="开方医生名" align="center" prop="practitionerName" />
-          <el-table-column label="挂号科室" align="center" prop="mdtrtDeptName" />
-          <el-table-column label="开单科室" align="center" prop="prscDeptName" />
-          <el-table-column label="挂号日期" align="center" prop="mdtrtTime">
+          <el-table-column
+            label="开方医生名"
+            align="center"
+            prop="practitionerName"
+          />
+          <el-table-column
+            label="挂号科室"
+            align="center"
+            prop="mdtrtDeptName"
+          />
+          <el-table-column
+            label="开单科室"
+            align="center"
+            prop="prscDeptName"
+          />
+          <el-table-column
+            label="挂号日期"
+            align="center"
+            prop="mdtrtTime"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.mdtrtTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="处方开立日期" align="center" prop="prscTime">
+          <el-table-column
+            label="处方开立日期"
+            align="center"
+            prop="prscTime"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.prscTime) }}
             </template>
@@ -73,7 +190,9 @@
       </div>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel">
+            取 消
+          </el-button>
         </div>
       </template>
     </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/medicinePickupQueryDialog.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="电子处方取药结果" v-model="visible" width="800px" append-to-body>
+    <el-dialog
+      v-model="visible"
+      :title="电子处方取药结果"
+      width="800px"
+      append-to-body
+    >
       <div style="width: 100%">
         <!-- <div style="margin-bottom: 5px">
           <el-form
@@ -36,51 +41,97 @@
           </el-form>
         </div> -->
         <el-form
+          ref="medresultInfoRef"
           :model="form"
           :rules="rules"
-          ref="medresultInfoRef"
           label-width="130px"
           label-position="left"
         >
           <el-row :gutter="24">
             <el-col :span="8">
-              <el-form-item label="医保处方编号" prop="hiRxno">
-                <el-input v-model="form.hiRxno" placeholder="" disabled />
+              <el-form-item
+                label="医保处方编号"
+                prop="hiRxno"
+              >
+                <el-input
+                  v-model="form.hiRxno"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="医保结算时间" prop="setlTime">
-                <el-input v-model="form.setlTime" placeholder="" disabled />
+              <el-form-item
+                label="医保结算时间"
+                prop="setlTime"
+              >
+                <el-input
+                  v-model="form.setlTime"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="24">
             <el-col :span="8">
-              <el-form-item label="医保处方状态编码" prop="rxStasCodg">
-                <el-input v-model="form.rxStasCodg" placeholder="" disabled />
+              <el-form-item
+                label="医保处方状态编码"
+                prop="rxStasCodg"
+              >
+                <el-input
+                  v-model="form.rxStasCodg"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="医保处方状态名称" prop="rxStasName">
-                <el-input v-model="form.rxStasName" placeholder="" disabled />
+              <el-form-item
+                label="医保处方状态名称"
+                prop="rxStasName"
+              >
+                <el-input
+                  v-model="form.rxStasName"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
 
           <el-row :gutter="24">
             <el-col :span="8">
-              <el-form-item label="处方使用状态编号" prop="rxUsedStasCodg">
-                <el-input v-model="form.rxUsedStasCodg" placeholder="" disabled />
+              <el-form-item
+                label="处方使用状态编号"
+                prop="rxUsedStasCodg"
+              >
+                <el-input
+                  v-model="form.rxUsedStasCodg"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="处方使用状态名称" prop="rxUsedStasName">
-                <el-input v-model="form.rxUsedStasName" placeholder="" disabled />
+              <el-form-item
+                label="处方使用状态名称"
+                prop="rxUsedStasName"
+              >
+                <el-input
+                  v-model="form.rxUsedStasName"
+                  placeholder=""
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
-        <el-table max-height="650" :data="medicinePickupQueryList" border>
+        <el-table
+          max-height="650"
+          :data="medicinePickupQueryList"
+          border
+        >
           <el-table-column
             label="医疗目录编码"
             align="center"
@@ -88,16 +139,60 @@
             width="200"
             sortable
           />
-          <el-table-column label="药品通用名" align="center" prop="drugGenname" width="90" />
-          <el-table-column label="药品商品名" align="center" prop="drugProdname" width="60" />
-          <el-table-column label="药品剂型" align="center" prop="drugDosform" />
-          <el-table-column label="药品规格" align="center" prop="drugSpec" width="130" />
-          <el-table-column label="数量" align="center" prop="cnt" width="80" />
-          <el-table-column label="批准文号" align="center" prop="aprvno" />
-          <el-table-column label="批次号" align="center" prop="bchno" />
-          <el-table-column label="生产批号" align="center" prop="manuLotnum" />
-          <el-table-column label="生产厂家" align="center" prop="prdrName" />
-          <el-table-column label="是否取药" align="center" prop="takeDrugFlag" />
+          <el-table-column
+            label="药品通用名"
+            align="center"
+            prop="drugGenname"
+            width="90"
+          />
+          <el-table-column
+            label="药品商品名"
+            align="center"
+            prop="drugProdname"
+            width="60"
+          />
+          <el-table-column
+            label="药品剂型"
+            align="center"
+            prop="drugDosform"
+          />
+          <el-table-column
+            label="药品规格"
+            align="center"
+            prop="drugSpec"
+            width="130"
+          />
+          <el-table-column
+            label="数量"
+            align="center"
+            prop="cnt"
+            width="80"
+          />
+          <el-table-column
+            label="批准文号"
+            align="center"
+            prop="aprvno"
+          />
+          <el-table-column
+            label="批次号"
+            align="center"
+            prop="bchno"
+          />
+          <el-table-column
+            label="生产批号"
+            align="center"
+            prop="manuLotnum"
+          />
+          <el-table-column
+            label="生产厂家"
+            align="center"
+            prop="prdrName"
+          />
+          <el-table-column
+            label="是否取药"
+            align="center"
+            prop="takeDrugFlag"
+          />
         </el-table>
         <!-- <pagination
           v-show="total > 0"
@@ -109,7 +204,9 @@
       </div>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel">
+            取 消
+          </el-button>
         </div>
       </template>
     </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/components/prescriptionQueryDialog.vue

@@ -1,32 +1,93 @@
 <template>
   <div class="app-container">
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="电子处方查询结果" v-model="visible" width="1800px" append-to-body>
+    <el-dialog
+      v-model="visible"
+      :title="电子处方查询结果"
+      width="1800px"
+      append-to-body
+    >
       <div style="width: 100%">
-        <div class="title">处方信息</div>
-        <el-table max-height="650" :data="prescriptionInfoList" border>
-          <el-table-column label="医保处方编号" align="center" prop="hiRxno" width="280" sortable />
-          <el-table-column label="就诊凭证类型" align="center" prop="mdtrtCertType" width="110" />
-          <el-table-column label="就诊凭证编号" align="center" prop="mdtrtCertNo" width="150" />
-          <el-table-column label="卡识别码" align="center" prop="cardSn" />
-          <el-table-column label="业务类型" align="center" prop="bizTypeCode" width="130" />
-          <el-table-column label="处方附加属性" align="center" prop="rxExraAttrCode" width="130" />
-          <el-table-column label="电子凭证令牌" align="center" prop="ecToken" width="130" />
+        <div class="title">
+          处方信息
+        </div>
+        <el-table
+          max-height="650"
+          :data="prescriptionInfoList"
+          border
+        >
+          <el-table-column
+            label="医保处方编号"
+            align="center"
+            prop="hiRxno"
+            width="280"
+            sortable
+          />
+          <el-table-column
+            label="就诊凭证类型"
+            align="center"
+            prop="mdtrtCertType"
+            width="110"
+          />
+          <el-table-column
+            label="就诊凭证编号"
+            align="center"
+            prop="mdtrtCertNo"
+            width="150"
+          />
+          <el-table-column
+            label="卡识别码"
+            align="center"
+            prop="cardSn"
+          />
+          <el-table-column
+            label="业务类型"
+            align="center"
+            prop="bizTypeCode"
+            width="130"
+          />
+          <el-table-column
+            label="处方附加属性"
+            align="center"
+            prop="rxExraAttrCode"
+            width="130"
+          />
+          <el-table-column
+            label="电子凭证令牌"
+            align="center"
+            prop="ecToken"
+            width="130"
+          />
           <el-table-column
             label="电子凭证线上身份核验流水号"
             align="center"
             prop="authNo"
             width="200"
           />
-          <el-table-column label="参保地编号" align="center" prop="insuPlcNo" width="100" />
-          <el-table-column label="就医地编号" align="center" prop="mdtrtareaNo" width="100" />
+          <el-table-column
+            label="参保地编号"
+            align="center"
+            prop="insuPlcNo"
+            width="100"
+          />
+          <el-table-column
+            label="就医地编号"
+            align="center"
+            prop="mdtrtareaNo"
+            width="100"
+          />
           <el-table-column
             label="定点医疗机构处方编号"
             align="center"
             prop="hospRxno"
             width="160"
           />
-          <el-table-column label="续方的原处方编号" align="center" prop="initRxno" width="160" />
+          <el-table-column
+            label="续方的原处方编号"
+            align="center"
+            prop="initRxno"
+            width="160"
+          />
           <el-table-column
             label="处方类别代码"
             align="center"
@@ -34,12 +95,22 @@
             width="200"
             sortable
           />
-          <el-table-column label="开方时间" align="center" prop="prscTime" width="180">
+          <el-table-column
+            label="开方时间"
+            align="center"
+            prop="prscTime"
+            width="180"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.prscTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="药品类目数" align="center" prop="rxDrugCnt" width="110" />
+          <el-table-column
+            label="药品类目数"
+            align="center"
+            prop="rxDrugCnt"
+            width="110"
+          />
           <el-table-column
             label="处方整剂用法编号"
             align="center"
@@ -52,28 +123,81 @@
             prop="rxUsedWayName"
             width="130"
           />
-          <el-table-column label="处方整剂频次编号" align="center" prop="rxFrquCodg" width="130" />
-          <el-table-column label="处方整剂频次名称" align="center" prop="rxFrquName" width="130" />
-          <el-table-column label="处方整剂剂量单位" align="center" prop="rxDosunt" width="130" />
-          <el-table-column label="处方整剂单次剂量数" align="center" prop="rxDoscnt" width="150" />
-          <el-table-column label="处方整剂医嘱说明" align="center" prop="rxDrordDscr" width="130" />
-          <el-table-column label="处方有效天数" align="center" prop="valiDays" width="130" />
+          <el-table-column
+            label="处方整剂频次编号"
+            align="center"
+            prop="rxFrquCodg"
+            width="130"
+          />
+          <el-table-column
+            label="处方整剂频次名称"
+            align="center"
+            prop="rxFrquName"
+            width="130"
+          />
+          <el-table-column
+            label="处方整剂剂量单位"
+            align="center"
+            prop="rxDosunt"
+            width="130"
+          />
+          <el-table-column
+            label="处方整剂单次剂量数"
+            align="center"
+            prop="rxDoscnt"
+            width="150"
+          />
+          <el-table-column
+            label="处方整剂医嘱说明"
+            align="center"
+            prop="rxDrordDscr"
+            width="130"
+          />
+          <el-table-column
+            label="处方有效天数"
+            align="center"
+            prop="valiDays"
+            width="130"
+          />
 
-          <el-table-column label="有效截止时间" align="center" prop="valiEndTime" width="180">
+          <el-table-column
+            label="有效截止时间"
+            align="center"
+            prop="valiEndTime"
+            width="180"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.valiEndTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="复用" align="center" prop="reptFlag" />
-          <el-table-column label="最大使用次数" align="center" prop="maxReptCnt" width="110" />
+          <el-table-column
+            label="复用"
+            align="center"
+            prop="reptFlag"
+          />
+          <el-table-column
+            label="最大使用次数"
+            align="center"
+            prop="maxReptCnt"
+            width="110"
+          />
           <el-table-column
             label="使用最小间隔(天数)"
             align="center"
             prop="minInvDays"
             width="150"
           />
-          <el-table-column label="续方" align="center" prop="rxCotnFlag" width="80" />
-          <el-table-column label="长期处方" align="center" prop="longRxFlag" />
+          <el-table-column
+            label="续方"
+            align="center"
+            prop="rxCotnFlag"
+            width="80"
+          />
+          <el-table-column
+            label="长期处方"
+            align="center"
+            prop="longRxFlag"
+          />
         </el-table>
         <!-- <pagination
           v-show="total > 0"
@@ -84,8 +208,14 @@
         /> -->
       </div>
       <div style="width: 100%">
-        <div class="title">处方明细信息</div>
-        <el-table max-height="650" :data="rxdrugdetailList" border>
+        <div class="title">
+          处方明细信息
+        </div>
+        <el-table
+          max-height="650"
+          :data="rxdrugdetailList"
+          border
+        >
           <el-table-column
             label="医疗目录编码"
             align="center"
@@ -99,52 +229,196 @@
             prop="fixmedinsHilistId"
             width="90"
           />
-          <el-table-column label="医疗机构制剂标志" align="center" prop="hospPrepFlag" width="60" />
-          <el-table-column label="处方项目分类代码" align="center" prop="rxItemTypeCode" />
+          <el-table-column
+            label="医疗机构制剂标志"
+            align="center"
+            prop="hospPrepFlag"
+            width="60"
+          />
+          <el-table-column
+            label="处方项目分类代码"
+            align="center"
+            prop="rxItemTypeCode"
+          />
           <el-table-column
             label="处方项目分类名称"
             align="center"
             prop="rxItemTypeName"
             width="130"
           />
-          <el-table-column label="中药类别代码" align="center" prop="tcmdrugTypeCode" width="80" />
-          <el-table-column label="中药类别名称" align="center" prop="tcmdrugTypeName" />
-          <el-table-column label="草药脚注" align="center" prop="tcmherbFoote" />
-          <el-table-column label="药物类型代码" align="center" prop="mednTypeCode" />
-          <el-table-column label="药物类型名称" align="center" prop="mednTypeName" />
-          <el-table-column label="主要用药标志" align="center" prop="mainMedcFlag" />
-          <el-table-column label="加急标志" align="center" prop="urgtFlag" width="200" sortable />
-          <el-table-column label="基本药物标志" align="center" prop="basMednFlag" width="90" />
-          <el-table-column label="是否进口药品" align="center" prop="impDrugFlag" width="60" />
-          <el-table-column label="是否OTC药品" align="center" prop="otcFlag" />
-          <el-table-column label="药品通用名" align="center" prop="drugGenname" width="130" />
-          <el-table-column label="药品剂型" align="center" prop="drugDosform" width="80" />
-          <el-table-column label="药品规格" align="center" prop="drugSpec" />
-          <el-table-column label="药品商品名" align="center" prop="drugProdname" />
-          <el-table-column label="生产厂家" align="center" prop="prdrName" />
-          <el-table-column label="用药途径代码" align="center" prop="medcWayCodg" />
-          <el-table-column label="用药途径描述" align="center" prop="medcWayDscr" />
-          <el-table-column label="用药开始时间" align="center" prop="medcBegntime" width="90">
+          <el-table-column
+            label="中药类别代码"
+            align="center"
+            prop="tcmdrugTypeCode"
+            width="80"
+          />
+          <el-table-column
+            label="中药类别名称"
+            align="center"
+            prop="tcmdrugTypeName"
+          />
+          <el-table-column
+            label="草药脚注"
+            align="center"
+            prop="tcmherbFoote"
+          />
+          <el-table-column
+            label="药物类型代码"
+            align="center"
+            prop="mednTypeCode"
+          />
+          <el-table-column
+            label="药物类型名称"
+            align="center"
+            prop="mednTypeName"
+          />
+          <el-table-column
+            label="主要用药标志"
+            align="center"
+            prop="mainMedcFlag"
+          />
+          <el-table-column
+            label="加急标志"
+            align="center"
+            prop="urgtFlag"
+            width="200"
+            sortable
+          />
+          <el-table-column
+            label="基本药物标志"
+            align="center"
+            prop="basMednFlag"
+            width="90"
+          />
+          <el-table-column
+            label="是否进口药品"
+            align="center"
+            prop="impDrugFlag"
+            width="60"
+          />
+          <el-table-column
+            label="是否OTC药品"
+            align="center"
+            prop="otcFlag"
+          />
+          <el-table-column
+            label="药品通用名"
+            align="center"
+            prop="drugGenname"
+            width="130"
+          />
+          <el-table-column
+            label="药品剂型"
+            align="center"
+            prop="drugDosform"
+            width="80"
+          />
+          <el-table-column
+            label="药品规格"
+            align="center"
+            prop="drugSpec"
+          />
+          <el-table-column
+            label="药品商品名"
+            align="center"
+            prop="drugProdname"
+          />
+          <el-table-column
+            label="生产厂家"
+            align="center"
+            prop="prdrName"
+          />
+          <el-table-column
+            label="用药途径代码"
+            align="center"
+            prop="medcWayCodg"
+          />
+          <el-table-column
+            label="用药途径描述"
+            align="center"
+            prop="medcWayDscr"
+          />
+          <el-table-column
+            label="用药开始时间"
+            align="center"
+            prop="medcBegntime"
+            width="90"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.medcBegntime) }}
             </template>
           </el-table-column>
-          <el-table-column label="用药结束时间" align="center" prop="medcEndtime" width="90">
+          <el-table-column
+            label="用药结束时间"
+            align="center"
+            prop="medcEndtime"
+            width="90"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.medcEndtime) }}
             </template>
           </el-table-column>
-          <el-table-column label="用药天数" align="center" prop="medcDays" width="200" sortable />
-          <el-table-column label="单次剂量单位" align="center" prop="sinDosunt" width="90" />
-          <el-table-column label="单次用量" align="center" prop="sinDoscnt" width="60" />
-          <el-table-column label="使用频次编码" align="center" prop="usedFrquCodg" />
-          <el-table-column label="使用频次名称" align="center" prop="usedFrquName" width="130" />
-          <el-table-column label="药品总用药量单位" align="center" prop="drugDosunt" width="80" />
-          <el-table-column label="药品总用药量" align="center" prop="drugCnt" />
-          <el-table-column label="药品单价" align="center" prop="drugPric" />
-          <el-table-column label="药品总金额" align="center" prop="drugSumamt" />
-          <el-table-column label="医院审批标志" align="center" prop="hospApprFlag" />
-          <el-table-column label="自费原因类型" align="center" prop="selfPayRea" />
+          <el-table-column
+            label="用药天数"
+            align="center"
+            prop="medcDays"
+            width="200"
+            sortable
+          />
+          <el-table-column
+            label="单次剂量单位"
+            align="center"
+            prop="sinDosunt"
+            width="90"
+          />
+          <el-table-column
+            label="单次用量"
+            align="center"
+            prop="sinDoscnt"
+            width="60"
+          />
+          <el-table-column
+            label="使用频次编码"
+            align="center"
+            prop="usedFrquCodg"
+          />
+          <el-table-column
+            label="使用频次名称"
+            align="center"
+            prop="usedFrquName"
+            width="130"
+          />
+          <el-table-column
+            label="药品总用药量单位"
+            align="center"
+            prop="drugDosunt"
+            width="80"
+          />
+          <el-table-column
+            label="药品总用药量"
+            align="center"
+            prop="drugCnt"
+          />
+          <el-table-column
+            label="药品单价"
+            align="center"
+            prop="drugPric"
+          />
+          <el-table-column
+            label="药品总金额"
+            align="center"
+            prop="drugSumamt"
+          />
+          <el-table-column
+            label="医院审批标志"
+            align="center"
+            prop="hospApprFlag"
+          />
+          <el-table-column
+            label="自费原因类型"
+            align="center"
+            prop="selfPayRea"
+          />
           <el-table-column
             label="自费原因描述"
             align="center"
@@ -152,14 +426,34 @@
             width="200"
             sortable
           />
-          <el-table-column label="扩展数据" align="center" prop="extras" width="90" />
-          <el-table-column label="院内内部处方号" align="center" prop="prescriptionNo" width="60" />
-          <el-table-column label="医保处方编号" align="center" prop="hiRxno" />
+          <el-table-column
+            label="扩展数据"
+            align="center"
+            prop="extras"
+            width="90"
+          />
+          <el-table-column
+            label="院内内部处方号"
+            align="center"
+            prop="prescriptionNo"
+            width="60"
+          />
+          <el-table-column
+            label="医保处方编号"
+            align="center"
+            prop="hiRxno"
+          />
         </el-table>
       </div>
       <div style="width: 100%">
-        <div class="title">就诊信息</div>
-        <el-table max-height="650" :data="mdtrtinfoList" border>
+        <div class="title">
+          就诊信息
+        </div>
+        <el-table
+          max-height="650"
+          :data="mdtrtinfoList"
+          border
+        >
           <el-table-column
             label="定点医疗机构名称"
             align="center"
@@ -173,15 +467,54 @@
             prop="fixmedinsCode"
             width="90"
           />
-          <el-table-column label="医保就诊ID" align="center" prop="mdtrtId" width="70" />
-          <el-table-column label="医疗类别" align="center" prop="medType" />
-          <el-table-column label="门诊/住院号" align="center" prop="iptOtpNo" width="130" />
-          <el-table-column label="门诊住院标识" align="center" prop="otpIptFlag" width="80" />
-          <el-table-column label="医保人员编号" align="center" prop="psnNo" />
-          <el-table-column label="患者姓名" align="center" prop="patnName" />
-          <el-table-column label="人员证件类型" align="center" prop="psnCertType" />
-          <el-table-column label="证件号码" align="center" prop="certno" />
-          <el-table-column label="年龄" align="center" prop="patnAge" />
+          <el-table-column
+            label="医保就诊ID"
+            align="center"
+            prop="mdtrtId"
+            width="70"
+          />
+          <el-table-column
+            label="医疗类别"
+            align="center"
+            prop="medType"
+          />
+          <el-table-column
+            label="门诊/住院号"
+            align="center"
+            prop="iptOtpNo"
+            width="130"
+          />
+          <el-table-column
+            label="门诊住院标识"
+            align="center"
+            prop="otpIptFlag"
+            width="80"
+          />
+          <el-table-column
+            label="医保人员编号"
+            align="center"
+            prop="psnNo"
+          />
+          <el-table-column
+            label="患者姓名"
+            align="center"
+            prop="patnName"
+          />
+          <el-table-column
+            label="人员证件类型"
+            align="center"
+            prop="psnCertType"
+          />
+          <el-table-column
+            label="证件号码"
+            align="center"
+            prop="certno"
+          />
+          <el-table-column
+            label="年龄"
+            align="center"
+            prop="patnAge"
+          />
           <el-table-column
             label="患者身高(cm)"
             align="center"
@@ -189,21 +522,60 @@
             width="200"
             sortable
           />
-          <el-table-column label="患者体重(kg)" align="center" prop="patnWt" width="90" />
-          <el-table-column label="性别" align="center" prop="gend" width="60" />
-          <el-table-column label="计划生育手术类别" align="center" prop="birctrlType" />
+          <el-table-column
+            label="患者体重(kg)"
+            align="center"
+            prop="patnWt"
+            width="90"
+          />
+          <el-table-column
+            label="性别"
+            align="center"
+            prop="gend"
+            width="60"
+          />
+          <el-table-column
+            label="计划生育手术类别"
+            align="center"
+            prop="birctrlType"
+          />
           <el-table-column
             label="计划生育手术或生育日期"
             align="center"
             prop="birctrlMatnDate"
             width="130"
           />
-          <el-table-column label="生育类别" align="center" prop="matnType" width="80" />
-          <el-table-column label="妊娠(孕周)" align="center" prop="gesoVal" />
-          <el-table-column label="新生儿标志" align="center" prop="nwbFlag" />
-          <el-table-column label="新生儿日、月龄" align="center" prop="nwbAge" />
-          <el-table-column label="哺乳期标志" align="center" prop="suckPrdFlag" />
-          <el-table-column label="过敏史" align="center" prop="algsHis" />
+          <el-table-column
+            label="生育类别"
+            align="center"
+            prop="matnType"
+            width="80"
+          />
+          <el-table-column
+            label="妊娠(孕周)"
+            align="center"
+            prop="gesoVal"
+          />
+          <el-table-column
+            label="新生儿标志"
+            align="center"
+            prop="nwbFlag"
+          />
+          <el-table-column
+            label="新生儿日、月龄"
+            align="center"
+            prop="nwbAge"
+          />
+          <el-table-column
+            label="哺乳期标志"
+            align="center"
+            prop="suckPrdFlag"
+          />
+          <el-table-column
+            label="过敏史"
+            align="center"
+            prop="algsHis"
+          />
           <el-table-column
             label="开方科室名称"
             align="center"
@@ -211,61 +583,228 @@
             width="200"
             sortable
           />
-          <el-table-column label="开方科室编号" align="center" prop="prscDeptCode" width="90" />
-          <el-table-column label="开方医保医师代码" align="center" prop="drCode" width="60" />
-          <el-table-column label="开方医师姓名" align="center" prop="prscDrName" />
+          <el-table-column
+            label="开方科室编号"
+            align="center"
+            prop="prscDeptCode"
+            width="90"
+          />
+          <el-table-column
+            label="开方医保医师代码"
+            align="center"
+            prop="drCode"
+            width="60"
+          />
+          <el-table-column
+            label="开方医师姓名"
+            align="center"
+            prop="prscDrName"
+          />
           <el-table-column
             label="开方医师证件类型"
             align="center"
             prop="prscDrCertType"
             width="130"
           />
-          <el-table-column label="开方医师证件号码" align="center" prop="prscDrCertno" width="80" />
-          <el-table-column label="医生职称编码" align="center" prop="drProfttlCodg" />
-          <el-table-column label="医生职称名称" align="center" prop="drProfttlName" />
-          <el-table-column label="医生科室编码" align="center" prop="drDeptCode" />
-          <el-table-column label="医生科室名称" align="center" prop="drDeptName" />
-          <el-table-column label="科别" align="center" prop="caty" />
-          <el-table-column label="就诊时间" align="center" prop="mdtrtTime" width="90">
+          <el-table-column
+            label="开方医师证件号码"
+            align="center"
+            prop="prscDrCertno"
+            width="80"
+          />
+          <el-table-column
+            label="医生职称编码"
+            align="center"
+            prop="drProfttlCodg"
+          />
+          <el-table-column
+            label="医生职称名称"
+            align="center"
+            prop="drProfttlName"
+          />
+          <el-table-column
+            label="医生科室编码"
+            align="center"
+            prop="drDeptCode"
+          />
+          <el-table-column
+            label="医生科室名称"
+            align="center"
+            prop="drDeptName"
+          />
+          <el-table-column
+            label="科别"
+            align="center"
+            prop="caty"
+          />
+          <el-table-column
+            label="就诊时间"
+            align="center"
+            prop="mdtrtTime"
+            width="90"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.mdtrtTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="病种编码" align="center" prop="diseCodg" width="200" sortable />
-          <el-table-column label="病种名称" align="center" prop="diseName" width="90" />
-          <el-table-column label="特殊病种标志" align="center" prop="spDiseFlag" width="60" />
-          <el-table-column label="主诊断代码" align="center" prop="maindiagCode" />
-          <el-table-column label="主诊断名称" align="center" prop="maindiagName" width="130" />
-          <el-table-column label="疾病病情描述" align="center" prop="diseCondDscr" width="80" />
-          <el-table-column label="医保费用结算类型" align="center" prop="hiFeesetlType" />
-          <el-table-column label="医保费用类别名称" align="center" prop="hiFeesetlName" />
-          <el-table-column label="挂号费" align="center" prop="rgstFee" />
-          <el-table-column label="医疗费总额" align="center" prop="medfeeSumamt" />
-          <el-table-column label="是否初诊" align="center" prop="fstdiagFlag" />
-          <el-table-column label="扩展数据" align="center" prop="extras" />
-          <el-table-column label="院内内部处方号" align="center" prop="prescriptionNo" />
-          <el-table-column label="医保处方编号" align="center" prop="hiRxno" />
+          <el-table-column
+            label="病种编码"
+            align="center"
+            prop="diseCodg"
+            width="200"
+            sortable
+          />
+          <el-table-column
+            label="病种名称"
+            align="center"
+            prop="diseName"
+            width="90"
+          />
+          <el-table-column
+            label="特殊病种标志"
+            align="center"
+            prop="spDiseFlag"
+            width="60"
+          />
+          <el-table-column
+            label="主诊断代码"
+            align="center"
+            prop="maindiagCode"
+          />
+          <el-table-column
+            label="主诊断名称"
+            align="center"
+            prop="maindiagName"
+            width="130"
+          />
+          <el-table-column
+            label="疾病病情描述"
+            align="center"
+            prop="diseCondDscr"
+            width="80"
+          />
+          <el-table-column
+            label="医保费用结算类型"
+            align="center"
+            prop="hiFeesetlType"
+          />
+          <el-table-column
+            label="医保费用类别名称"
+            align="center"
+            prop="hiFeesetlName"
+          />
+          <el-table-column
+            label="挂号费"
+            align="center"
+            prop="rgstFee"
+          />
+          <el-table-column
+            label="医疗费总额"
+            align="center"
+            prop="medfeeSumamt"
+          />
+          <el-table-column
+            label="是否初诊"
+            align="center"
+            prop="fstdiagFlag"
+          />
+          <el-table-column
+            label="扩展数据"
+            align="center"
+            prop="extras"
+          />
+          <el-table-column
+            label="院内内部处方号"
+            align="center"
+            prop="prescriptionNo"
+          />
+          <el-table-column
+            label="医保处方编号"
+            align="center"
+            prop="hiRxno"
+          />
         </el-table>
       </div>
       <div style="width: 100%">
-        <div class="title">诊断信息</div>
-        <el-table max-height="650" :data="discinfoList" border>
-          <el-table-column label="诊断类别" align="center" prop="diagType" width="200" sortable />
-          <el-table-column label="主诊断标志" align="center" prop="maindiagFlag" width="90" />
-          <el-table-column label="诊断排序号" align="center" prop="diagSrtNo" width="60" />
-          <el-table-column label="诊断代码" align="center" prop="diagCode" />
-          <el-table-column label="诊断名称" align="center" prop="diagName" width="130" />
-          <el-table-column label="诊断科室名称" align="center" prop="diagDept" width="80" />
-          <el-table-column label="诊断科室代码" align="center" prop="diagDeptCode" />
-          <el-table-column label="诊断医生编码" align="center" prop="diagDrNo" />
-          <el-table-column label="诊断医生姓名" align="center" prop="diagDrName" />
-          <el-table-column label="诊断时间" align="center" prop="diagTime" width="90">
+        <div class="title">
+          诊断信息
+        </div>
+        <el-table
+          max-height="650"
+          :data="discinfoList"
+          border
+        >
+          <el-table-column
+            label="诊断类别"
+            align="center"
+            prop="diagType"
+            width="200"
+            sortable
+          />
+          <el-table-column
+            label="主诊断标志"
+            align="center"
+            prop="maindiagFlag"
+            width="90"
+          />
+          <el-table-column
+            label="诊断排序号"
+            align="center"
+            prop="diagSrtNo"
+            width="60"
+          />
+          <el-table-column
+            label="诊断代码"
+            align="center"
+            prop="diagCode"
+          />
+          <el-table-column
+            label="诊断名称"
+            align="center"
+            prop="diagName"
+            width="130"
+          />
+          <el-table-column
+            label="诊断科室名称"
+            align="center"
+            prop="diagDept"
+            width="80"
+          />
+          <el-table-column
+            label="诊断科室代码"
+            align="center"
+            prop="diagDeptCode"
+          />
+          <el-table-column
+            label="诊断医生编码"
+            align="center"
+            prop="diagDrNo"
+          />
+          <el-table-column
+            label="诊断医生姓名"
+            align="center"
+            prop="diagDrName"
+          />
+          <el-table-column
+            label="诊断时间"
+            align="center"
+            prop="diagTime"
+            width="90"
+          >
             <template #default="scope">
               {{ formatDate(scope.row.diagTime) }}
             </template>
           </el-table-column>
-          <el-table-column label="中医病名代码" align="center" prop="tcmDiseCode" />
-          <el-table-column label="中医病名" align="center" prop="tcmDiseName" />
+          <el-table-column
+            label="中医病名代码"
+            align="center"
+            prop="tcmDiseCode"
+          />
+          <el-table-column
+            label="中医病名"
+            align="center"
+            prop="tcmDiseName"
+          />
           <el-table-column
             label="中医证候代码"
             align="center"
@@ -273,14 +812,30 @@
             width="200"
             sortable
           />
-          <el-table-column label="中医证候" align="center" prop="tcmsymp" width="90" />
-          <el-table-column label="院内内部处方号" align="center" prop="prescriptionNo" width="60" />
-          <el-table-column label="医保处方编号" align="center" prop="hiRxno" />
+          <el-table-column
+            label="中医证候"
+            align="center"
+            prop="tcmsymp"
+            width="90"
+          />
+          <el-table-column
+            label="院内内部处方号"
+            align="center"
+            prop="prescriptionNo"
+            width="60"
+          />
+          <el-table-column
+            label="医保处方编号"
+            align="center"
+            prop="hiRxno"
+          />
         </el-table>
       </div>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="cancel">取 消</el-button>
+          <el-button @click="cancel">
+            取 消
+          </el-button>
         </div>
       </template>
     </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/ePrescribing/index.vue

@@ -3,10 +3,10 @@
     <div style="width: 100%">
       <div style="margin-bottom: 5px">
         <el-form
-          :model="queryParams"
-          ref="queryRef"
-          :inline="true"
           v-show="showSearch"
+          ref="queryRef"
+          :model="queryParams"
+          :inline="true"
           label-width="90px"
         >
           <el-form-item label="订单时间">
@@ -18,9 +18,12 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               style="width: 400px"
-            ></el-date-picker>
+            />
           </el-form-item>
-          <el-form-item label="关键字" prop="searchKey">
+          <el-form-item
+            label="关键字"
+            prop="searchKey"
+          >
             <el-input
               v-model="queryParams.searchKey"
               placeholder="门诊号/姓名："
@@ -28,8 +31,18 @@
               style="width: 150px"
             />
           </el-form-item>
-          <el-form-item label=" " class="search-button" style="margin-left: 10px">
-            <el-button type="primary" @click="handleQuery()" :disabled="false"> 查询 </el-button>
+          <el-form-item
+            label=" "
+            class="search-button"
+            style="margin-left: 10px"
+          >
+            <el-button
+              type="primary"
+              :disabled="false"
+              @click="handleQuery()"
+            >
+              查询
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -40,26 +53,71 @@
         <el-button type="danger" @click="split()" :disabled="false"> 处方撤销 </el-button>
       </div> -->
       <el-table
-        max-height="650"
         ref="eprescriptionRef"
+        v-loading="loading"
+        max-height="650"
         :data="prescriptionList"
         border
-        v-loading="loading"
         :element-loading-text="'处理中...'"
       >
-        <el-table-column label="处方号" align="center" prop="prescriptionNo" sortable width="190" />
-        <el-table-column label="门诊号" align="center" prop="iptOtpNo" width="110" />
-        <el-table-column label="姓名" align="center" prop="patientName" width="100" />
-        <el-table-column label="身份证号" align="center" prop="certno" width="180" />
-        <el-table-column label="取药状态" align="center" prop="medStatus" width="130" />
-        <el-table-column label="状态" align="center" prop="statusEnum_enumText" width="80" />
-        <el-table-column label="科室" align="center" prop="prscDeptName" />
-        <el-table-column label="挂号日期" align="center" prop="mdtrtTime" width="190">
+        <el-table-column
+          label="处方号"
+          align="center"
+          prop="prescriptionNo"
+          sortable
+          width="190"
+        />
+        <el-table-column
+          label="门诊号"
+          align="center"
+          prop="iptOtpNo"
+          width="110"
+        />
+        <el-table-column
+          label="姓名"
+          align="center"
+          prop="patientName"
+          width="100"
+        />
+        <el-table-column
+          label="身份证号"
+          align="center"
+          prop="certno"
+          width="180"
+        />
+        <el-table-column
+          label="取药状态"
+          align="center"
+          prop="medStatus"
+          width="130"
+        />
+        <el-table-column
+          label="状态"
+          align="center"
+          prop="statusEnum_enumText"
+          width="80"
+        />
+        <el-table-column
+          label="科室"
+          align="center"
+          prop="prscDeptName"
+        />
+        <el-table-column
+          label="挂号日期"
+          align="center"
+          prop="mdtrtTime"
+          width="190"
+        >
           <template #default="scope">
             {{ formatDate(scope.row.mdtrtTime) }}
           </template>
         </el-table-column>
-        <el-table-column label="处方开立日期" align="center" prop="prscTime" width="190">
+        <el-table-column
+          label="处方开立日期"
+          align="center"
+          prop="prscTime"
+          width="190"
+        >
           <template #default="scope">
             {{ formatDate(scope.row.prscTime) }}
           </template>
@@ -72,82 +130,105 @@
           fixed="right"
         >
           <template #default="scope">
-            <el-button link type="primary" icon="View" @click="openEPrescribingDetail(scope.row)"
-              >查看</el-button
+            <el-button
+              link
+              type="primary"
+              icon="View"
+              @click="openEPrescribingDetail(scope.row)"
             >
+              查看
+            </el-button>
             <el-button
               link
               type="primary"
               icon="Plus"
               :disabled="scope.row.statusEnum != '2'"
               @click="uploadElePrescriptions(scope.row)"
-              >处方上传</el-button
             >
+              处方上传
+            </el-button>
             <el-button
               link
               type="danger"
               icon="CloseBold"
               :disabled="scope.row.statusEnum != '2'"
               @click="refusePrescription(scope.row)"
-              >拒绝上传</el-button
             >
+              拒绝上传
+            </el-button>
             <el-button
               link
               type="primary"
               icon="Search"
               :disabled="scope.row.statusEnum != '3'"
               @click="openPrescriptionQuery(scope.row)"
-              >处方查询</el-button
             >
+              处方查询
+            </el-button>
             <el-button
               link
               type="warning"
               icon="Switch"
               :disabled="scope.row.statusEnum != '3'"
               @click="openRevokeDialog(scope.row)"
-              >处方撤销</el-button
             >
+              处方撤销
+            </el-button>
             <el-button
               link
               type="primary"
               icon="Search"
               :disabled="scope.row.statusEnum != '3'"
               @click="openMedicinePickupQuery(scope.row)"
-              >取药查询</el-button
             >
+              取药查询
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
       <pagination
         v-show="total > 0"
-        :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
+        :total="total"
         @pagination="getList"
       />
     </div>
     <prescription-query-dialog
       ref="prescriptionQueryRef"
-      :prescriptionQuery="prescriptionQueryData"
+      :prescription-query="prescriptionQueryData"
       @submit="getList()"
     />
     <medicine-pickup-query-dialog
       ref="medicinePickupQueryRef"
-      :medicinePickupQuery="medicinePickupQueryData"
-      :medicinePickupInfo="medicinePickupInfoData"
+      :medicine-pickup-query="medicinePickupQueryData"
+      :medicine-pickup-info="medicinePickupInfoData"
       @submit="getList()"
     />
     <e-prescribing-detail-dialog
       ref="ePrescribingDetailRef"
-      :ePrescribingDetail="eprescriptionDetailData"
+      :e-prescribing-detail="eprescriptionDetailData"
       @submit="getList()"
     />
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="处方撤销" v-model="open" width="600px" append-to-body>
-      <el-form :model="form" :rules="rules" ref="removeRef" label-width="80px">
+    <el-dialog
+      v-model="open"
+      :title="处方撤销"
+      width="600px"
+      append-to-body
+    >
+      <el-form
+        ref="removeRef"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-row :gutter="24">
           <el-col :span="16">
-            <el-form-item label="撤销原因" prop="description">
+            <el-form-item
+              label="撤销原因"
+              prop="description"
+            >
               <el-input
                 v-model="form.description"
                 :autosize="{ minRows: 4, maxRows: 10 }"
@@ -160,8 +241,15 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="revokePrescriptionStatus">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button
+            type="primary"
+            @click="revokePrescriptionStatus"
+          >
+            确 定
+          </el-button>
+          <el-button @click="cancel">
+            取 消
+          </el-button>
         </div>
       </template>
     </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/details.vue

@@ -1,16 +1,19 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
-    <el-col :span="1.5">
+    <el-row
+      :gutter="10"
+      class="mb8"
+    >
+      <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:import']" -->
         <el-button
           type="primary"
           plain
           icon="Back"
           @click="handleBack"
-          
-          >返回列表</el-button
         >
+          返回列表
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:import']" -->
@@ -19,9 +22,9 @@
           plain
           icon="Search"
           @click="handleQuery"
-          
-          >查询</el-button
         >
+          查询
+        </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -40,7 +43,11 @@
       :data="purchaseinventoryList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="50" align="center" />
+      <el-table-column
+        type="selection"
+        width="50"
+        align="center"
+      />
       <!-- <el-table-column label="组" align="center" width="60">
         <template #default="scope">
           <div v-if="groupMarkers[scope.$index] === '┏'">┏</div>
@@ -49,23 +56,23 @@
         </template>
       </el-table-column> -->
       <el-table-column
+        key="prescriptionNo"
         label="处方号"
         align="center"
-        key="prescriptionNo"
         prop="prescriptionNo"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="requesterId_dictText"
         label="请求人"
         align="center"
-        key="requesterId_dictText"
         prop="requesterId_dictText"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="requestTime"
         label="请求时间"
         align="center"
-        key="requestTime"
         prop="requestTime"
         :show-overflow-tooltip="true"
         width="160px"
@@ -75,27 +82,31 @@
         </template>
       </el-table-column>
       <el-table-column
+        key="adviceName"
         label="医嘱名称"
         align="center"
-        key="adviceName"
         prop="adviceName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="volume"
         label="规格"
         align="center"
-        key="volume"
         prop="volume"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="lotNumber"
         label="产品批号"
         align="center"
-        key="lotNumber"
         prop="lotNumber"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="请求数量" align="center" prop="">
+      <el-table-column
+        label="请求数量"
+        align="center"
+        prop=""
+      >
         <template #default="scope">
           <span>
             {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
@@ -109,37 +120,65 @@
         prop="unitCode_dictText"
         :show-overflow-tooltip="true"
       /> -->
-      <el-table-column label="请求状态" align="center" prop="" width="80">
+      <el-table-column
+        label="请求状态"
+        align="center"
+        prop=""
+        width="80"
+      >
         <template #default="scope">
-          <el-tag v-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
-          <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning"
-            >待保存</el-tag
+          <el-tag
+            v-if="scope.row.statusEnum == 2"
+            type="success"
           >
-          <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+            已签发
+          </el-tag>
+          <el-tag
+            v-else-if="!scope.row.requestId && scope.row.statusEnum == 1"
+            type="warning"
+          >
+            待保存
+          </el-tag>
+          <el-tag
+            v-else-if="scope.row.statusEnum == 1"
+            type="primary"
+          >
+            待签发
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column
+        key="methodCode_dictText"
         label="用法"
         align="center"
-        key="methodCode_dictText"
         prop="methodCode_dictText"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="rateCode_dictText"
         label="使用频次"
         align="center"
-        key="rateCode_dictText"
         prop="rateCode_dictText"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="单次剂量" align="center" prop="">
+      <el-table-column
+        label="单次剂量"
+        align="center"
+        prop=""
+      >
         <template #default="scope">
           <span>
             {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="总价" align="center" prop="" header-align="center" width="99">
+      <el-table-column
+        label="总价"
+        align="center"
+        prop=""
+        header-align="center"
+        width="99"
+      >
         <template #default="scope">
           <span style="text-align: center">
             {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
@@ -147,21 +186,45 @@
         </template>
       </el-table-column>
       <el-table-column
+        key="chargeStatus_enumText"
         label="收费状态"
         align="center"
-        key="chargeStatus_enumText"
         prop="chargeStatus_enumText"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="收费状态" align="center" prop="" width="80">
+      <el-table-column
+        label="收费状态"
+        align="center"
+        prop=""
+        width="80"
+      >
         <template #default="scope">
-          <el-tag v-if="scope.row.chargeStatus == 2" type="success">{{scope.row.chargeStatus_enumText}}</el-tag>
-          <el-tag v-else-if="!scope.row.requestId && scope.row.chargeStatus == 1" type="warning"
-            >{{scope.row.chargeStatus_enumText}}</el-tag>
-          <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">{{scope.row.chargeStatus_enumText}}</el-tag>
+          <el-tag
+            v-if="scope.row.chargeStatus == 2"
+            type="success"
+          >
+            {{ scope.row.chargeStatus_enumText }}
+          </el-tag>
+          <el-tag
+            v-else-if="!scope.row.requestId && scope.row.chargeStatus == 1"
+            type="warning"
+          >
+            {{ scope.row.chargeStatus_enumText }}
+          </el-tag>
+          <el-tag
+            v-else-if="scope.row.statusEnum == 1"
+            type="primary"
+          >
+            {{ scope.row.chargeStatus_enumText }}
+          </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="发药药房/耗材房/执行科室" align="center" prop="" width="179">
+      <el-table-column
+        label="发药药房/耗材房/执行科室"
+        align="center"
+        prop=""
+        width="179"
+      >
         <template #default="scope">
           <span v-if="!scope.row.isEdit">
             {{ scope.row.positionName }}
@@ -169,26 +232,25 @@
         </template>
       </el-table-column>
       <el-table-column
+        key="dispensePerDuration"
         label="用药天数"
         align="center"
-        key="dispensePerDuration"
         prop="dispensePerDuration"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="conditionDefinitionName"
         label="诊断定义名称"
         align="center"
-        key="conditionDefinitionName"
         prop="conditionDefinitionName"
         :show-overflow-tooltip="true"
       />
-     
     </el-table>
     <pagination
       v-show="total > 0"
-      :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      :total="total"
       @pagination="getList"
     />
   </div>

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/component/prescription.vue

@@ -1,13 +1,30 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
+    <el-row
+      :gutter="10"
+      class="mb8"
+    >
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:import']" -->
-        <el-button type="primary" plain icon="Back" @click="handleBack">返回列表</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Back"
+          @click="handleBack"
+        >
+          返回列表
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:import']" -->
-        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+        >
+          查询
+        </el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -46,7 +63,7 @@
             <span class="item-value">男</span>
           </div>
         </div>
-        <div class="divider"></div>
+        <div class="divider" />
         <div style="display: flex; justify-content: space-between">
           <div>
             <span class="item-label">科室：</span>
@@ -61,7 +78,7 @@
             <span class="item-value">2025-01-01</span>
           </div>
         </div>
-        <div class="divider"></div>
+        <div class="divider" />
         <div style="display: flex; justify-content: space-between">
           <div>
             <span class="item-label">门诊号：</span>
@@ -72,15 +89,17 @@
             <span class="item-value">徐丹</span>
           </div>
         </div>
-        <div class="divider"></div>
+        <div class="divider" />
         <div style="display: flex; justify-content: space-between">
           <div>
             <span class="item-label">诊断：</span>
             <span class="item-value">感冒</span>
           </div>
         </div>
-        <div class="divider"></div>
-        <div style="font-size: 16px; font-weight: 700">Rp</div>
+        <div class="divider" />
+        <div style="font-size: 16px; font-weight: 700">
+          Rp
+        </div>
         <div class="medicen-list">
           <div>
             <span>1.</span>
@@ -94,7 +113,7 @@
             <span>口服一次1片一天</span>
           </div>
         </div>
-        <div class="divider"></div>
+        <div class="divider" />
         <div style="display: flex; justify-content: space-between">
           <div>
             <span class="item-label">医师：</span>
@@ -102,7 +121,7 @@
           </div>
           <div>
             <span class="item-label">收费：</span>
-            <span class="item-value"></span>
+            <span class="item-value" />
           </div>
           <div>
             <span class="item-label">合计：</span>
@@ -116,7 +135,7 @@
           </div>
           <div>
             <span class="item-label">核对：</span>
-            <span class="item-value"></span>
+            <span class="item-value" />
           </div>
           <div>
             <span class="item-label">发药：</span>

openhis-ui-vue3/src/views/clinicmanagement/historicalPrescription/index.vue

@@ -1,13 +1,20 @@
 <template>
-  <div class="app-container" v-loading="loadingcontainer" v-if="typeDetail == '1'">
+  <div
+    v-if="typeDetail == '1'"
+    v-loading="loadingcontainer"
+    class="app-container"
+  >
     <el-form
-      :model="queryParams"
       ref="earlyWarningRef"
+      :model="queryParams"
       :inline="true"
       :rules="rules"
       label-width="200px"
     >
-      <el-form-item label="处方号/病人名称/开方医生：" prop="searchKey">
+      <el-form-item
+        label="处方号/病人名称/开方医生："
+        prop="searchKey"
+      >
         <el-input
           v-model="queryParams.searchKey"
           placeholder="可按处方号/病人名称/开方医生查询"
@@ -17,14 +24,31 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row
+      :gutter="10"
+      class="mb8"
+    >
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:import']" -->
-        <el-button type="primary" plain icon="Search" @click="handleQuery">查询</el-button>
+        <el-button
+          type="primary"
+          plain
+          icon="Search"
+          @click="handleQuery"
+        >
+          查询
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <!-- v-hasPermi="['system:user:export']" -->
-        <el-button type="warning" plain icon="CircleClose" @click="handleClear">重置</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="CircleClose"
+          @click="handleClear"
+        >
+          重置
+        </el-button>
       </el-col>
     </el-row>
 
@@ -33,32 +57,36 @@
       :data="purchaseinventoryList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="50" align="center" />
       <el-table-column
+        type="selection"
+        width="50"
+        align="center"
+      />
+      <el-table-column
+        key="prescriptionNo"
         label="处方号"
         align="center"
-        key="prescriptionNo"
         prop="prescriptionNo"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="patientName"
         label="患者"
         align="center"
-        key="patientName"
         prop="patientName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="conditionDefinitionName"
         label="疾病诊断"
         align="center"
-        key="conditionDefinitionName"
         prop="conditionDefinitionName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
+        key="requestTime"
         label="修改时间"
         align="center"
-        key="requestTime"
         prop="requestTime"
         :show-overflow-tooltip="true"
       >
@@ -67,9 +95,9 @@
         </template>
       </el-table-column>
       <el-table-column
+        key="practitionerName"
         label="开方医生"
         align="center"
-        key="practitionerName"
         prop="practitionerName"
         :show-overflow-tooltip="true"
       />
@@ -81,17 +109,22 @@
         class-name="small-padding fixed-width"
       >
         <template #default="scope">
-          <el-button link type="primary" icon="View" @click="viewDetails(scope.row)"
-            >查看</el-button
+          <el-button
+            link
+            type="primary"
+            icon="View"
+            @click="viewDetails(scope.row)"
           >
+            查看
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
     <pagination
       v-show="total > 0"
-      :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      :total="total"
       @pagination="getList"
     />
   </div>

openhis-ui-vue3/src/views/clinicmanagement/incomeStatement/index.vue

@@ -1,24 +1,35 @@
 <template>
   <div class="app-continer">
     <div style="margin: 15px 0; padding: 0 20px">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="90px">
-        <el-form-item label="科室" prop="orgIdList">
-            <el-select
-              v-model="queryParams.orgIdList"
-              placeholder="请选择科室"
-              clearable
-              multiple
-              style="width: 480px"
-            >
-              <el-option
-                v-for="item in departmentList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-        <el-form-item label="结算时间：" prop="activeFlag">
+      <el-form
+        ref="queryRef"
+        :model="queryParams"
+        :inline="true"
+        label-width="90px"
+      >
+        <el-form-item
+          label="科室"
+          prop="orgIdList"
+        >
+          <el-select
+            v-model="queryParams.orgIdList"
+            placeholder="请选择科室"
+            clearable
+            multiple
+            style="width: 480px"
+          >
+            <el-option
+              v-for="item in departmentList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="结算时间："
+          prop="activeFlag"
+        >
           <el-date-picker
             v-model="occurrenceTime"
             type="daterange"
@@ -31,35 +42,97 @@
           />
         </el-form-item>
         <div style="float: right">
-          <el-button type="primary" plain @click="getClinicRecord">查询</el-button>
-          <el-button type="warning" plain @click="handleReset">重置</el-button>
+          <el-button
+            type="primary"
+            plain
+            @click="getClinicRecord"
+          >
+            查询
+          </el-button>
+          <el-button
+            type="warning"
+            plain
+            @click="handleReset"
+          >
+            重置
+          </el-button>
         </div>
       </el-form>
     </div>
-    <el-table :data="clinicRecord" show-summary border>
+    <el-table
+      :data="clinicRecord"
+      show-summary
+      border
+    >
       <!-- <el-table-column label="计算类型" align="center" prop="statusEnum_enumText" /> -->
-      <el-table-column label="序号" width="80" type="index" align="center">
+      <el-table-column
+        label="序号"
+        width="80"
+        type="index"
+        align="center"
+      >
         <template #default="scope">
-            <span>{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
+          <span>{{ (queryParams.pageNo - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="科室" align="center" prop="orgName" :show-overflow-tooltip="true"/>
-      <el-table-column label="人次" align="center" prop="personCnt" :show-overflow-tooltip="true"/>
-      <el-table-column label="应收金额" align="center" prop="amount" :show-overflow-tooltip="true"/>
-      <el-table-column label="实收金额" align="center" prop="receivedAmount" width="280" :show-overflow-tooltip="true"/>
-      <el-table-column label="挂号费" align="center" prop="registrationFee" :show-overflow-tooltip="true"/>
-      <el-table-column label="处置费" align="center" prop="serviceFee" :show-overflow-tooltip="true"/>
-      <el-table-column label="药品费" align="center" prop="medFee" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="科室"
+        align="center"
+        prop="orgName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="人次"
+        align="center"
+        prop="personCnt"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="应收金额"
+        align="center"
+        prop="amount"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="实收金额"
+        align="center"
+        prop="receivedAmount"
+        width="280"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="挂号费"
+        align="center"
+        prop="registrationFee"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="处置费"
+        align="center"
+        prop="serviceFee"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="药品费"
+        align="center"
+        prop="medFee"
+        :show-overflow-tooltip="true"
+      />
       <!-- <el-table-column label="优惠金额" align="center" prop="entererName" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column label="日结" align="center" prop="outcomeEnum_dictText" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column label="月累计" align="center" prop="printCount" :show-overflow-tooltip="true"/> -->
-      <el-table-column label="备注" align="center" prop="printCount" :show-overflow-tooltip="true"/>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="printCount"
+        :show-overflow-tooltip="true"
+      />
     </el-table>
     <pagination
       v-show="total > 0"
-      :total="total"
       v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      :total="total"
       @pagination="getLists"
     />
   </div>

openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/component/adviceListDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
-    title="医嘱列表"
     v-model="props.open"
+    title="医嘱列表"
     width="1300px"
     append-to-body
     destroy-on-close
@@ -26,47 +26,97 @@
       </el-row> -->
       <el-table
         ref="refundListRef"
+        v-loading="tableLoading"
         :data="props.adviceList"
         row-key="paymentId"
         row-class-name="parent-row"
-        v-loading="tableLoading"
         border
         max-height="600"
       >
-        <el-table-column type="index" align="center"/>
-        <el-table-column label="医嘱" align="center" prop="adviceName" width="200" />
-        <el-table-column label="状态" align="center" prop="" width="90">
+        <el-table-column
+          type="index"
+          align="center"
+        />
+        <el-table-column
+          label="医嘱"
+          align="center"
+          prop="adviceName"
+          width="200"
+        />
+        <el-table-column
+          label="状态"
+          align="center"
+          prop=""
+          width="90"
+        >
           <template #default="scope">
-            <el-tag v-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
-            <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
+            <el-tag
+              v-if="scope.row.statusEnum == 2"
+              type="success"
+            >
+              已签发
+            </el-tag>
+            <el-tag
+              v-else-if="!scope.row.requestId && scope.row.statusEnum == 1"
+              type="warning"
+            >
               待保存
             </el-tag>
-            <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+            <el-tag
+              v-else-if="scope.row.statusEnum == 1"
+              type="primary"
+            >
+              待签发
+            </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="单次剂量" align="center" prop="">
+        <el-table-column
+          label="单次剂量"
+          align="center"
+          prop=""
+        >
           <template #default="scope">
             {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="总量" align="center" prop="">
+        <el-table-column
+          label="总量"
+          align="center"
+          prop=""
+        >
           <template #default="scope">
             {{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="right" prop="" header-align="center" width="100">
+        <el-table-column
+          label="总金额"
+          align="right"
+          prop=""
+          header-align="center"
+          width="100"
+        >
           <template #default="scope">
             <span style="text-align: right">
               {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="药房/科室" align="center" prop="" width="180">
+        <el-table-column
+          label="药房/科室"
+          align="center"
+          prop=""
+          width="180"
+        >
           <template #default="scope">
             {{ scope.row.positionName }}
           </template>
         </el-table-column>
-        <el-table-column label="频次/用法" align="center" prop="" width="180">
+        <el-table-column
+          label="频次/用法"
+          align="center"
+          prop=""
+          width="180"
+        >
           <template #default="scope">
             <span style="text-align: right">
               {{
@@ -82,17 +132,32 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="注射药品" align="center" prop="" width="80">
+        <el-table-column
+          label="注射药品"
+          align="center"
+          prop=""
+          width="80"
+        >
           <template #default="scope">
             {{ scope.row.injectFlag_enumText || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="皮试" align="center" prop="" width="80">
+        <el-table-column
+          label="皮试"
+          align="center"
+          prop=""
+          width="80"
+        >
           <template #default="scope">
             {{ scope.row.skinTestFlag_enumText || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="诊断" align="center" prop="diagnosisName" width="150">
+        <el-table-column
+          label="诊断"
+          align="center"
+          prop="diagnosisName"
+          width="150"
+        >
           <template #default="scope">
             {{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
           </template>
@@ -101,7 +166,9 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="close">取 消</el-button>
+        <el-button @click="close">
+          取 消
+        </el-button>
       </div>
     </template>
   </el-dialog>

openhis-ui-vue3/src/views/clinicmanagement/infusionrecord/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <div class="left">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form
+        v-show="showSearch"
+        ref="queryRef"
+        :model="queryParams"
+        :inline="true"
+      >
         <el-form-item label="就诊日期">
           <el-date-picker
             v-model="dateRange"
@@ -13,7 +18,10 @@
             @change="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="基础信息" prop="searchKey">
+        <el-form-item
+          label="基础信息"
+          prop="searchKey"
+        >
           <el-input
             v-model="queryParams.searchKey"
             placeholder="门诊号/病人/ID"
@@ -22,7 +30,10 @@
             @keyup.enter="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="执行状态" prop="searchKey">
+        <el-form-item
+          label="执行状态"
+          prop="searchKey"
+        >
           <el-select
             v-model="queryParams.serviceStatus"
             placeholder="执行状态"
@@ -38,8 +49,19 @@
           </el-select>
         </el-form-item>
         <div style="margin-bottom: 10px">
-          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button
+            type="primary"
+            icon="Search"
+            @click="handleQuery"
+          >
+            搜索
+          </el-button>
+          <el-button
+            icon="Refresh"
+            @click="resetQuery"
+          >
+            重置
+          </el-button>
         </div>
       </el-form>
 
@@ -50,59 +72,136 @@
         highlight-current-row
         @row-click="handleCurrentChange"
       >
-        <el-table-column prop="encounterBusNo" label="就诊号" width="120px" />
-        <el-table-column prop="patientName" label="姓名" />
-        <el-table-column prop="genderEnum_enumText" label="性别" />
-        <el-table-column prop="ageString" label="年龄" />
-        <el-table-column prop="serviceStatus_enumText" label="执行状态" />
+        <el-table-column
+          prop="encounterBusNo"
+          label="就诊号"
+          width="120px"
+        />
+        <el-table-column
+          prop="patientName"
+          label="姓名"
+        />
+        <el-table-column
+          prop="genderEnum_enumText"
+          label="性别"
+        />
+        <el-table-column
+          prop="ageString"
+          label="年龄"
+        />
+        <el-table-column
+          prop="serviceStatus_enumText"
+          label="执行状态"
+        />
       </el-table>
       <pagination
         v-show="total > 0"
-        :total="total"
         v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
+        :total="total"
         @pagination="getList"
       />
     </div>
 
     <div class="right">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form
+        v-show="showSearch"
+        ref="queryRef"
+        :model="queryParams"
+        :inline="true"
+      >
         <el-form-item>
-          <el-button type="primary" icon="SuccessFilled" @click="handleSubmit">确认执行</el-button>
+          <el-button
+            type="primary"
+            icon="SuccessFilled"
+            @click="handleSubmit"
+          >
+            确认执行
+          </el-button>
           <!-- <el-button type="primary" plain icon="Printer" @click="resetQuery">打印患者卡</el-button> -->
-          <el-button type="primary" plain icon="Printer" @click="printLabel">打印瓶签</el-button>
+          <el-button
+            type="primary"
+            plain
+            icon="Printer"
+            @click="printLabel"
+          >
+            打印瓶签
+          </el-button>
           <!-- <el-button type="primary" plain icon="Printer" @click="printbloodLabel"> -->
           <!-- 打印采血条码 -->
           <!-- </el-button> -->
           <!-- <el-button type="primary" plain icon="Printer" @click="resetQuery">打印输液单</el-button> -->
-          <el-button type="primary" plain @click="geiAdviceList">查看医嘱</el-button>
+          <el-button
+            type="primary"
+            plain
+            @click="geiAdviceList"
+          >
+            查看医嘱
+          </el-button>
         </el-form-item>
       </el-form>
       <div>
-        <p style="margin: 0px 0px 10px 0px">院注医嘱</p>
+        <p style="margin: 0px 0px 10px 0px">
+          院注医嘱
+        </p>
         <el-table
+          ref="tableRef"
           :data="infusionList"
           highlight-current-row
           border
           style="width: 100%; height: 300px"
           @selection-change="handleSelectionChange"
           @row-click="handleRowClick"
-          ref="tableRef"
         >
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="组" width="50">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+          />
+          <el-table-column
+            label="组"
+            width="50"
+          >
             <template #default="scope">
               <span>{{ markers[scope.$index] }}</span>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="groupId" label="组" width="60" /> -->
-          <el-table-column prop="busNo" label="编码" align="center" />
-          <el-table-column prop="serviceName" label="项目" align="center" />
-          <el-table-column prop="executeNum" label="总执行次数" align="center" />
-          <el-table-column prop="performCount" label="已执行次数" align="center" />
-          <el-table-column prop="practitionerName" label="开单医生" align="center" />
-          <el-table-column prop="medicationName" label="药品信息" align="center" />
-          <el-table-column prop="dose" label="药品数量" align="center">
+          <el-table-column
+            prop="busNo"
+            label="编码"
+            align="center"
+          />
+          <el-table-column
+            prop="serviceName"
+            label="项目"
+            align="center"
+          />
+          <el-table-column
+            prop="executeNum"
+            label="总执行次数"
+            align="center"
+          />
+          <el-table-column
+            prop="performCount"
+            label="已执行次数"
+            align="center"
+          />
+          <el-table-column
+            prop="practitionerName"
+            label="开单医生"
+            align="center"
+          />
+          <el-table-column
+            prop="medicationName"
+            label="药品信息"
+            align="center"
+          />
+          <el-table-column
+            prop="dose"
+            label="药品数量"
+            align="center"
+          >
             <template #default="scope">
               <span style="text-align: right">
                 {{
@@ -114,17 +213,39 @@
             </template>
           </el-table-column>
           <!-- <el-table-column prop="speed" label="输液速度" width="80" /> -->
-          <el-table-column prop="dispenseStatus_enumText" label="药品状态" align="center" />
-          <el-table-column prop="skinTestFlag_enumText" label="皮试标志" align="center" />
+          <el-table-column
+            prop="dispenseStatus_enumText"
+            label="药品状态"
+            align="center"
+          />
+          <el-table-column
+            prop="skinTestFlag_enumText"
+            label="皮试标志"
+            align="center"
+          />
           <!-- <el-table-column prop="clinicalStatusEnum_enumText" label="皮试结果" width="70" /> -->
         </el-table>
       </div>
       <div>
-        <p style="margin: 13px 0px 10px 0px">院注执行历史</p>
-        <el-table :data="historyRecordsList" border style="width: 100%; height: 300px">
-          <el-table-column prop="occurrenceEndTime" label="执行时间" align="center" width="260">
+        <p style="margin: 13px 0px 10px 0px">
+          院注执行历史
+        </p>
+        <el-table
+          :data="historyRecordsList"
+          border
+          style="width: 100%; height: 300px"
+        >
+          <el-table-column
+            prop="occurrenceEndTime"
+            label="执行时间"
+            align="center"
+            width="260"
+          >
             <template #default="scope">
-              <div v-if="scope.row.isEdit" @dblclick="scope.row.isEdit = !scope.row.isEdit">
+              <div
+                v-if="scope.row.isEdit"
+                @dblclick="scope.row.isEdit = !scope.row.isEdit"
+              >
                 {{ formatDate(scope.row.occurrenceEndTime) }}
               </div>
               <el-date-picker
@@ -137,10 +258,26 @@
               />
             </template>
           </el-table-column>
-          <el-table-column prop="performerName" label="执行人" align="center" />
-          <el-table-column prop="serviceStatus_enumText" label="执行状态" align="center" />
-          <el-table-column prop="serviceName" label="项目" align="center" />
-          <el-table-column prop="orgName" label="执行科室" align="center" />
+          <el-table-column
+            prop="performerName"
+            label="执行人"
+            align="center"
+          />
+          <el-table-column
+            prop="serviceStatus_enumText"
+            label="执行状态"
+            align="center"
+          />
+          <el-table-column
+            prop="serviceName"
+            label="项目"
+            align="center"
+          />
+          <el-table-column
+            prop="orgName"
+            label="执行科室"
+            align="center"
+          />
           <el-table-column
             label="操作"
             align="center"
@@ -149,7 +286,12 @@
             class-name="small-padding fixed-width"
           >
             <template #default="scope">
-              <el-button link type="primary" icon="Edit" @click="handleCancelPerform(scope.row)">
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleCancelPerform(scope.row)"
+              >
                 撤销
               </el-button>
             </template>
@@ -157,7 +299,11 @@
         </el-table>
       </div>
     </div>
-    <AdviceListDialog :open="open" :adviceList="adviceList" @close="open = false" />
+    <AdviceListDialog
+      :open="open"
+      :advice-list="adviceList"
+      @close="open = false"
+    />
   </div>
 </template>
 

openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue

@@ -15,7 +15,10 @@
           @keyup.enter="getEncounterList"
         >
           <template #append>
-            <el-button icon="Search" @click="getEncounterList" />
+            <el-button
+              icon="Search"
+              @click="getEncounterList"
+            />
           </template>
         </el-input>
         <el-select
@@ -43,8 +46,8 @@
         />
         <el-button
           type="primary"
-          @click="getEncounterList"
           style="margin-bottom: 10px; margin-left: 18px"
+          @click="getEncounterList"
         >
           搜索
         </el-button>
@@ -70,7 +73,12 @@
           label="性别"
           show-overflow-tooltip
         />
-        <el-table-column align="center" width="140" label="就诊日期" show-overflow-tooltip>
+        <el-table-column
+          align="center"
+          width="140"
+          label="就诊日期"
+          show-overflow-tooltip
+        >
           <template #default="scope">
             {{
               scope.row.receptionTime ? formatDateStr(scope.row.receptionTime, 'YYYY-MM-DD') : '-'
@@ -96,25 +104,40 @@
       <el-button
         type="primary"
         :disabled="!selectedMedicines.length"
-        @click="handleReturnDrug(undefined)"
         style="margin-bottom: 10px"
+        @click="handleReturnDrug(undefined)"
       >
         确认退药
       </el-button>
-      <el-button type="primary" @click="handleScan()" style="margin-bottom: 10px"> 扫码 </el-button>
+      <el-button
+        type="primary"
+        style="margin-bottom: 10px"
+        @click="handleScan()"
+      >
+        扫码
+      </el-button>
       <el-table
         ref="returnDrugRef"
         :data="returDrugList"
         style="width: 100%"
         height="calc(100vh - 300px)"
         border
-        @select="handleSelection"
-        @selection-change="handelSelectRows"
         :span-method="handelSpanMethod"
         class="no-hover-table"
+        @select="handleSelection"
+        @selection-change="handelSelectRows"
       >
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column prop="itemName" label="药品名称" show-overflow-tooltip align="center" />
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+        />
+        <el-table-column
+          prop="itemName"
+          label="药品名称"
+          show-overflow-tooltip
+          align="center"
+        />
         <el-table-column
           prop="totalPrice"
           label="总价"
@@ -126,18 +149,41 @@
             {{ scope.row.totalPrice ? scope.row.totalPrice.toFixed(2) + ' 元' : '-' }}
           </template>
         </el-table-column>
-        <el-table-column prop="lotNumber" label="批号" width="180" align="center" />
-        <el-table-column prop="traceNo" label="追溯码" width="180" align="center">
+        <el-table-column
+          prop="lotNumber"
+          label="批号"
+          width="180"
+          align="center"
+        />
+        <el-table-column
+          prop="traceNo"
+          label="追溯码"
+          width="180"
+          align="center"
+        >
           <template #default="scope">
-            <el-input v-model="scope.row.traceNo" placeholder="请输入追溯码" />
+            <el-input
+              v-model="scope.row.traceNo"
+              placeholder="请输入追溯码"
+            />
           </template>
         </el-table-column>
-        <el-table-column prop="reqStatus_enumText" label="退药状态" width="100" align="center">
+        <el-table-column
+          prop="reqStatus_enumText"
+          label="退药状态"
+          width="100"
+          align="center"
+        >
           <template #default="scope">
             {{ scope.row.refundEnum_enumText }}
           </template>
         </el-table-column>
-        <el-table-column prop="waitingQuantity" label="退药数量" width="100" align="center">
+        <el-table-column
+          prop="waitingQuantity"
+          label="退药数量"
+          width="100"
+          align="center"
+        >
           <template #default="scope">
             <span>{{
               scope.row.quantity
@@ -146,8 +192,18 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="doctorName" label="开单医生" align="center" width="180" />
-        <el-table-column label="操作" width="100" align="center" fixed="right">
+        <el-table-column
+          prop="doctorName"
+          label="开单医生"
+          align="center"
+          width="180"
+        />
+        <el-table-column
+          label="操作"
+          width="100"
+          align="center"
+          fixed="right"
+        >
           <template #default="scope">
             <el-popconfirm
               width="150"
@@ -157,7 +213,11 @@
               @confirm="handleReturnDrug(scope.row)"
             >
               <template #reference>
-                <el-button type="primary" link :disabled="scope.row.refundEnum != 16">
+                <el-button
+                  type="primary"
+                  link
+                  :disabled="scope.row.refundEnum != 16"
+                >
                   退药
                 </el-button>
               </template>
@@ -175,8 +235,8 @@
       </div>
     </el-card>
     <TraceNoDialog
-      :ypName="ypName"
-      :openDialog="openTraceNoDialog"
+      :yp-name="ypName"
+      :open-dialog="openTraceNoDialog"
       @submit="submit"
       @cancel="openTraceNoDialog = false"
     />

openhis-ui-vue3/src/views/clinicmanagement/skinrecord/index.vue

@@ -16,9 +16,9 @@
           v-model="queryParams.searchKey"
           placeholder="门诊号/病人/ID"
           clearable
+          style="width: 280px"
           @keyup.enter="handleQuery"
           @clear="handleQuery"
-          style="width: 280px"
         />
       </div>
 
@@ -32,14 +32,16 @@
             @click="handlePatientClick(item)"
           >
             <div class="card-header">
-              <div class="patient-name">{{ item.patientName || '未知' }}</div>
+              <div class="patient-name">
+                {{ item.patientName || '未知' }}
+              </div>
               <div class="patient-info">
                 <span>{{ item.genderEnum_enumText || '-' }}</span>
                 <span>/</span>
                 <span>{{ item.age || '-' }}</span>
               </div>
             </div>
-            <div class="card-divider"></div>
+            <div class="card-divider" />
             <div class="card-body">
               <div class="card-item">
                 <span class="label">就诊号：</span>
@@ -51,34 +53,58 @@
                   item.receptionTime ? parseTime(item.receptionTime) : '-'
                 }}</span>
               </div>
-              <div class="card-item" v-if="item.typeCode_dictText">
+              <div
+                v-if="item.typeCode_dictText"
+                class="card-item"
+              >
                 <span class="label">类型：</span>
                 <span class="value">{{ item.typeCode_dictText }}</span>
               </div>
             </div>
           </div>
-          <el-empty v-if="patientList.length === 0" description="暂无患者数据" />
+          <el-empty
+            v-if="patientList.length === 0"
+            description="暂无患者数据"
+          />
         </div>
       </el-scrollbar>
     </div>
 
     <!-- 右侧：皮试记录 -->
     <div class="right">
-      <div v-if="currentPatient" class="right-header">
+      <div
+        v-if="currentPatient"
+        class="right-header"
+      >
         <div class="patient-title">
           <span class="title-text">患者：{{ currentPatient.patientName }}</span>
-          <span class="title-info"
-            >{{ currentPatient.genderEnum_enumText }}/{{ currentPatient.age }}</span
-          >
+          <span class="title-info">{{ currentPatient.genderEnum_enumText }}/{{ currentPatient.age }}</span>
         </div>
         <div class="header-actions">
-          <el-button type="primary" icon="Plus" @click="handleAdd">新增</el-button>
+          <el-button
+            type="primary"
+            icon="Plus"
+            @click="handleAdd"
+          >
+            新增
+          </el-button>
         </div>
       </div>
       <div class="table-container">
-        <el-table :data="skinRecordList" border v-loading="loading">
-          <el-table-column prop="medicationName" label="药品名称" width="180" />
-          <el-table-column label="批号" width="160">
+        <el-table
+          v-loading="loading"
+          :data="skinRecordList"
+          border
+        >
+          <el-table-column
+            prop="medicationName"
+            label="药品名称"
+            width="180"
+          />
+          <el-table-column
+            label="批号"
+            width="160"
+          >
             <template #default="scope">
               <span v-if="!scope.row.isEdit">{{ scope.row.lotNumber || '-' }}</span>
               <el-select
@@ -97,8 +123,15 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column prop="verificationStatusEnum_enumText" label="皮试状态" width="80" />
-          <el-table-column label="皮试结果" width="120">
+          <el-table-column
+            prop="verificationStatusEnum_enumText"
+            label="皮试状态"
+            width="80"
+          />
+          <el-table-column
+            label="皮试结果"
+            width="120"
+          >
             <template #default="scope">
               <span
                 v-if="!scope.row.isEdit"
@@ -112,12 +145,21 @@
                 placeholder="请选择皮试结果"
                 style="width: 100%"
               >
-                <el-option label="阳性" value="1" />
-                <el-option label="阴性" value="2" />
+                <el-option
+                  label="阳性"
+                  value="1"
+                />
+                <el-option
+                  label="阴性"
+                  value="2"
+                />
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="执行护士" width="130">
+          <el-table-column
+            label="执行护士"
+            width="130"
+          >
             <template #default="scope">
               <span v-if="!scope.row.isEdit">{{ scope.row.practitionerId_dictText || '-' }}</span>
               <el-select
@@ -136,7 +178,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="核对护士" width="130">
+          <el-table-column
+            label="核对护士"
+            width="130"
+          >
             <template #default="scope">
               <span v-if="!scope.row.isEdit">{{
                 scope.row.checkPractitionerId_dictText || '-'
@@ -157,7 +202,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="执行时间" width="180">
+          <el-table-column
+            label="执行时间"
+            width="180"
+          >
             <template #default="scope">
               <span v-if="!scope.row.isEdit">
                 {{ parseTime(scope.row.recordedDate) }}
@@ -172,8 +220,15 @@
               />
             </template>
           </el-table-column>
-          <el-table-column prop="doctorId_dictText" label="开立医生" width="180" />
-          <el-table-column prop="note" label="备注" />
+          <el-table-column
+            prop="doctorId_dictText"
+            label="开立医生"
+            width="180"
+          />
+          <el-table-column
+            prop="note"
+            label="备注"
+          />
           <el-table-column
             label="操作"
             align="center"
@@ -187,35 +242,50 @@
                   link
                   type="primary"
                   icon="Edit"
-                  @click="handleEdit(scope.row)"
                   :disabled="!!scope.row.performerCheckId_dictText"
-                  >编辑</el-button
+                  @click="handleEdit(scope.row)"
                 >
+                  编辑
+                </el-button>
                 <el-button
                   link
                   type="primary"
                   icon="EditPen"
-                  @click="sign(scope.row)"
                   :disabled="
                     !!scope.row.performerCheckId_dictText ||
-                    scope.row.medicationStatusEnum_enumText == '未完成'
+                      scope.row.medicationStatusEnum_enumText == '未完成'
                   "
-                  >签名</el-button
+                  @click="sign(scope.row)"
                 >
+                  签名
+                </el-button>
               </template>
               <template v-else>
-                <el-button link type="primary" icon="Check" @click="handleSave(scope.row)"
-                  >保存</el-button
+                <el-button
+                  link
+                  type="primary"
+                  icon="Check"
+                  @click="handleSave(scope.row)"
                 >
-                <el-button link type="danger" icon="Close" @click="handleCancel(scope.row)"
-                  >取消</el-button
+                  保存
+                </el-button>
+                <el-button
+                  link
+                  type="danger"
+                  icon="Close"
+                  @click="handleCancel(scope.row)"
                 >
+                  取消
+                </el-button>
               </template>
             </template>
           </el-table-column>
         </el-table>
       </div>
-      <el-empty v-if="!currentPatient" description="请选择患者查看皮试记录" />
+      <el-empty
+        v-if="!currentPatient"
+        description="请选择患者查看皮试记录"
+      />
       <el-empty
         v-if="currentPatient && skinRecordList.length === 0"
         description="该患者暂无皮试记录"