From 64932e298dbf59c765423e9b5498a3e3615faff3 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 28 Apr 2025 17:08:57 +0800
Subject: [PATCH] dev

---
 src/components/registration/Edit.vue   | 153 ++++++++++++++-----------
 src/components/settings/ItemEdit.vue   | 126 +++++++++++---------
 src/components/settings/MemberEdit.vue |   2 +-
 src/views/registration/index.vue       |  24 ++--
 src/views/settings/item.vue            |  17 ++-
 src/views/settings/member.vue          |   7 +-
 6 files changed, 182 insertions(+), 147 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 34fdeec..c591d97 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -1,71 +1,87 @@
 <template>
-  <div class="title" style="margin-top: 24px">
-    <el-button type="primary">读卡</el-button>
-  </div>
-  <el-form
-      :model="edit_data"
-      label-width="auto"
-      :rules="rules"
-      ref="form"
-  >
-    <el-descriptions
-        border
-        direction="vertical"
-        label-width="100"
-        :column="4"
-        style="margin-top: 20px"
-    >
-      <el-descriptions-item label="名称">
-        <el-input v-model="edit_data.name" placeholder="请输入名称"></el-input>
-      </el-descriptions-item>
-      <el-descriptions-item label="性别">
-        <el-input v-model="edit_data.gender" placeholder="请输入性别"></el-input>
-      </el-descriptions-item>
-      <el-descriptions-item label="年龄">
-        <el-input v-model="edit_data.age" placeholder="请输入年龄"></el-input>
-      </el-descriptions-item>
-      <el-descriptions-item label="医生">
-        <el-select
-            v-model="edit_data.organizationDoctorId"
-            placeholder="请选择医生"
+  <Mask :is-show="isShow" width="800" title="挂号" @close="close" :show-footer="true">
+    <div style="padding:0 24px 24px">
+      <el-form
+          :model="edit_data"
+          label-width="auto"
+          :rules="rules"
+          ref="form"
+      >
+        <el-descriptions
+            border
+            direction="vertical"
+            label-width="100"
+            :column="4"
+            style="margin-top: 20px"
         >
-          <el-option
-              v-for="item in props.doctorList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-          >
-          </el-option>
-        </el-select>
-      </el-descriptions-item>
-      <el-descriptions-item label="手机号">
-        <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
-      </el-descriptions-item>
-      <el-descriptions-item label="就诊类型">
-        <el-select v-model="edit_data.visitType" placeholder="就诊类型">
-          <el-option label="初诊" :value="0"></el-option>
-          <el-option label="复诊" :value="1"></el-option>
-        </el-select>
-      </el-descriptions-item>
-      <el-descriptions-item label="备注">
-        <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
-      </el-descriptions-item>
-    </el-descriptions>
-    <div class="content" style="margin-top: 24px">
-      <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"/>
+          <el-descriptions-item label="名称">
+            <el-input v-model="edit_data.name" placeholder="请输入名称"></el-input>
+          </el-descriptions-item>
+          <el-descriptions-item label="性别">
+            <el-select
+                v-model="edit_data.gender"
+                placeholder="请选择性别"
+            >
+              <el-option
+                  v-for="item in ['男','女']"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+              ></el-option>
+            </el-select>
+          </el-descriptions-item>
+          <el-descriptions-item label="年龄">
+            <el-input v-model="edit_data.age" placeholder="请输入年龄"></el-input>
+          </el-descriptions-item>
+          <el-descriptions-item label="医生">
+            <el-select
+                v-model="edit_data.organizationDoctorId"
+                placeholder="请选择医生"
+            >
+              <el-option
+                  v-for="item in props.doctorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-descriptions-item>
+          <el-descriptions-item label="手机号">
+            <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
+          </el-descriptions-item>
+          <el-descriptions-item label="就诊类型">
+            <el-select v-model="edit_data.visitType" placeholder="就诊类型">
+              <el-option label="初诊" :value="0"></el-option>
+              <el-option label="复诊" :value="1"></el-option>
+            </el-select>
+          </el-descriptions-item>
+          <el-descriptions-item label="备注">
+            <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
+          </el-descriptions-item>
+        </el-descriptions>
+        <div class="content" style="margin-top: 24px">
+          <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"/>
+        </div>
+      </el-form>
     </div>
-  </el-form>
-  <div class="bottom_btn">
-    <el-button type="primary" @click="save">保存</el-button>
-    <el-button @click="close">取消</el-button>
-    <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
-  </div>
+    <template #footer>
+      <div class="bottom_btn">
+        <el-button type="primary" @click="save">保存</el-button>
+        <el-button @click="close">取消</el-button>
+        <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
+      </div>
+    </template>
+  </Mask>
+
+
 </template>
 <script setup lang="ts">
 import {onMounted, ref} from 'vue'
 import {post} from '@/utils/request.ts'
 import CardDefault from '@/components/registration/CardDefault.vue'
 import {ElMessage} from "element-plus";
+import Mask from "@/components/common/Mask.vue";
 
 // 定义医生选项的接口
 interface Doctor {
@@ -103,9 +119,11 @@ const rules = ref<any>({
     {required: true, message: '请输入规格', trigger: 'blur'},
   ],
 })
+const isShow = ref(false)
 const emit = defineEmits(['close'])
 const close = () => {
-  emit('close', false)
+  isShow.value = false
+  emit('close')
 }
 const id = props.id
 const save = () => {
@@ -147,13 +165,16 @@ const socialCard: any = ref({
   payInfo: {},
   lastUse: null
 })
-onMounted(() => {
+const init = () => {
+  isShow.value = true
+  edit_data.value.organizationDoctorId = props.id
   if (id) {
     post('registration/getById', {id}).then((res: any) => {
       edit_data.value = res
     })
   }
-})
+}
+defineExpose({init})
 </script>
 <style scoped lang="scss">
 .title {
@@ -165,8 +186,10 @@ onMounted(() => {
 }
 
 .bottom_btn {
-  right: 0;
-  position: absolute;
-  bottom: 0;
+  height: 100%;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  padding: 0 24px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/settings/ItemEdit.vue b/src/components/settings/ItemEdit.vue
index 8560fae..20cea46 100644
--- a/src/components/settings/ItemEdit.vue
+++ b/src/components/settings/ItemEdit.vue
@@ -1,61 +1,65 @@
 <template>
-  <div>
-    <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
-      <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
-                 plain>
-        一键建档
-      </el-button>
+  <Mask :is-show="isShow" @close="close" :title="props.id?'项目编辑':'项目新增'" :show-footer="true">
+    <div style="padding: 24px">
+      <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
+        <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
+                   plain>
+          一键建档
+        </el-button>
+      </div>
+      <el-form :model="form" label-width="auto">
+        <el-descriptions
+            :column="3"
+            direction="vertical"
+            border
+        >
+          <el-descriptions-item label="项目名称">
+            <el-form-item>
+              <el-input v-model="form.itemName"/>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="单位">
+            <el-form-item>
+              <el-input v-model.number="form.unit" min="0">
+                <template #append>次</template>
+              </el-input>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="医保码">
+            <el-form-item>
+              <el-input v-model="form.itemSocialCode"/>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="原价">
+            <el-form-item>
+              <el-input v-model="form.purchaseUnitPrice">
+                <template #append>
+                  <el-button text @click="imageURL">￥</el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="售价">
+            <el-form-item>
+              <el-input v-model="form.unitPrice">
+                <template #append>
+                  <el-button type="text" @click="imageURL">￥</el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-descriptions-item>
+        </el-descriptions>
+      </el-form>
     </div>
-    <el-form :model="form" label-width="auto">
-      <el-descriptions
-          :column="3"
-          direction="vertical"
-          border
-      >
-        <el-descriptions-item label="项目名称">
-          <el-form-item>
-            <el-input v-model="form.itemName"/>
-          </el-form-item>
-        </el-descriptions-item>
-        <el-descriptions-item label="单位">
-          <el-form-item>
-            <el-input v-model.number="form.unit" min="0">
-              <template #append>次</template>
-            </el-input>
-          </el-form-item>
-        </el-descriptions-item>
-        <el-descriptions-item label="医保码">
-          <el-form-item>
-            <el-input v-model="form.itemSocialCode"/>
-          </el-form-item>
-        </el-descriptions-item>
-        <el-descriptions-item label="原价">
-          <el-form-item>
-            <el-input v-model="form.purchaseUnitPrice">
-              <template #append>
-                <el-button text @click="imageURL">￥</el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-descriptions-item>
-        <el-descriptions-item label="售价">
-          <el-form-item>
-            <el-input v-model="form.unitPrice">
-              <template #append>
-                <el-button type="text" @click="imageURL">￥</el-button>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-descriptions-item>
-      </el-descriptions>
-      <div class="btn-group">
+    <template #footer>
+      <div class="bottom">
         <el-button type="primary" @click="save()">保存</el-button>
         <el-button @click="close">取消</el-button>
         <el-button v-if="props.id" @click="deleteDetail" type="danger">删除</el-button>
       </div>
-    </el-form>
+    </template>
+  </Mask>
 
-  </div>
   <Search ref="createSearchRef" @confirm="createConfirm"/>
 </template>
 <script setup lang="ts">
@@ -63,6 +67,7 @@ import {defineProps, defineEmits, ref, nextTick, onMounted} from 'vue'
 import {post} from "@/utils/request.ts";
 import Search from "./Search.vue";
 import {ElMessage} from "element-plus";
+import Mask from "@/components/common/Mask.vue";
 
 const props = defineProps({
   id: {
@@ -85,8 +90,10 @@ const form = ref<any>({
   unitPrice: "", // 单位
   purchaseUnitPrice: "" //
 })
+const isShow = ref<any>(false)
 const emit = defineEmits(['close'])
 const close = () => {
+  isShow.value = false
   form.value = {
     itemName: "", // 姓名
     itemSocialCode: "", // 医保码
@@ -144,17 +151,24 @@ const deleteDetail = () => {
 
 }
 onMounted(() => {
-  if (id) {
-    post("item/getItemById", {id}).then((res: any) => {
+
+})
+const init = () => {
+  isShow.value = true
+  if (props.id) {
+    post("item/getItemById", {id:props.id}).then((res: any) => {
       form.value = res
     })
   }
-})
+}
+defineExpose({init})
 </script>
 <style scoped>
-.btn-group {
+.bottom {
+  height: 100%;
   display: flex;
   justify-content: flex-end;
-  margin-top: 20px;
+  align-items: center;
+  padding: 0 24px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue
index 59348f7..95d6e7f 100644
--- a/src/components/settings/MemberEdit.vue
+++ b/src/components/settings/MemberEdit.vue
@@ -1,7 +1,7 @@
 <template>
   <Mask :is-show="isShow" @close="exit" :width="800" :height="600" title="成员管理" :show-footer="true">
     <div style="padding: 24px">
-      <el-form :model="userInfo" label-width="auto" :rules="rules" ref="ruleFormRef">
+      <el-form :model="userInfo" label-width="auto" :rules="rules" ref="ruleFormRef" style="width: 100%;height: 100%">
         <el-descriptions
             title="基本信息"
             :column="3"
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 93fbbc4..bc7f7af 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -11,7 +11,7 @@
               <li :class="isShowNum==index?'active':''" v-for="(item, index) in roleList" :key="index"
                   @click="isShowNum=index">
                 <span class="name" :class="isShowNum==index?'active_name':''">{{ item.name }}</span>
-                <span class="btn" :class="isShowNum==index?'active_btn':''" @click="isShow=true">挂号</span>
+                <span class="btn" :class="isShowNum==index?'active_btn':''" @click="openDialog(item)">挂号</span>
               </li>
             </ul>
           </div>
@@ -30,7 +30,9 @@
             />
           </div>
           <div class="list">
-            <List :patientList="patientList" @rowClick="rowClick"></List>
+            <el-scrollbar style="height: 100%">
+              <List :patientList="patientList" @rowClick="rowClick"></List>
+            </el-scrollbar>
           </div>
         </div>
         <div class="bottom">
@@ -47,13 +49,11 @@
         </div>
       </div>
     </div>
-    <Mask :is-show="isShow" width="800" title="挂号" @close="close">
-      <Edit :id="id" :doctorList="roleList" @close="close"></Edit>
-    </Mask>
+    <Edit :id="id" ref="editRef" :doctorList="roleList" @close=" getPatientList"></Edit>
   </div>
 </template>
 <script setup lang="ts">
-import {onMounted, ref} from 'vue'
+import {nextTick, onMounted, ref} from 'vue'
 import Picker from "@/components/Picker.vue";
 import Mask from "@/components/common/Mask.vue";
 import Edit from "@/components/registration/Edit.vue";
@@ -89,6 +89,7 @@ const getPatientList = () => {
     endDate: selectedDate.value[1]
   }).then((res: any) => {
     patientList.value = res.list
+    total.value = res.total_count
   })
 }
 const total = ref(0)
@@ -100,12 +101,15 @@ const changePage = (page: any) => {
 }
 const id = ref('')
 const rowClick = (row: any) => {
-  isShow.value = true
   id.value = row.id
+  openDialog(row)
 }
-const close = () => {
-  isShow.value = false
-  getPatientList()
+const editRef = ref<any>('')
+const openDialog = (item: any) => {
+  id.value = item.id
+  nextTick(()=>{
+    editRef.value?.init()
+  })
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index d9ce6ed..c1bbf3a 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -19,7 +19,7 @@
       <div class="title-btn">
         <el-button type="primary" @click="initData()">查询</el-button>
         <el-button type="primary" @click="resetSearch">重置</el-button>
-        <el-button type="primary" :icon="Plus" @click="isShow=true">新建项目</el-button>
+        <el-button type="primary" :icon="Plus" @click="openDialog">新建项目</el-button>
         <el-button type="primary" @click="openSetMenu">组套</el-button>
       </div>
     </div>
@@ -53,9 +53,7 @@
       </div>
     </div>
   </div>
-  <Mask :is-show="isShow" @close="initData()" :title="id?'项目编辑':'项目新增'">
-    <ItemEdit :id="id" ref="ItemEditRef" @close="initData()"></ItemEdit>
-  </Mask>
+  <ItemEdit :id="id" ref="ItemEditRef" @close="initData()"></ItemEdit>
   <SetMenu ref="setMenuRef"></SetMenu>
 </template>
 <script setup lang="ts">
@@ -117,11 +115,7 @@ const isShow = ref(false)
 const ItemEditRef = ref<any>('')
 const id = ref('')
 const rowClick = ((row: any) => {
-  isShow.value = true
-  id.value = row.id
-  nextTick(() => {
-    ItemEditRef.value.init(row.id)
-  })
+  openDialog()
 })
 
 const tableData = ref<any>([])
@@ -153,6 +147,11 @@ const resetSearch = () => {
   search.value = {}
   initData()
 }
+const openDialog = () => {
+  nextTick(() => {
+    ItemEditRef.value?.init()
+  })
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index d27048a..fb025d9 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -87,7 +87,7 @@ const isShow = ref(false)
 const tableData = ref<any>([]);
 const memberEditRef = ref<any>(null)
 const rowClick = (row: any) => {
-  id.value = row.memberInfo.id
+  id.value = String(row.memberInfo.id)
   openDialog()
 }
 const openDialog= () => {
@@ -136,11 +136,6 @@ const init = (() => {
     list()
   })
 })
-const deleteDoctor = (row: any) => {
-  post('organization/member/list ', {id}).then((res: any) => {
-    init()
-  })
-}
 const sectionList = ref<any>([]);
 const list = () => {
   post('organization/section/allList').then((res: any) => {