Merge remote-tracking branch 'origin/develop' into develop

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

@@ -766,20 +766,30 @@
       </el-table-column>
       <el-table-column type="selection" align="center" width="60" />
       <el-table-column label="组" align="center" width="60" prop="groupIcon" />
-      <el-table-column label="医嘱" align="center" prop="productName" width="400">
+      <el-table-column label="医嘱类型" align="center" prop="productName" width="130">
         <template #default="scope">
           <template v-if="scope.row.isEdit">
             <el-select
-              style="width: 35%; margin-right: 20px"
+                size="default"
+                style="width: 100%;"
                 v-model="scope.row.adviceType"
                 :ref="'adviceTypeRef' + scope.$index"
+                placeholder="选择类型"
+                clearable
                 @change="
                   (value) => {
                     expandOrder = [];
+                    // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
                     prescriptionList[scope.$index].adviceName = undefined;
                     adviceQueryParams.adviceType = value;
                   }
                 "
+                @clear="
+                  () => {
+                    prescriptionList[scope.$index].adviceName = undefined;
+                    prescriptionList[scope.$index].adviceType_dictText = '';
+                  }
+                "
             >
               <el-option
                   v-for="item in adviceTypeList"
@@ -792,13 +802,26 @@
                       prescriptionList[scope.$index].adviceType_dictText = item.label;
                     }
                   "
-              />
+              >
+                <span style="float: left">{{ item.label }}</span>
+                <span style="float: right; color: var(--el-text-color-secondary); font-size: 12px">
+                  {{ item.value }}
+                </span>
+              </el-option>
             </el-select>
+          </template>
+          <el-tag v-else size="small" type="primary">{{ scope.row.adviceType_dictText }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目" align="center" prop="" width="280">
+        <template #default="scope">
+          <template v-if="scope.row.isEdit">
             <el-popover
                 :popper-style="{ padding: '0' }"
                 placement="bottom-start"
                 :visible="scope.row.showPopover"
                 :width="1200"
+                trigger="manual"
             >
               <adviceBaseList
                   ref="adviceTableRef"
@@ -814,12 +837,15 @@
               <template #reference>
                 <el-input
                     :ref="'adviceRef' + scope.$index"
-                  style="width: 50%"
+                    size="default"
+                    style="width: 100%;"
                     v-model="scope.row.adviceName"
-                  placeholder="请选择项目"
+                    placeholder="输入项目名称搜索或点击选择"
+                    clearable
                     @input="handleChange"
                     @click="handleFocus(scope.row, scope.$index)"
                     @blur="handleBlur(scope.row)"
+                    @clear="() => { scope.row.adviceName = undefined; }"
                     @keyup.enter.stop="handleFocus(scope.row, scope.$index)"
                     @keydown="
                       (e) => {
@@ -832,11 +858,23 @@
                         }
                       }
                     "
-                />
+                >
+                  <template #prefix>
+                    <el-icon><Search /></el-icon>
+                  </template>
+                  <template #suffix v-if="scope.row.adviceName">
+                    <el-icon style="cursor: pointer; color: var(--el-color-info);" title="快速选择">
+                      <ArrowDown />
+                    </el-icon>
+                  </template>
+                </el-input>
               </template>
             </el-popover>
           </template>
-          <span v-else>{{ scope.row.adviceName }}</span>
+          <div v-else style="display: flex; align-items: center; gap: 8px;">
+            <el-icon color="var(--el-color-primary)"><Memo /></el-icon>
+            <span>{{ scope.row.adviceName }}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="" width="90">
@@ -991,8 +1029,9 @@ import SkinTestInfo from './skinTestInfo';
 import Decimal from 'decimal.js';
 import useUserStore from '@/store/modules/user';
 import {ElMessage, ElMessageBox} from 'element-plus';
-import {ArrowDown} from '@element-plus/icons-vue';
+import {ArrowDown, Search, Memo} from '@element-plus/icons-vue';
 import printUtils, {getPrinterList, PRINT_TEMPLATE, savePrinterToCache,} from '@/utils/printUtils';
+import Template from "@/views/inpatientDoctor/home/emr/components/template.vue";
 
 const emit = defineEmits(['selectDiagnosis']);
 const total = ref(0);