dev

src/assets/scss/main.scss

@@ -146,20 +146,17 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   &:hover{
     background: $lighter-color;
   }
-
 }
 .small-btn{
   display: inline-block;
-  width: 72px;
-  height: 24px;
-  line-height: 24px;
   background: $btn-color;
   border-radius: 3px;
   color: #FFF;
   font-size: 12px;
   text-align: center;
   cursor: pointer;
+  padding: 8px 15px;
   &:hover{
     background: $lighter-color;
   }
-}
+}

src/components/charge/Settlement.vue

@@ -89,6 +89,7 @@ const props = defineProps({
 const init = async (code: any, psnNo: any) => {
   if (props.disabled) {
     selectedIndex.value = 0
+    payType.value = 1
   }
   retailOrder.value = await post("charge/getByCode", {code: code});
   if (psnNo != null) {

src/components/outpatient/MedicalQueue.vue

@@ -207,6 +207,9 @@ const clickLi = (item: any, showBox: any = true) => {
 }
 const changeCurItemOrStatus = (item: any, status: any) => {
   curStatus.value = status
+  if (item != null) {
+    clickLi(item);
+  }
   init()
 }
 defineExpose({changeCurItemOrStatus})

src/components/registration/Edit.vue

@@ -134,7 +134,7 @@
                         :disabledDate="disabledDate"
                     />
                     <el-time-select
-                        v-model="time"
+                        v-model="edit_data.time"
                         start="08:00"
                         step="00:15"
                         end="22:00"
@@ -227,12 +227,7 @@ import Quick from "@/components/charge/RecordsLog/Quick.vue";
 import {getCurrentTime, getToday} from "@/utils/dateUtils.ts";
 
 const height = ref(570)
-const certTypeList = ref<any>(
-    Object.entries(psnCertTypes)
-        .map(([id, name]) => ({id, name}))
-        .sort((a, b) => Number(a.id) - Number(b.id))
-)
-console.log(certTypeList.value)
+const certTypeList = ref<any>([])
 const edit_data = ref<any>({
   timeList: []
 })
@@ -257,7 +252,7 @@ const rules = ref<any>({
     {required: true, message: '请选择医生', trigger: 'blur'},
   ],
   certType: [
-    {required: true, message: '请选择证件类型', trigger: 'blur'},
+    {required: true, message: '请选择证件类型', trigger: 'change'},
   ],
   certNo: [
     {required: true, message: '请输入证件码', trigger: 'blur'},
@@ -279,9 +274,7 @@ const close = () => {
   isBtnShow.value = true
   time.value = ''
   edit_data.value = {
-    timeList: [],
     insutype: '',
-    appointmentTime: ''
   }
   isShowCard.value = true
   nextTick(() => {
@@ -298,24 +291,25 @@ const disabledDate = (date: Date) => {
   today.setHours(0, 0, 0, 0); // 将时间设置为今天的 00:00:00
   return date < today; // 禁用今天之前的日期
 };
+const timeList = ref<any>([])
 const dateName = defineModel()
 const save = () => {
-  if (dateName.value == '现在') {
-    edit_data.value.timeList = ''
-    edit_data.value.appointmentTime = ''
-  } else {
-    edit_data.value.timeList.push(edit_data.value.date, time.value)
-    edit_data.value.appointmentTime = edit_data.value.timeList.join(' ')
-  }
-  let data = {
-    ...edit_data.value,
-    psnNo: socialCard.value?.data?.baseinfo.psn_no,
-    insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype,
-    insuBalance: socialCard.value?.data?.insuinfo[0].balc,
-
-  }
   form.value.validate((v: any) => {
     if (v) {
+      let combinedDateTime = ''
+      if (edit_data.value.date == undefined || edit_data.value.time == undefined) {
+        combinedDateTime = ''
+      } else {
+        combinedDateTime = `${edit_data.value.date} ${edit_data.value.time}`
+      }
+      let data = {
+        ...edit_data.value,
+        appointmentTime: combinedDateTime || '',
+        psnNo: socialCard.value?.data?.baseinfo.psn_no,
+        insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype,
+        insuBalance: socialCard.value?.data?.insuinfo[0].balc,
+
+      }
       if (edit_data.value.id) {
         post('registration/edit', {
           data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo,
@@ -369,6 +363,9 @@ const socialCard: any = ref({
 })
 const quickShow = ref<any>(false)
 const init = (doctorId: any = "", id: any = null, show: any = false) => {
+  certTypeList.value = Object.entries(psnCertTypes)
+      .map(([id, name]) => ({id, name}))
+      .sort((a, b) => Number(a.id) - Number(b.id))
   isShow.value = true
   quickShow.value = show
   edit_data.value.organizationDoctorId = doctorId || ""
@@ -389,6 +386,7 @@ const multipleTable = ref<any>()
 const socialCardUpdate = (e: any) => {
   isShowCard.value = false
   if (e) {
+    console.log(e.data.baseinfo.psn_cert_type)
     isShowCard.value = false
     edit_data.value.gender = Number(e.data.baseinfo.gend)
     edit_data.value.name = e.data.baseinfo.psn_name
@@ -406,7 +404,7 @@ const socialCardUpdate = (e: any) => {
         edit_data.value.name = res.list[0].name
         edit_data.value.gender = res.list[0].sex
         edit_data.value.phone = res.list[0].phone
-        edit_data.value.certType =res.list[0].certType
+        edit_data.value.certType = res.list[0].certType
         edit_data.value.certNo = res.list[0].certNo
         edit_data.value.memo = res.list[0].remark
         edit_data.value.visitType = 1
@@ -465,6 +463,10 @@ const changeLoading = (e: any) => {
 const isBtnShow = ref(true)
 const changeBtn = () => {
   isBtnShow.value = !isBtnShow.value
+  if (isBtnShow.value) {
+    time.value = ''
+    timeList.value = []
+  }
 }
 const handleCurrentChange = (val: any) => {
   edit_data.value.insutype = val.insutype
@@ -557,9 +559,8 @@ defineExpose({init})
 }
 
 .small-btn {
-  width: 51px;
-  height: 32px;
-  line-height: 32px;
   margin-left: 5px;
+  height: 32px;
+  line-height: 1;
 }
 </style>

src/components/settings/item/group/GroupAdd.vue

@@ -225,7 +225,4 @@ defineExpose({init})
   padding: 0 24px;
 }
 
-.small-btn {
-  width: 50px;
-}
 </style>

src/views/outpatient/index.vue

@@ -104,7 +104,9 @@ const save = () => {
   } else {
     post('medical/record/save', {data: data}).then((res: any) => {
       ElMessage.success("接诊完毕,请到收费页面收费")
-      medicalQueueRef.value?.changeCurItemOrStatus(registerId.value, 3);
+      debugger
+      medicalQueueRef.value?.changeCurItemOrStatus(res, 3);
+
     })
   }
 }
@@ -113,7 +115,6 @@ const medicalHistoryRef = ref()
 const patientCardRef = ref()
 const patientRegistration = ref<any>({})//  当前挂号信息
 const clickItem = (item: any) => {
-  initFormData()
   if (!item) {
     medicalHistoryRef.value?.clearList();
     return

src/views/registration/index.vue

@@ -104,7 +104,6 @@ import {Search} from "@element-plus/icons-vue";
 
 const dateName = ref<any>('挂号')
 const selectDate = (date: any) => {
-  console.log(date, 'date')
   dateName.value = getActionText(date)
 }
 const getActionText = (date: string) => {