Merge branch 'feature/bug-132' into feature/zuofei

# Conflicts:
#	src/service/CareProgress.vue
#	src/service/IntroduceProjectList.vue
#	src/service/ServicePackageDetail.vue

src/service/CareProgress.vue

@@ -34,11 +34,11 @@ const { data: patient } = useWatcher(() => patientMethod(props.data.patientId!),
   },
 });
 
+
 const careProcessList = ref<OpenConditioningSchemeModel>();
 async function getCareProgress() {
   const res = await getConditioningProcessMethod(Number(props.data.id));
   careProcessList.value = res as OpenConditioningSchemeModel;
-  console.log(careProcessList.value?.items, 'careProcessList');
 }
 const isShowDelivery = ref<boolean>(false);
 // 监听 displayTableData 的变化
@@ -176,6 +176,7 @@ interface Model extends SymptomItemVo {
 }
 // 查看健康评估
 function open(row: Model) {
+  // console.log(row, '查看健康评估');
   const component = defineAsyncComponent(() => import('@/components/ReportPreview.vue'));
   const id = `drawer:report:preview`;
   const onDestroy = () => {
@@ -207,20 +208,21 @@ function open(row: Model) {
   <div class="care-progress-card">
     <div class="header" v-if="careProcessList">
       <span class="title">{{
-        careProcessList?.progress === '0'
-          ? '待付款'
-          : careProcessList?.progress === '1'
-            ? '已作废'
-            : careProcessList?.progress === '2'
-              ? '用户取消'
-              : careProcessList?.progress === '3'
-                ? '未开始'
-                : careProcessList?.progress === '4'
-                  ? '调理中'
-                  : careProcessList?.progress === '5'
-                    ? '已完结'
-                    : ''
-      }}</span>
+          careProcessList?.progress === '0'
+            ? '待付款'
+            : careProcessList?.progress === '1'
+              ? '已作废'
+              : careProcessList?.progress === '2'
+                ? '用户取消'
+                : careProcessList?.progress === '3'
+                  ? '未开始'
+                  : careProcessList?.progress === '4'
+                    ? '调理中'
+                    : careProcessList?.progress === '5'
+                      ? '已完结'
+                      : ''
+
+        }}</span>
       <span v-if="careProcessList?.patientName"
         >姓名：<b>{{ careProcessList?.patientName }}</b></span
       >
@@ -302,6 +304,7 @@ function open(row: Model) {
           <div v-if="item?.remark">操作指南：{{ item?.remark }}</div>
         </div>
       </div>
+   
       <!-- 健康记录 -->
       <div class="health-records-card">
         <a-tabs class="panel-wrapper" v-model:activeKey="activePanel" v-if="item?.healthAnalysisReports && item?.healthAnalysisReports.length > 0">
@@ -345,6 +348,7 @@ function open(row: Model) {
       height: 100%;
     }
   }
+ 
 }
 .care-progress-card {
   background: #fff;

src/service/IntroduceProjectList.vue

@@ -45,7 +45,7 @@ onMounted(async () => {
   if (res && res.items && res.items.length > 0) {
     tableData.value = res.items;
 
-    
+
   }
 });
 const checked = ref(true);
@@ -54,7 +54,7 @@ function addProject(row: any) {
   row.sourceId = row.id;
   delete row.id;
   const addType = 'itemsList';
- 
+
   if (row?.isErasable === 'N') {
     // 健康咨询 健康评估 x显示
     VxeUI.modal.open({