From e899aaa2d3d0d418c7c7c060d5c9ff25aad91589 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 13 May 2025 11:31:07 +0800
Subject: [PATCH] dev

---
 src/assets/scss/main.scss                     |  2 +-
 src/components/common/InputNumber.vue         | 70 +++++++++++++++++++
 src/components/common/goods/GoodsDetail.vue   | 32 +++++----
 .../common/service/ServiceDetail.vue          | 22 +++---
 src/components/outpatient/Settlement.vue      | 21 +++++-
 src/components/registration/CardDefault.vue   |  1 -
 src/components/registration/Edit.vue          |  2 +-
 src/views/registration/index.vue              |  2 +-
 8 files changed, 122 insertions(+), 30 deletions(-)
 create mode 100644 src/components/common/InputNumber.vue

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 2f4537f..f95b389 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -93,5 +93,5 @@ body {
 .el-popper.is-light.type-popper, .el-popper.is-light>.el-popper__arrow:before{
   background:#F5FAFF !important;
   padding: 0 !important;
-  border: 1px solid #4D6DE4 !important;
+  //border: 1px solid #4D6DE4 !important;
 }
\ No newline at end of file
diff --git a/src/components/common/InputNumber.vue b/src/components/common/InputNumber.vue
new file mode 100644
index 0000000..ca62878
--- /dev/null
+++ b/src/components/common/InputNumber.vue
@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import { ref, defineProps, defineEmits } from 'vue';
+
+const props = defineProps({
+  modelValue: {
+    type: Number,
+    default: 0
+  },
+  minValue: {
+    type: Number,
+    default: 0
+  },
+  maxValue: {
+    type: Number,
+    default: 100
+  }
+});
+
+const emit = defineEmits(['update:modelValue']);
+
+const currentValue = ref(props.modelValue);
+
+// 加法操作
+const increment = () => {
+  if (currentValue.value < props.maxValue) {
+    currentValue.value++;
+    emit('update:modelValue', currentValue.value);
+  }
+};
+
+// 减法操作
+const decrement = () => {
+  if (currentValue.value > props.minValue) {
+    currentValue.value--;
+    emit('update:modelValue', currentValue.value);
+  }
+};
+const change = () => {
+  emit('update:modelValue', currentValue.value);
+};
+</script>
+
+
+<template>
+  <div class="number-input">
+    <button @click="decrement" :disabled="currentValue <= minValue">-</button>
+    <el-input style="width: 100px" v-model.number="currentValue" :min="minValue" :max="maxValue" @input="change"/>
+    <button @click="increment" :disabled="currentValue >= maxValue">+</button>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.number-input {
+  display: flex;
+  align-items: center;
+}
+
+button {
+  width: 30px;
+  height: 30px;
+  font-size: 18px;
+  cursor: pointer;
+}
+
+input {
+  width: 60px;
+  text-align: center;
+  margin: 0 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 9cd3fbb..b5cca49 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -1,7 +1,8 @@
 <template>
   <panel title="药品耗材">
-    <el-table v-if="goodsDetail.length>0" :data="goodsDetail" max-height="150" style="width: 100%">
-      <el-table-column prop="name" label="名称">
+    <el-table v-if="goodsDetail.length>0" :data="goodsDetail" max-height="300" style="width: 100%"
+              :header-cell-style="{ backgroundColor: '#F5FAFF' }">
+      <el-table-column prop="name" label="名称" width="400">
         <template #default="scope">
           <el-popover
               placement="top-start"
@@ -39,20 +40,20 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column prop="selectedPrice" label="单价">
+      <el-table-column prop="selectedPrice" label="单价" width="200">
         <template #default="scope">
           ￥{{ scope.row.selectedPrice }}
         </template>
       </el-table-column>
-      <el-table-column prop="number" label="数量">
+      <el-table-column prop="number" label="数量" width="250">
         <template #default="scope">
           <div v-if="props.status">
             <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange(scope.row)"
-                             size="small"></el-input-number>
-            <el-dropdown>
-              <span style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
+                             style="margin-right: 5px"></el-input-number>
+            <el-dropdown v-if="scope.row.trdnFlag == 1">
+              <span style="line-height: 30px;margin-left: 10px;cursor: pointer">{{ scope.row.selectedUnit }}</span>
               <template #dropdown>
-                <el-dropdown-menu v-if="scope.row.trdnFlag == 1">
+                <el-dropdown-menu>
                   <el-dropdown-item @click="selectUnit(scope.row,scope.row.packagingUnit)">{{ scope.row.packagingUnit }}
                   </el-dropdown-item>
                   <el-dropdown-item @click="selectUnit(scope.row,scope.row.minPackagingUnit)">
@@ -61,6 +62,7 @@
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
+            <span v-else style="line-height: 30px;margin-left: 10px">{{ scope.row.selectedUnit }}</span>
           </div>
           <div v-else>
             <div>{{ scope.row.selectedNum }} {{ scope.row.selectedUnit }}</div>
@@ -91,7 +93,7 @@
             :width="1000"
         ></SearchInput>
       </div>
-      <span v-if="status">合计：￥{{ getTotalPrice() }}</span>
+      <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() }}</span>
     </div>
   </panel>
 </template>
@@ -156,14 +158,13 @@ const goodsSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.packagingUnit
   row.selectedPrice = row.unitPrice
-  row.shouldNumber  = 1;
+  row.shouldNumber = 1;
   row.idCode = row.idCode?.split(",")
 
 
   if (goodsDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
     goodsDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
-    goodsDetail.value.find((i: any) => i.id == row.id).selectedUnit = row.packagingUnit
     goodsDetail.value.find((i: any) => i.id == row.id).selectedPrice = row.unitPrice
     emit('totalPriceChange')
     return
@@ -182,7 +183,7 @@ const selectUnit = (item: any, unit: any) => {
 
 }
 const emit = defineEmits(["totalPriceChange", 'focus'])
-const handleNumChange = (row:any) => {
+const handleNumChange = (row: any) => {
   //应采数量
   let shouldNumber = 0;
   if (row.selectedUnit == row.packagingUnit) {
@@ -220,8 +221,11 @@ const colosInfo = () => {
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table__cell) {
-  padding: 0 4px;
+:deep(.el-table tr) {
+  font-size: 16px;
+  font-weight: 500;
+  color: #333333;
+  height: 60px;
 }
 
 .bottom {
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 8ac7635..7ef3869 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <Panel title="服务项目">
-    <el-table v-if="itemDetail.length>0" :data="itemDetail">
-      <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip width="200">
+    <el-table v-if="itemDetail.length>0" :data="itemDetail" max-height="300" :header-cell-style="{ backgroundColor: '#F5FAFF' }">
+      <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip width="400">
         <template #default="scope">
           <el-popover
               width="485"
@@ -27,15 +27,15 @@
           </el-popover>
         </template>
       </el-table-column>
-      <el-table-column label="单价">
+      <el-table-column label="单价" width="200">
         <template #default="scope">
           ￥{{ scope.row.selectedPrice }}
         </template>
       </el-table-column>
-      <el-table-column label="数量" width="180">
+      <el-table-column label="数量" width="250">
         <template #default="scope">
           <el-input-number v-if="props.status" v-model="scope.row.selectedNum" :min="0"
-                           @change="handleNumChange" size="small"></el-input-number>
+                           @change="handleNumChange" style="margin-right: 5px"></el-input-number>
           <span v-else>{{ scope.row.selectedNum }}</span>
           {{ scope.row.selectedUnit }}
         </template>
@@ -61,7 +61,7 @@
             :show-config="serviceShowConfig"
             @selectedCallBack="serviceSelect" :disabled="!props.status"></SearchInput>
       </div>
-      <span v-if="status">合计：￥{{ getTotalPrice() || 0 }}</span>
+      <span v-if="status" style="padding: 10px">合计：￥{{ getTotalPrice() || 0 }}</span>
     </div>
   </Panel>
 </template>
@@ -78,7 +78,7 @@ const props = defineProps({
     type: Boolean,
     default: 0
   },
-  statusDisabled:{
+  statusDisabled: {
     type: Boolean,
     default: 0
   }
@@ -121,7 +121,6 @@ const serviceSelect = (row: any) => {
   if (itemDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
     itemDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
-    itemDetail.value.find((i: any) => i.id == row.id).selectedUnit = row.packagingUnit
     itemDetail.value.find((i: any) => i.id == row.id).selectedPrice = row.unitPrice
     emit('totalPriceChange')
     return
@@ -157,8 +156,11 @@ const hide = () => {
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table__cell) {
-  padding: 0 4px;
+:deep(.el-table tr) {
+  font-size: 16px;
+  font-weight: 500;
+  color: #333333;
+  height: 60px;
 }
 
 .bottom {
diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue
index d9820e7..5cf8322 100644
--- a/src/components/outpatient/Settlement.vue
+++ b/src/components/outpatient/Settlement.vue
@@ -20,8 +20,8 @@ const editItem= () => {
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group">
-        <el-button v-if="status" @click="deleteItem">取消接诊</el-button>
-        <el-button v-if="status" type="primary" @click="save">完成接诊</el-button>
+        <span v-if="status" @click="deleteItem">取消接诊</span>
+        <span v-if="status" @click="save">完成接诊</span>
 <!--        <el-button v-if="status == 3" type="primary" @click="editItem">修改</el-button>-->
       </div>
     </div>
@@ -45,5 +45,22 @@ const editItem= () => {
   .text {
     color: #FF282E
   }
+  .btn-group{
+    display: flex;
+    span{
+      width: 119px;
+      height: 48px;
+      text-align: center;
+      line-height: 48px;
+      border-radius: 8px;
+      border: 1px solid #D8D8D8;
+      margin-left: 24px;
+      cursor: pointer;
+      &:hover{
+        background: #4D6DE4 ;
+        color: #fff;
+      }
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue
index aa93e1b..16ae171 100644
--- a/src/components/registration/CardDefault.vue
+++ b/src/components/registration/CardDefault.vue
@@ -82,7 +82,6 @@ const getInfoFor1101 = (params: any) => {
       duration: 1000,
     });
     emit('socialCardUpdate', socialCard.value)
-
   }).catch(() => {
     isReading.value = false;
     emit('changeLoading', false)
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index c97c9ad..0f8776e 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -2,7 +2,6 @@
   <Mask :is-show="isShow" width="800" :height="height" title="挂号" @close="close"
         :show-footer="true">
     <template #default>
-
       <div style="padding:0 24px">
         <el-form
             v-loading="loading"
@@ -360,6 +359,7 @@ const deleteCard = () => {
         nextTick(() => {
           cardDefaultRef.value?.close()
           height.value = 470
+          console.log(socialCard.value,'socialCard')
         })
       }
     },
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index bd4c6a1..79d000c 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -93,6 +93,7 @@ const isShowNum = ref(-1)
 const roleList = ref<any>([])
 
 onMounted(() => {
+  selectedDate.value = [getToday().start, getToday().end]
   initDoctor()
   getPatientList()
 })
@@ -119,7 +120,6 @@ const handleDateChange = (date: any[]) => {
 const getPatientList = () => {
   isShowNum.value = -1
   id.value = null
-  selectedDate.value = [getToday().start, getToday().end]
   post('registration/list', {
     page: page.value,
     size: size.value,