优化服务项目维护

src/components/Follow.vue

@@ -401,10 +401,13 @@ const previewImg = ref<string>('');
         </div>
 
         <!--      -->
-        <div class="ml-2 mt-1">
+        <div class="ml-2 mt-1" v-if="contentArr.length > 1">
           感谢您的配合，为了更好地了解您的回复情况，我们将会在<span class="text-blue-600"> {{ activeObj?.arrangeTime }} </span
           >再次对您进行随访，届时请点击随访链接参与，再次感谢您！
         </div>
+        <div class="ml-2 mt-1" v-else> 
+          感谢您的耐心配合。
+        </div>
       </div>
     </div>
     <div class="flex items-center justify-center mt-6 mb-6">

src/request/api/care.api.ts

@@ -45,6 +45,7 @@ export function getAllSystemCpMethod() {
 }
 // 新增和编辑系统项目和新增编辑项目列表。  项目列表就是机构项目
 export function systemCpEditMethod(data: Partial<SystemItemModel>) {
+  console.log(data, 'data==>', data.addType);
   if (data.addType === 'system') {
     return data?.id
       ? request.Post(`/fdhb-pc/conditioningManage/program/updateSystemCp`, { ...data, id: data.id }, { name: 'edit-system-cp' })

src/service/AddItems.vue

@@ -2,6 +2,7 @@
 import { ref, watch, reactive, onMounted, h, computed } from 'vue';
 import { message } from 'ant-design-vue';
 import { PlusOutlined } from '@ant-design/icons-vue'; // 确保导入
+import { notification } from 'ant-design-vue';
 import VxeUI from 'vxe-table';
 import { useRequest } from 'alova/client';
 import { getDictionaryMethod, cpMedicinesMethod } from '@/request/api/dictionary.api';
@@ -137,9 +138,12 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
         } else {
           if (items.offlineCPTypes?.includes(newType[0])) {
             form.isOffline = 'Y';
+            
             return false;
           } else if (items.onlineCPTypes?.includes(newType[0])) {
             form.isOffline = 'N';
+            // 线上项目 显示配送选项
+            isShowDelivery.value = true;
             return false;
           } else {
             form.isOffline = null;
@@ -176,6 +180,17 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
           deliverArr.value = [];
         }
       }
+    } else {
+      // 线上项目 显示配送选项
+      if (newOffline === 'N') {
+        isShowDelivery.value = true;
+        deliverArr.value = [newDelivery];
+        if (deliverArr.value.length > 1) {
+          deliverArr.value = [deliverArr.value[deliverArr.value.length - 1]];
+        } else if (deliverArr.value.length === 0) {
+          deliverArr.value = [];
+        }
+      }
     }
   } else {
     isShowOnline.value = false;
@@ -187,6 +202,7 @@ function getisOffline(e: any, newOffline: any, newDelivery: any, newType: any) {
 watch(
   [() => form.conditioningProgramType, () => form.institutionId, () => form.conditioningProgramSupplierId, () => form.isOffline, () => form.isDelivery],
   ([newType, newInstitutionId, newSupplierId, newOffline, newDelivery]) => {
+
     getSupplier({
       conditioningProgramTypes: newType ? [newType] : form.conditioningProgramType ? [form.conditioningProgramType] : [],
       collaborateDeptId: newInstitutionId ? newInstitutionId : form.institutionId ? form.institutionId : '',
@@ -314,6 +330,9 @@ function doSubmit() {
       if (hasDerivationLogic.value && derivationData.value.cpPatientMatchRule) {
         form.cpPatientMatchRule = { ...derivationData.value.cpPatientMatchRule };
       }
+      if (props.data.isType === 'itemsList') {
+        delete form.id;
+      }
       submit(form);
     })
     .catch((error: any) => {
@@ -402,11 +421,9 @@ onMounted(async () => {
         },
       ];
     }
-
-    if (props.data.addType === 'itemsList' && props.data.sourceId) {
+    if (props.data.isType === 'itemsList' && props.data.sourceId) {
       form.sourceId = form.id;
       form.institutionId = '';
-      delete form.id;
     }
   }
   // 获取方案类型
@@ -608,6 +625,7 @@ watch(
   }
 );
 function bindchange(e: any) {
+  console.log(e, 'e==>');
   form.conditioningProgramSupplierId = '';
   form.isOffline = null;
 }
@@ -699,7 +717,6 @@ function handleDerivation() {
           placeholder="请选择"
           allowClear
           :loading="typeOptionsLoading"
-          :disabled="typeOptions.length === 0"
           @change="bindchange"
         />
       </a-form-item>
@@ -961,6 +978,7 @@ function handleDerivation() {
           allow-clear
           tree-default-expand-all
           :tree-data="branch"
+          :loading="branchLoading"
           @select="handleSelect"
         ></a-tree-select>
       </a-form-item>

src/service/CareProgress.vue

@@ -272,7 +272,7 @@ const progressTextMap: Record<string, string> = {
     <div v-for="item in careProcessList?.items" :key="item.id" class="project-card">
       <div class="project-section" v-if="item?.patientConditioningOfflines">
         <div class="project-title">
-          <span style="font-size: 14px; font-weight: bold">◇ {{ item?.conditioningProgramDetail?.name }}</span>
+          <span style="font-size: 14px; font-weight: bold;color: black;">◇ {{ item?.conditioningProgramDetail?.name }}</span>
           <span class="stat">数量：{{ item.totalMeasure }}{{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>
           <span class="stat">还剩：{{ item?.remainCount }}{{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>
           <span class="stat">已核销：{{ item?.finishCount }}{{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>
@@ -301,7 +301,7 @@ const progressTextMap: Record<string, string> = {
       <!-- 健康评估 -->
       <div class="project-section mb-3 project-card" v-if="item?.healthAnalysisReports">
         <div class="project-title">
-          <span style="font-size: 14px; font-weight: bold">◇ {{ item?.conditioningProgramDetail?.name }}</span>
+          <span style="font-size: 14px; font-weight: bold;color: black;">◇ {{ item?.conditioningProgramDetail?.name }}</span>
           <span class="stat">数量：{{ item?.totalMeasure }} {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>
           <span class="stat">还剩：{{ item?.remainCount }} {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>
           <span class="stat">已核销：{{ item?.finishCount }} {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit || '次' }}</span>

src/service/IntroduceProjectList.vue

@@ -50,6 +50,7 @@ function addProject(row: any) {
   row.sourceId = row.id;
   // delete row.id;
   const addType = 'itemsList';
+  const isType = 'itemsList';
   console.log(row, 'row传入的参数');
   if (row?.isErasable === 'N') {
     // 健康咨询 健康评估 x显示
@@ -66,6 +67,7 @@ function addProject(row: any) {
             data: {
               ...row,
               addType,
+
             },
             onSubmit(data?: SystemItemModel) {
               // 点击确定 刷新列表
@@ -90,6 +92,7 @@ function addProject(row: any) {
             data: {
               ...row,
               addType,
+              isType,
             },
             onSubmit(data?: SystemItemModel) {
               // 点击确定 刷新列表