张田田 пре 10 месеци
родитељ
комит
8d1d6d11dd
3 измењених фајлова са 34 додато и 33 уклоњено
  1. 22 22
      src/service/CareProgress.vue
  2. 10 10
      src/service/EditSystemService.vue
  3. 2 1
      src/service/ServiceItemsConfirm.vue

+ 22 - 22
src/service/CareProgress.vue

@@ -194,42 +194,42 @@ function open(row: Model) {
   <div class="care-progress-card">
     <div class="header" v-if="careProcessList">
       <span class="title">{{
-        careProcessList.progress === '0'
+        careProcessList?.progress === '0'
           ? '待付款'
-          : careProcessList.progress === '1'
+          : careProcessList?.progress === '1'
             ? '已作废'
-            : careProcessList.progress === '2'
+            : careProcessList?.progress === '2'
               ? '用户取消'
-              : careProcessList.progress === '3'
+              : careProcessList?.progress === '3'
                 ? '未开始'
                 : careProcessList.progress === '4'
                   ? '调理中'
-                  : careProcessList.progress === '5'
+                  : careProcessList?.progress === '5'
                     ? '已完结'
                     : ''
       }}</span>
       <span
-        >姓名:<b>{{ careProcessList.patientName }}</b></span
+        >姓名:<b>{{ careProcessList?.patientName }}</b></span
       >
-      <span>疾病名称:{{ careProcessList.diagnosis }}</span>
-      <span>证型:{{ careProcessList.symptom }}</span>
-      <span>开具医生:{{ careProcessList.createBy }}</span>
-      <span>调养周期:{{ careProcessList.estimatedStartDate }} ~ {{ careProcessList.estimatedEndDate }}</span>
+      <span>疾病名称:{{ careProcessList?.diagnosis }}</span>
+      <span>证型:{{ careProcessList?.symptom }}</span>
+      <span>开具医生:{{ careProcessList?.createBy }}</span>
+      <span>调养周期:{{ careProcessList?.estimatedStartDate }} ~ {{ careProcessList?.estimatedEndDate }}</span>
     </div>
     <div v-if="careProcessList?.isDelivery === 'Y'" class="delivery-info">
       <a-checkbox checked disabled style="color: #52c41a; margin-right: 8px" />
       <span>配送</span>
-      <span>地址:{{ careProcessList.provinceName }}{{ careProcessList.cityName }}{{ careProcessList.areaName }}{{ careProcessList.detailAddress }}</span>
-      <span style="margin-left: 16px">电话:{{ careProcessList.phone }}</span>
+      <span>地址:{{ careProcessList?.provinceName }}{{ careProcessList?.cityName }}{{ careProcessList?.areaName }}{{ careProcessList?.detailAddress }}</span>
+      <span style="margin-left: 16px">电话:{{ careProcessList?.phone }}</span>
     </div>
     <!-- 线上项目 -->
     <div v-for="item in careProcessList?.items" :key="item.id">
       <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">◇ {{ item?.conditioningProgramDetail?.name }}</span>
           <span class="stat">数量:{{ item.totalMeasure }}</span>
-          <span class="stat">还剩:{{ item.remainCount }}</span>
-          <span class="stat">已核销:{{ item.finishCount }}</span>
+          <span class="stat">还剩:{{ item?.remainCount }}</span>
+          <span class="stat">已核销:{{ item?.finishCount }}</span>
         </div>
         <vxe-table :data="item?.patientConditioningOfflines" border>
           <vxe-column type="seq" title="序号" width="80" />
@@ -241,7 +241,7 @@ function open(row: Model) {
         <div class="mt-3">
           <div class="mb-1">
             预定频率:每 {{ item.frequencyType }}天 {{ item.frequencyMeasure }}
-            {{ item.conditioningProgramDetail.cpFixedPricingRule.pricingUnit }}
+            {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit }}
           </div>
           <div>操作指南:{{ item.remark }}</div>
         </div>
@@ -249,12 +249,12 @@ function open(row: Model) {
       <!-- 线上 -->
       <div class="yuanqi-tea" v-if="item?.patientConditioningOnlines">
         <div class="mb-2">
-          <span class="mr-10">◇ {{ item.conditioningProgramDetail.name }}</span>
+          <span class="mr-10">◇ {{ item?.conditioningProgramDetail?.name }}</span>
           <span>数量:{{ item.totalMeasure }}</span>
         </div>
         <div class="mb-1">
           预定频率:每 {{ item.frequencyType }}天 {{ item.frequencyMeasure }}
-          {{ item.conditioningProgramDetail.cpFixedPricingRule.pricingUnit }}
+          {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit }}
         </div>
         <div>操作指南:{{ item.remark }}</div>
       </div>
@@ -262,7 +262,7 @@ function open(row: Model) {
       <div  class="project-section mb-3" v-if="item?.healthAnalysisReports">
         <div class="project-title">
           <span style="font-size: 14px; font-weight: bold">◇ {{ item?.conditioningProgramDetail?.name }}</span>
-          <span class="stat">数量:{{ item.totalMeasure }}</span>
+          <span class="stat">数量:{{ item?.totalMeasure }}</span>
           <span class="stat">还剩:{{ item?.remainCount }}</span>
           <span class="stat">已核销:{{ item?.finishCount }}</span>
         </div>
@@ -277,10 +277,10 @@ function open(row: Model) {
         </vxe-table>
         <div class="mt-3">
           <div class="mb-1">
-          预定频率:每 {{ item.frequencyType }}天 {{ item.frequencyMeasure }}
-          {{ item.conditioningProgramDetail.cpFixedPricingRule.pricingUnit }}
+          预定频率:每 {{ item?.frequencyType }}天 {{ item?.frequencyMeasure }}
+          {{ item?.conditioningProgramDetail?.cpFixedPricingRule?.pricingUnit }}
         </div>
-        <div>操作指南:{{ item.remark }}</div>
+        <div>操作指南:{{ item?.remark }}</div>
         </div>
       </div>
    

+ 10 - 10
src/service/EditSystemService.vue

@@ -143,7 +143,7 @@ function getSystemProjectList() {
   });
 }
 async function getProjectList() {
-  if (localData.types === 'system') {
+  if (props.data?.types === 'system') {
     getSystemProjectList();
   } else {
     getInstitutionProjectList();
@@ -397,11 +397,11 @@ function confirm() {
       row.frequencyType = row.frequencyTypeing[0];
     }
   });
-  console.log(localData.types, 'formData.items');
+  console.log(props.data.types, 'formData.items');
   // 如果所有条件都满足,继续执行后续代码
   if (isValid) {
     // 系统服务包
-    if (localData.types === 'system') {
+    if (props.data.types === 'system') {
       delete formData.types;
       addSystemCw({
         ...formData,
@@ -409,7 +409,7 @@ function confirm() {
         notification.success({ message: '操作成功' });
         VxeUI.modal.close(`edit-system-service-modal`);
       });
-    } else if (localData.types === 'institution') {
+    } else if (props.data.types === 'institution') {
       if (fileList.value.length > 0) {
         const upImg = fileList.value[0].response?.url;
         formData.photo = upImg;
@@ -485,10 +485,10 @@ onMounted(async () => {
   getGender();
   getAge();
   getConstitutionGroup();
-  if (localData.id) {
-    localData.types = 'institution'; // Modify the local copy instead
+  if (props.data.id) {
+    props.data.types = 'institution'; // Modify the local copy instead
     // 调编辑接口获取数据
-    const res: any = await getConditioningRecordDetailMethod(localData);
+    const res: any = await getConditioningRecordDetailMethod(props.data);
     Object.assign(formData, res); // Use the response to update formData
     await nextTick(); // 确保视图更新
 
@@ -581,16 +581,16 @@ let multiple = ref<boolean>(true);
 <template>
   <div style="padding: 24px">
     <div class="flex">
-      <div style="margin-bottom: 16px" class="mr-4" v-if="localData?.types === 'institution'">
+      <div style="margin-bottom: 16px" class="mr-4" v-if="props.data?.types === 'institution'">
         <span>机构名称:</span>
         <a-input style="width: 200px" v-model:value="formData.institutionName" />
       </div>
       <div style="margin-bottom: 16px" class="mr-6">
         <span>服务包名称:</span>
         <a-input style="width: 200px" v-model:value="formData.name" />
-        <a-button type="primary" @click="addInstitution" class="ml-4" v-if="localData?.types === 'institution'">引入</a-button>
+        <a-button type="primary" @click="addInstitution" class="ml-4" v-if="props.data?.types === 'institution'">引入</a-button>
       </div>
-      <div class="flex" v-if="localData?.types === 'institution'">
+      <div class="flex" v-if="props.data?.types === 'institution'">
         <div class="w-35">服务形象照:</div>
         <a-upload
           :showUploadList="uploadProps"

+ 2 - 1
src/service/ServiceItemsConfirm.vue

@@ -171,7 +171,8 @@ function sureItem(model?: SystemItemModel, index?: number) {
         default() {
           return h(HealthEvaluation, <any>{
             data: {...model,addType},
-            change: (data: SystemItemModel) => {
+            onChange: (data: SystemItemModel) => {
+              console.log(data, '确认项目');
               // 确认成功之后刷新页面
               refresh(page.value);
             },