From 256ba5ff10c0285f728650dc2c426fb200ba01fa Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 29 Apr 2025 09:50:31 +0800
Subject: [PATCH] dev

---
 src/components/home/index/PaymentDetails.vue  | 31 ++++----
 src/components/home/index/ValidityWarning.vue |  1 -
 src/components/registration/Edit.vue          | 71 +++++++++++--------
 src/components/settings/ItemEdit.vue          |  1 -
 src/components/settings/Search.vue            | 34 ++++++---
 src/views/home/index.vue                      |  2 +-
 src/views/outpatient/index.vue                | 19 +++--
 7 files changed, 96 insertions(+), 63 deletions(-)

diff --git a/src/components/home/index/PaymentDetails.vue b/src/components/home/index/PaymentDetails.vue
index ed2f269..a09dc0f 100644
--- a/src/components/home/index/PaymentDetails.vue
+++ b/src/components/home/index/PaymentDetails.vue
@@ -4,9 +4,9 @@ import {onMounted, ref} from "vue";
 import {getThisWeek} from "@/utils/dateUtils.ts";
 import {post} from "@/utils/request.ts";
 
-onMounted(() => {
-  getRevenueOverview()
-})
+// onMounted(() => {
+//   getRevenueOverview()
+// })
 const payTypeRevenue = ref<any>([
   {
     name: '医保支付',
@@ -34,21 +34,28 @@ const payTypeRevenue = ref<any>([
     background: '#E5F9FF'
   }
 ]);
-const getRevenueOverview = () => {
-  const thisWeek = getThisWeek();
-  post("statistics/getRevenueOverview", {beginTime: thisWeek.start, endTime: thisWeek.end}).then((res: any) => {
-    if (res.payTypeRevenue.length === 0) return
-    payTypeRevenue.value = res.payTypeRevenue
-  })
-
-}
+const background = ref<any>([
+  '#F0F4FD',
+  '#ECF8FE',
+  '#FFF5EC',
+  '#FFEEEE',
+  '#E5F9FF'
+]);
+// const getRevenueOverview = () => {
+//   const thisWeek = getThisWeek();
+//   post("statistics/getRevenueOverview", {beginTime: thisWeek.start, endTime: thisWeek.end}).then((res: any) => {
+//     if (res.payTypeRevenue.length === 0) return
+//     payTypeRevenue.value = res.payTypeRevenue
+//   })
+//
+// }
 </script>
 
 <template>
   <Panel title="支付明细" class="detail-price">
     <div class="detail-price-content">
       <div class="detail-price-content-item" v-for="(item,index) in payTypeRevenue"
-           :style="'background:'+item.background">
+           :style="`background:${background[index]}`">
         <img class="detail-price-content-item-image" :src="`/static/images/home/${index+1}.png`" :alt="item.name">
         <div class="detail-price-content-item-text">
           <div class="detail-price-content-item-text-name">{{ item.name }}</div>
diff --git a/src/components/home/index/ValidityWarning.vue b/src/components/home/index/ValidityWarning.vue
index 233f775..b96ee8d 100644
--- a/src/components/home/index/ValidityWarning.vue
+++ b/src/components/home/index/ValidityWarning.vue
@@ -147,7 +147,6 @@ const getExpiryDateWarning = () => {
   height: 100%;
   display: flex;
   flex-direction: column;
-  margin-right: 24px;
 
   .box {
     .item {
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index c591d97..e3751b7 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -18,21 +18,21 @@
             <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-form-item prop="gender">
+              <el-radio-group v-model="edit_data.gender">
+                <el-radio value="男">男</el-radio>
+                <el-radio value="女">女</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </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-form-item prop="certno">
+              <el-input v-model="edit_data.certno" placeholder="请输入证件码"></el-input>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item label="医生">
             <el-select
                 v-model="edit_data.organizationDoctorId"
@@ -112,12 +112,15 @@ const rules = ref<any>({
   name: [
     {required: true, message: '请输入名称', trigger: 'blur'},
   ],
-  code: [
-    {required: true, message: '请输入编码', trigger: 'blur'},
+  gender: [
+    {required: true, message: '请选择性别', trigger: 'blur'},
   ],
   spec: [
     {required: true, message: '请输入规格', trigger: 'blur'},
   ],
+  certno: [
+    {required: true, message: '请输入证件码', trigger: 'blur'},
+  ],
 })
 const isShow = ref(false)
 const emit = defineEmits(['close'])
@@ -126,30 +129,36 @@ const close = () => {
   emit('close')
 }
 const id = props.id
+const form = ref()
 const save = () => {
   let data = {
     ...edit_data.value,
     psnNo: socialCard.value.data?.baseinfo.psn_no,
     insutype: socialCard.value.data?.insuinfo[0].insutype
   }
-  if (id) {
-    post('registration/edit', {
-      data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
-      mdtrtCertType: socialCard.value.mdtrtCertType
-    }).then(() => {
-      ElMessage.success('修改成功')
-      close()
-    })
-  } else {
-    console.log(socialCard.value)
-    post('registration/add', {
-      data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
-      mdtrtCertType: socialCard.value.mdtrtCertType
-    }).then(() => {
-      ElMessage.success('新建成功')
-      close()
-    })
-  }
+  form.value.validate((v: any) => {
+    if (v) {
+      if (id) {
+        post('registration/edit', {
+          data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
+          mdtrtCertType: socialCard.value.mdtrtCertType
+        }).then(() => {
+          ElMessage.success('修改成功')
+          close()
+        })
+      } else {
+        console.log(socialCard.value)
+        post('registration/add', {
+          data: data, mdtrtCertNo: socialCard.value.mdtrtCertNo,
+          mdtrtCertType: socialCard.value.mdtrtCertType
+        }).then(() => {
+          ElMessage.success('新建成功')
+          close()
+        })
+      }
+    }
+  })
+
 }
 const deleteDetail = () => {
   post('registration/delete', {id}).then(() => {
diff --git a/src/components/settings/ItemEdit.vue b/src/components/settings/ItemEdit.vue
index 20cea46..101dccd 100644
--- a/src/components/settings/ItemEdit.vue
+++ b/src/components/settings/ItemEdit.vue
@@ -59,7 +59,6 @@
       </div>
     </template>
   </Mask>
-
   <Search ref="createSearchRef" @confirm="createConfirm"/>
 </template>
 <script setup lang="ts">
diff --git a/src/components/settings/Search.vue b/src/components/settings/Search.vue
index 25cb938..dd43b4d 100644
--- a/src/components/settings/Search.vue
+++ b/src/components/settings/Search.vue
@@ -1,5 +1,5 @@
 <template>
-  <Mask :width="800" :height="600" :is-show="show" :top="100">
+  <Mask :width="800" :height="600" :is-show="show" :top="100" @close="close" title="药品" :show-footer="true">
     <div class="search_content_wrapper">
       <div class="search_wrapper">
         <span>项目名称:</span>
@@ -31,18 +31,23 @@
             <el-table-column prop="code" label="医保编码" width="180" show-overflow-tooltip/>
             <el-table-column prop="enddate" label="有效期至" width="180" show-overflow-tooltip/>
           </el-table>
-          <div class="page_btn_list">
-            <el-pagination background layout="prev, pager, next" :page-count="search_result.total_page"
-                           v-model:current-page="current_page" @current-change="change_page"/>
-          </div>
+
         </div>
 
       </div>
-      <div class="search_bottom">
-        <el-button type="primary" @click="confirm">确认</el-button>
-        <el-button type="primary" @click="close">关闭</el-button>
-      </div>
     </div>
+    <template #footer>
+      <div class="bottom">
+        <div class="page_btn_list">
+          <el-pagination background layout="prev, pager, next" :page-count="search_result.total_page"
+                         v-model:current-page="current_page" @current-change="change_page"/>
+        </div>
+        <div class="btn">
+          <el-button type="primary" @click="confirm">确认</el-button>
+          <el-button type="primary" @click="close">关闭</el-button>
+        </div>
+      </div>
+    </template>
   </Mask>
 </template>
 <script setup lang="ts">
@@ -87,8 +92,8 @@ const change_current_search_data_index = (val: any) => {
 const init = (_name: string) => {
   keyword.value = _name;
   show.value = true;
-  init_search_data()
-  search_social()
+  // init_search_data()
+  // search_social()
 };
 defineExpose({init});
 
@@ -227,4 +232,11 @@ const close = () => {
   width: 100%;
   height: 400px;
 }
+.bottom{
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 24px;
+}
 </style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1cb5d52..3a7233a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -18,7 +18,7 @@
       <Card v-model="userMessage"></Card>
       <CustomerService v-model="proxyMessage"></CustomerService>
       <SystemMessage v-model="systemMessage"></SystemMessage>
-      <Banner></Banner>
+<!--      <Banner></Banner>-->
     </div>
   </div>
 
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index de80912..7fe0dbd 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -46,7 +46,7 @@ import PharmaceuticalConsumables from "@/components/outpatient/PharmaceuticalCon
 import {ref, watch, nextTick, onMounted} from "vue";
 import Settlement from "@/components/outpatient/Settlement.vue";
 import {post} from "@/utils/request.ts";
-import {ElMessage} from "element-plus";
+import {type Action, ElMessage, ElMessageBox} from "element-plus";
 import ServiceItemsDetail from "@/components/outpatient/ServiceItemsDetail.vue";
 import PharmaceuticalConsumablesDetail from "@/components/outpatient/PharmaceuticalConsumablesDetail.vue";
 import CaseDetail from "@/components/outpatient/CaseDetail.vue";
@@ -56,7 +56,7 @@ const registerId = ref()
 const patientId = ref()
 const itemList = ref([])
 const goodsList = ref([])
-const formData = ref<any>({diagType:1})
+const formData = ref<any>({diagType: 1})
 const save = () => {
   let json = {
     chinaAdjunctCheck: formData.value.chinaAdjunctCheck,
@@ -74,7 +74,7 @@ const save = () => {
     exam: formData.value.exam,
     diagnosisDetail: formData.value.diagnosisDetail,
     diagnosisSummary: formData.value.diagnosisSummary,
-    diagType:formData.value.diagType
+    diagType: formData.value.diagType
   }
   const data = {
     registrationId: registerId.value,
@@ -100,8 +100,15 @@ const getId = (item: any) => {
     medicalHistoryRef.value?.init(patientId.value);
   })
   if (item.status == 1) {
-    post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
-      status.value = 2
+    ElMessageBox.alert(`您将要接诊${item.name}`, '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      showClose: true,
+      callback: (action: Action) => {
+        post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
+          status.value = 2
+        })
+      },
     })
   }
   if (item.status == 3) {
@@ -139,7 +146,7 @@ const edit = () => {
 // 使用 watch 监听 goodsList 和 itemList 的变化
 watch([() => goodsList.value, itemList], ([newGoodsList, newItemList]) => {
   const pharmaceuticalTotalAmount = newItemList.reduce((pre: any, cur: any) => {
-    return pre + cur.unitPrice*cur.selectedNum
+    return pre + cur.unitPrice * cur.selectedNum
   }, 0);
   const serviceTotalAmount = newGoodsList.reduce((pre: any, cur: any) => {
     return pre + cur.selectedNum * cur.selectedPrice