Merge branch 'dev-benefitUP' of http://175.27.226.205:3000/huxuejian/ykt-wxapp into dev-benefitUP

baseData/index.js

@@ -20,7 +20,33 @@ export const ToDoEventType = {
   followupAppointment: "复诊预约",
   confirmArrival: "确认到院",
   prenatalFollowUp: "孕期回访",
-};
+  childHealthFollowUp: "儿童保健回访",
+  benefitExecution: "权益执行",
+}
+//  {
+//   followUpNoShow: "未到院回访",
+//   followUpNoDeal: "未成交回访",
+//   followUp: "诊后回访",
+//   followUpPostSurgery: "术后回访",
+//   followUpPostTreatment: "治疗后回访",
+//   appointmentReminder: "就诊提醒",
+//   followUpReminder: "复诊提醒",
+//   medicationReminder: "用药提醒",
+//   serviceSummary: "咨询服务",
+//   eventNotification: "活动通知",
+//   ContentReminder: "宣教发送",
+//   questionnaire: "问卷调查",
+//   followUpComplaint: "投诉回访",
+//   followUpActivity: "活动回访",
+//   other: "其他",
+//   Feedback: "意见反馈",
+//   // 预约相关服务类型
+//   treatmentAppointment: "治疗预约",
+//   followupAppointment: "复诊预约",
+//   confirmArrival: "确认到院",
+//   prenatalFollowUp: "孕期回访",
+// };
+
 
 export const statusNames = {
   notStart: "未开始",

pages/case/new-followup.vue

@@ -158,9 +158,10 @@ const __NEW_FOLLOWUP_EVENT_TYPE_VALUES__ = [
   'followUpNoShow',
   'other',
 ];
-const eventTypeList = __NEW_FOLLOWUP_EVENT_TYPE_VALUES__
+// const eventTypeList = __NEW_FOLLOWUP_EVENT_TYPE_VALUES__
-  .map((v) => __ALL_TODO_EVENT_TYPE_OPTIONS__.find((i) => i.value === v))
+//   .map((v) => __ALL_TODO_EVENT_TYPE_OPTIONS__.find((i) => i.value === v))
-  .filter(Boolean);
+//   .filter(Boolean);
+const eventTypeList = __ALL_TODO_EVENT_TYPE_OPTIONS__;
 
 const accountStore = useAccountStore();
 const { account, doctorInfo } = storeToRefs(accountStore);

utils/todo-const.js

@@ -1,21 +1,46 @@
 export const TODO_EVENT_TYPE_LABELS = {
-  benefitExecution: '权益执行',
+  followUpNoShow: "未到院回访",
-  followUpNoShow: '未到院回访',
+  followUpNoDeal: "未成交回访",
-  followUpNoDeal: '未成交回访',
+  followUp: "诊后回访",
-  followUp: '诊后回访',
+  followUpPostSurgery: "术后回访",
-  followUpPostSurgery: '术后回访',
+  followUpPostTreatment: "治疗后回访",
-  followUpPostTreatment: '治疗后回访',
+  appointmentReminder: "就诊提醒",
-  appointmentReminder: '就诊提醒',
+  followUpReminder: "复诊提醒",
-  followUpReminder: '复诊提醒',
+  medicationReminder: "用药提醒",
-  medicationReminder: '用药提醒',
+  serviceSummary: "咨询服务",
-  serviceSummary: '咨询服务',
+  eventNotification: "活动通知",
-  eventNotification: '活动通知',
+  ContentReminder: "宣教发送",
-  ContentReminder: '宣教发送',
+  questionnaire: "问卷调查",
-  questionnaire: '问卷调查',
+  followUpComplaint: "投诉回访",
-  followUpComplaint: '投诉回访',
+  followUpActivity: "活动回访",
-  followUpActivity: '活动回访',
+  other: "其他",
-  other: '其他',
+  Feedback: "意见反馈",
-};
+  // 预约相关服务类型
+  treatmentAppointment: "治疗预约",
+  followupAppointment: "复诊预约",
+  confirmArrival: "确认到院",
+  prenatalFollowUp: "孕期回访",
+  childHealthFollowUp: "儿童保健回访",
+  benefitExecution: "权益执行",
+}
+// {
+//   benefitExecution: '权益执行',
+//   followUpNoShow: '未到院回访',
+//   followUpNoDeal: '未成交回访',
+//   followUp: '诊后回访',
+//   followUpPostSurgery: '术后回访',
+//   followUpPostTreatment: '治疗后回访',
+//   appointmentReminder: '就诊提醒',
+//   followUpReminder: '复诊提醒',
+//   medicationReminder: '用药提醒',
+//   serviceSummary: '咨询服务',
+//   eventNotification: '活动通知',
+//   ContentReminder: '宣教发送',
+//   questionnaire: '问卷调查',
+//   followUpComplaint: '投诉回访',
+//   followUpActivity: '活动回访',
+//   other: '其他',
+// };
 
 export function getTodoEventTypeLabel(value) {
   const v = String(value || '');