7 changed files with 41 additions and 83 deletions
--- a/src/components/PopoverInput.vue
+++ b/src/components/PopoverInput.vue
@ -1,5 +1,5 @@
 <template>
-  <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus"></el-input>
+  <el-input v-model="input" :style="{'width': props.width+'px'}" clearable :disabled="disabled" ref="inputRef" @click="showPopo" @focus="focus"></el-input>
  <el-popover placement="bottom-start" trigger="click" :width="props.width" :virtual-ref="inputRef" ref="popoverRef">
    <div class="code-popo" v-if="props.list.length > 0">
      <div class="code-item" v-for="item in props.list">
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@ -1,5 +1,5 @@
 <template>
-  <Panel :title="'病历'">
+  <Panel :title="'病例'">
    <template #tools>
      <div class="content">
        <div class="model-selector">
@ -139,7 +139,4 @@ defineExpose({initDiagnosisSearch})
 .container {
  margin: 24px;
 }
-:deep(.el-form-item){
-  margin-bottom: 2px;
-}
 </style>
--- a/src/components/outpatient/CaseDetail.vue
+++ b/src/components/outpatient/CaseDetail.vue
@ -1,5 +1,5 @@
 <template>
-  <Panel :title="'病历'">
+  <Panel :title="'病例'">
    <template #tools>
      <div class="content">
        <div class="model-selector">
--- a/src/components/outpatient/PharmaceuticalConsumables.vue
+++ b/src/components/outpatient/PharmaceuticalConsumables.vue
@ -9,28 +9,18 @@
              <el-popover
                  placement="top-start"
                  trigger="hover"
-                  width="400"
-                  @show="getHilistInfo(item)"
-                  @hide="colosInfo"
-
+                  width="200px"
              >
                <template #reference>
                  {{ item.name }}
                </template>

-                <div class="detail">
-                  <div style="display: flex;justify-content: space-between">
-                    <div style="font-size: 18px;font-weight: 500;color: #000">{{ hilistInfo.name }}</div>
-                    <div>￥{{ item.selectedPrice }}/{{ item.selectedUnit }}</div>
-                  </div>
-                  <div>
-
-                    <div>规格:{{hilistInfo.json?.dosage_specifications||'-'}}</div>
-                  </div>
+                <div>
+                  {{item.hilistCode}}
                </div>
              </el-popover>
-            </div>
-            <div class="price">￥{{ item.selectedPrice || '0' }}</div>
+              </div>
+            <div class="price">￥{{item.selectedPrice || '0' }}</div>
            <div class="unit">
              <div class="unit-content">
                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>
@ -47,11 +37,11 @@
                </el-dropdown>
              </div>
            </div>
-            <div class="sub-price">￥{{ item.unitPrice * item.selectedNum }}</div>
+            <div class="sub-price">￥{{ item.unitPrice*item.selectedNum }}</div>
            <div class="delete">
              <div @click="deleteItem(item.id)" class="delete-btn">
                <el-icon>
-                  <Close/>
+                  <Close />
                </el-icon>
              </div>
            </div>
@ -71,7 +61,7 @@
          </SearchInput>
        </div>
        <span style="margin-right: 24px">
-          ￥{{ sumPrice }}
+          ￥{{ sumPrice}}
        </span>
      </div>
    </div>
@ -82,7 +72,6 @@ import Panel from "@/components/common/Panel.vue";
 import SearchInput from "@/components/SearchInput.vue";
 import {CircleClose, Close} from "@element-plus/icons-vue";
 import {watch, ref, computed} from "vue";
-import {post} from "@/utils/request.ts";

 const props = defineProps({
  status: {
@ -90,8 +79,8 @@ const props = defineProps({
    default: 0
  }
 })
-const disabled = computed(() => {
-  if (props.status === 1) {
+const disabled=computed(()=>{
+  if(props.status === 1){
    return true
  }
 })
@ -134,21 +123,10 @@ const selectUnit = (item: any, unit: any) => {
 }
 const sumPrice = ref(0)
 const emit = defineEmits(['focus'])
-const focus = (e: any) => {
-  emit('focus', e)
+const focus=(e:any)=>{
+ emit('focus',e)
 }
-const hilistInfo = ref<any>({})
-const getHilistInfo = (item: any) => {
-  if (item.hilistCode) {
-    post("social/directory/getByCode", {code: item.hilistCode}).then((res: any) => {
-      hilistInfo.value = res
-    })
-  }
-}
-const colosInfo = () => {
-  hilistInfo.value = {}
-}
-watch(() => list.value, (newList) => {
+watch(()=>list.value, (newList) => {
  sumPrice.value = newList.reduce((total, item) => {
    return total + (item.selectedNum || 0) * (item.selectedPrice || 0);
  }, 0);
@ -157,7 +135,6 @@ watch(() => list.value, (newList) => {

 <style scoped lang="scss">
@use "@/assets/scss/base";
-
 .content {
  display: flex;
  flex-direction: column;
@ -165,7 +142,6 @@ watch(() => list.value, (newList) => {
  .list {
    flex: 1;
    min-height: 0;
-
    .item {
      height: 30px;
      border-top: 1px solid #EAEAEC;
@ -207,15 +183,13 @@ watch(() => list.value, (newList) => {
        width: 180px;
        margin-left: 10px;
        line-height: 30px;
-
-        .unit-content {
+        .unit-content{
          display: flex;
          align-items: center;
        }

      }
-
-      .sub-price {
+      .sub-price{
        height: 100%;
        line-height: 30px;
      }
@ -225,11 +199,9 @@ watch(() => list.value, (newList) => {
        width: 100px;
        text-align: center;
        line-height: 30px;
-
-        .delete-btn {
+        .delete-btn{
          cursor: pointer;
-
-          &:hover {
+          &:hover{
            color: base.$primary-color;
          }
        }
--- a/src/components/outpatient/PhysiqueExamInuput.vue
+++ b/src/components/outpatient/PhysiqueExamInuput.vue
@ -1,7 +1,7 @@
 <template>
  <el-popover placement="bottom-start" trigger="click" :width="props.width">
    <template #reference>
-      <el-input v-model="input" style="width:100%;height: 100%" clearable :disabled="disabled"></el-input>
+      <el-input v-model="input" :style="{'width': props.width+'px'}" clearable :disabled="disabled"></el-input>
    </template>
    <el-tabs v-model="tabName" class="demo-tabs">
      <el-tab-pane v-for="item in props.list" :label="item.name" :name="item.name">
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@ -2,7 +2,7 @@
  <Mask :is-show="isShow" width="800" :height="500" title="挂号" @close="close" :show-footer="true">
    <template #default>
      <el-scrollbar>
-        <div style="padding:0 24px">
+        <div style="padding:0 24px 24px">
          <el-form
              v-loading="loading"
              :model="edit_data"
@ -17,11 +17,6 @@
                :column="4"
                style="margin-top: 20px"
            >
-              <el-descriptions-item label="姓名">
-                <el-form-item prop="name" style="margin-bottom: 2px">
-                  <el-input v-model="edit_data.name" placeholder="请输入姓名" clearable></el-input>
-                </el-form-item>
-              </el-descriptions-item>
              <el-descriptions-item label="性别">
                <el-form-item prop="gender">
                  <el-radio-group v-model="edit_data.gender">
@ -30,6 +25,12 @@
                  </el-radio-group>
                </el-form-item>
              </el-descriptions-item>
+              <el-descriptions-item label="姓名">
+                <el-form-item prop="name">
+                  <el-input v-model="edit_data.name" placeholder="请输入姓名" clearable></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+
              <el-descriptions-item label="年龄">
                <el-form-item prop="age">
                  <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
@ -38,7 +39,7 @@
              <el-descriptions-item label="科室">
                <el-form-item>
                  <el-select
-                      v-model="edit_data.organizationSectionId"
+                      v-model="edit_data.sectionId"
                      placeholder="选择科室"
                  >
                    <el-option
@ -98,6 +99,14 @@
                  </el-select>
                </el-form-item>
              </el-descriptions-item>
+              <el-descriptions-item label="待遇状态">
+                <el-form-item prop="treatmentStatus">
+                  <el-select v-model="edit_data.treatmentStatus" placeholder="待遇状态">
+                    <el-option label="新患者" :value="0"></el-option>
+                    <el-option label="老患者" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
              <el-descriptions-item
                  label="备注">
                <el-form-item>
@ -117,9 +126,6 @@
                {{ getKey(insutypes, scope.row.insutype) }}
              </template>
            </el-table-column>
-            <el-table-column label="待遇状态" >
-            </el-table-column>
-            <el-table-column label="参保日期" prop="psn_insu_date"></el-table-column>
            <el-table-column label="剩余余额" prop="balc">
              <template #default="scope">
                ￥{{ scope.row.balc || 0 }}
@ -151,7 +157,7 @@
        <div class="bottom-right">
          <el-button type="primary" @click="save">保存</el-button>
          <el-button @click="close">取消</el-button>
-          <el-button v-if="id&&edit_data.status==1" type="danger" @click="deleteDetail">退号</el-button>
+          <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
        </div>
      </div>
    </template>
@ -250,8 +256,7 @@ const save = () => {
      } else {
        console.log(socialCard.value)
        post('registration/add', {
-          data: data,
-          mdtrtCertNo: socialCard.value.mdtrtCertNo,
+          data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
          mdtrtCertType: socialCard.value.mdtrtCertType
        }).then(() => {
          ElMessage.success('新建成功')
@ -289,7 +294,7 @@ const init = () => {
 const isShowCard = ref<any>(true)
 const tableData = ref<any>([])
 const socialCardUpdate = (e: any) => {
-  loading.value = true
+  console.log(e, "e")
  if (e) {
    isShowCard.value = false
    edit_data.value = e.data.baseinfo
@ -312,7 +317,6 @@ const deleteCard = () => {
      if (action == "confirm") {
        isShowCard.value = true
        edit_data.value = {}
-        tableData.value=[]
        nextTick(() => {
          cardDefaultRef.value?.close()
        })
@ -420,8 +424,4 @@ defineExpose({init})
    border: none;
  }
 }
-
-:deep(.el-form-item) {
-  margin-bottom: 2px !important;
-}
 </style>
--- a/src/components/registration/List.vue
+++ b/src/components/registration/List.vue
@ -27,11 +27,7 @@
          </el-tag>
        </template>
      </el-table-column>
-      <el-table-column prop="organizationSectionId" label="科室">
-        <template #default="scope">
-          {{ sectionList.find((item:any)=>item.id===scope.row.organizationSectionId)?.name || '-' }}
-        </template>
-      </el-table-column>
+      <el-table-column prop="section_name" label="科室"></el-table-column>
      <el-table-column prop="organizationDoctorId" label="医生">
        <template #default="scope">
          {{ roleList.find((item: any) => item.id === scope.row.organizationDoctorId)?.name || '-' }}
@ -64,14 +60,12 @@ const props = defineProps({
 })
 onMounted(() => {
  initDoctor()
-  initSection()
 })
 const visitType = ref<any>({
  0: '初诊',
  1: '复诊'
 })
 const roleList = ref<any>([])
-const sectionList = ref<any>([])
 const initDoctor = () => {
  let query = {
    keyword: null,
@ -85,11 +79,6 @@ const emit = defineEmits(['rowClick'])
 const rowClick = (row: any) => {
  emit('rowClick', row)
 }
-const initSection = () => {
-  post('organization/section/allList').then((res: any) => {
-    sectionList.value = res
-  })
-}
 </script>
 <style scoped lang="scss">
 .patient-list {