dev

public/static/iconfont/iconfont.css

@@ -1,8 +1,7 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4921806 */
-  src:
+  src: url('iconfont.woff?t=1748312335696') format('woff'),
-       url('iconfont.woff?t=1747990278440') format('woff'),
+       url('iconfont.ttf?t=1748312335696') format('truetype');
-       url('iconfont.ttf?t=1747990278440') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +12,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yuyueh:before {
+  content: "\e60d";
+}
+
 .icon-yuyue:before {
   content: "\e606";
 }

src/assets/scss/main.scss

@@ -148,6 +148,25 @@ $lighter-color: rgba(#4D6DE4, 0.5);
     background: $lighter-color;
   }
 }
+.default-close-btn{
+  cursor: pointer;
+  display: inline-block;
+  width: 119px;
+  height: 42px;
+  line-height: 42px;
+  background: #fff;
+  border-radius: 6px;
+  color: #333333;
+  font-size: 16px;
+  text-align: center;
+  margin-left: 9px;
+  border:1px solid #D8D8D8;
+  &:hover{
+    background: $lighter-color;
+    color: #fff;
+    border:none;
+  }
+}
 
 .small-btn{
     cursor: pointer;
@@ -180,3 +199,21 @@ $lighter-color: rgba(#4D6DE4, 0.5);
     background:  rgba(#EB5757, 0.5);
   }
 }
+.close-btn{
+  cursor: pointer;
+  display: inline-block;
+  line-height: 1;
+  background: #fff;
+  border-radius: 4px;
+  color: #333;
+  font-size: 14px;
+  text-align: center;
+  margin-left: 9px;
+  padding: 7px 14px;
+  border:1px solid #D8D8D8;
+  &:hover{
+    background:  rgba(#4D6DE4, 0.5);
+    color: #fff;
+    border:1px solid rgba(#4D6DE4, 0.5);
+  }
+}

src/components/inventory/goods/Edit.vue

@@ -690,7 +690,8 @@ const contrastCodeConfirm = (data: any) => {
 }
 let save = async (isClose: Boolean) => {
   try {
-    await formRef.value.validate()
+    const isOk = await formRef.value.validate()
+    if (!isOk) return
     if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) {
       ElMessage.error('参考进价不能为空或小于1');
       return

src/components/inventory/goods/SocialInfo.vue

@@ -8,7 +8,7 @@
   <div v-if="hilistInfo" class="hilist-detail">
     <div class="name">
       {{ hilistInfo.name }}
-      {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '-' }}
+      {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '' }}
     </div>
     <div>
       {{ hilistInfo.code }}
@@ -86,17 +86,16 @@ onMounted(() => {
 .hilist-code {
   cursor: pointer;
   width: 100%;
-  height: 25px;
+  height: 38px;
-  border: 1px #ddd solid;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 8px;
+  padding: 16px;
-  border-radius: 10px;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
 
   .name {
     display: flex;
-
   }
 
   .code {
@@ -107,14 +106,15 @@ onMounted(() => {
 
 }
 .hilist-detail {
-  padding: base.$padding-base;
+  padding: 16px;
-  margin-top: 3px;;
+  margin-top: 8px;
   width: 100%;
-  height: 250px;
-  border: 1px base.$border-color-base solid;
   font-size: 12px;
-  border-radius: 8px;
+  background: #F5F6F7;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
-
-
 </style>

src/components/outpatient/MedicalHistory.vue

@@ -34,7 +34,6 @@ const props = defineProps({
     default: 0
   }
 })
-console.log(props.status)
 const list = ref<any>([])
 const init = (patientId: any) => {
   post("medical/record/listByPatient", {patientId: patientId}).then((res: any) => {

src/components/outpatient/MedicalQueue.vue

@@ -209,7 +209,14 @@ const clickLi = (item: any, showBox: any = true) => {
 }
 const changeCurItemOrStatus = (item: any, status: any) => {
   curStatus.value = status
-  if (item != null) {
+  curItem.value = item
+  clickTab({status: status})
+  if (status == 1) {
+    // selectedDate.value = formatDate(item.appointmentTime)
+    init()
+    return
+  }
+  if (item != null && status != 1) {
     clickLi(item);
   }
   init()
@@ -218,6 +225,11 @@ defineExpose({changeCurItemOrStatus})
 watch(() => curStatus.value, () => {
   init() // 重新初始化数据
 })
+const formatDate = (isoStr: any) => {
+  if (!isoStr) return ''
+  const date = new Date(isoStr);
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
+}
 const setDateTip = () => {
   const seletctedDateObj = new Date(selectedDate.value);
   //如果选择的日期是今天

src/components/outpatient/Settlement.vue

@@ -20,7 +20,7 @@ const editItem= () => {
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group">
-        <span class="default-btn" v-if="status" @click="deleteItem">取消接诊</span>
+        <span class="default-close-btn" v-if="status" @click="deleteItem">取消接诊</span>
         <span class="default-btn" v-if="status" @click="save">完成接诊</span>
 <!--        <el-button v-if="status == 3" type="primary" @click="editItem">修改</el-button>-->
       </div>

src/components/registration/Edit.vue

@@ -141,7 +141,9 @@
                         style="width: 50%"
                     />
                   </div>
-                  <span v-if="dateName!='预约'" class="small-btn" @click="changeBtn">{{
+                  <span v-if="dateName!='预约'"
+                        :class="{disabled:edit_data.status==1||edit_data.status==3||edit_data.status==0}"
+                        class="small-btn" @click="changeBtn">{{
                       isBtnShow ? '挂号' : '预约'
                     }}</span>
                 </div>
@@ -202,9 +204,9 @@
           退出医保
         </div>
         <div class="bottom-right">
+          <span class="close-btn" @click="close">取消</span>
           <span class="danger-btn" v-if="edit_data.status==1" @click="registrationCancel">退号</span>
           <span class="small-btn" @click="save">保存</span>
-          <span class="small-btn" @click="close">取消</span>
         </div>
       </div>
     </template>
@@ -452,6 +454,7 @@ const changeLoading = (e: any) => {
 }
 const isBtnShow = ref(true)
 const changeBtn = () => {
+  if (edit_data.value.status == 1 || edit_data.value.status == 3 || edit_data.value.status == 0) return
   isBtnShow.value = !isBtnShow.value
   if (isBtnShow.value) {
     time.value = ''
@@ -547,4 +550,9 @@ defineExpose({init})
 :deep(.el-form-item) {
   margin-bottom: 2px !important;
 }
+
+.disabled {
+  cursor: not-allowed;
+  background: rgba(#4D6DE4,.5);
+}
 </style>

src/main.ts

@@ -3,7 +3,7 @@ import './assets/scss/main.scss'
 import {createApp} from 'vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
-import '../src/assets/iconfont/iconfont.css'
+import '../public/static/iconfont/iconfont.css'
 import {createPinia} from 'pinia'
 
 import App from './App.vue'

src/views/outpatient/index.vue

@@ -148,7 +148,12 @@ const clickItem = (item: any) => {
 const medicalQueueRef = ref();
 const cancelReception = () => {
   post(apiConfig.RegistrationChangeStatus, {id: registerId.value, status: 1}).then((res: any) => {
+    nextTick(() => {
       medicalQueueRef.value?.changeCurItemOrStatus(res, 1);
+      initFormData()
+      medicalHistoryRef.value?.clearList();
+      patientCardRef.value?.clear();
+    })
   })
 }
 const changeTab = (e: any) => {