Merge branch 'feature/随访管理' into develop

# Conflicts:
#	@types/components.d.ts

src/components/Enabled.vue

@@ -114,9 +114,6 @@ const formProps = reactive<VxeFormProps<FollowModel>>({
     name: [{ required: true, message: '请输入计划名称' }],
     startDate: [{ required: true, message: '请选择开始日期' }],
     endDate: [{ required: true, message: '请选择截止日期' }],
-    // arrangeTime: [{ required: true }],
-    // frequency: [{ required: true }],
-    // remindTime: [{ required: true }],
   },
 });
 
@@ -224,16 +221,6 @@ const patientsForm = reactive<VxeFormProps<PlanModel['filter']>>({
       },
     },
     { align: 'center', span: 24, slots: { default: 'patientsBtn' } },
-    // {
-    //   span: 20,
-    //   itemRender: {
-    //     name: 'VxeButtonGroup',
-    //     options: [
-    //       { type: 'submit', content: '完成', status: 'primary' },
-    //       { type: 'reset', content: '清空' },
-    //     ],
-    //   },
-    // },
   ],
 });
 const tagNames = ref<any[]>([]);

src/components/Evaluation.vue

@@ -28,7 +28,6 @@ const { loading, send: getDetail } = useRequest(EvaluateDetailMethod, {
     tonguefaceAnalysisReport: data?.tonguefaceAnalysisReport,
   };
   data.tasks.unshift(medicalObj);
-  console.log(data.tasks, '666');
   const tasks = data.tasks.map((item) => {
     let obj = {
       date: item.fillinTime || item.arrangeTime,
@@ -78,7 +77,6 @@ const gridOptions = reactive<VxeGridProps<FormModel>>({
     { title: '面部', key: 'k5' },
   ],
   cellStyle({ row, rowIndex, column, columnIndex }) {
-    // console.log('rowIndex:',rowIndex,'columnIndex',columnIndex);
     const value = row[column.field];
     const style = {};
     if (columnIndex === 1) {
@@ -176,6 +174,7 @@ function subEvalation() {
       message: ` `,
       description: '提交成功',
     });
+    VxeUI.modal.close(`assess-modal`);
   });
 }
 </script>
@@ -195,9 +194,9 @@ function subEvalation() {
         <span> {{ props.data.age }}岁</span>
       </div>
       <div class="border-r border-r-2 border-r-gray-300 border-r-solid pr-6 pl-6">
-        诊断：{{ props.data.diagnosis }}
+        诊断：{{ props.data?.diagnosis }}
       </div>
-      <div class="pl-6">症状：{{ props.data?.syndromeList.join(',') }}</div>
+      <div class="pl-6">症状：{{ props.data?.syndromeList?.join(',') }}</div>
     </div>
 
     <vxe-grid class="reverse-table detail" v-bind="gridOptions">
@@ -220,8 +219,8 @@ function subEvalation() {
           </div>
         </div>
         <span v-else-if="row[column.field] == props.data.medicalTime" style="color: red"
-          >{{ row[column.field] }}（就诊日） </span
-        >
+          >{{ row[column.field] }}（就诊日）
+        </span>
         <template v-else>{{ row[column.field] }}</template>
       </template>
       <!--      已经评估-->
@@ -252,8 +251,8 @@ function subEvalation() {
             {{ props.data?.evaluateDeal === '1' ? '复诊' : '中医调养' }}
           </div>
           <div class="mt-10 flex justify-end flex-col items-center">
-            <div>智医生</div>
-            <div>2024.10.05</div>
+            <div>{{ props.data?.evaluateBy }}</div>
+            <div>{{ props.data?.evaluateTime }}</div>
           </div>
         </div>
       </template>

src/components/Follow.vue

@@ -191,16 +191,14 @@ const handlePreview = async (file: UploadFile) => {
 
 // 填写随访内容
 function subFollowContent() {
-  activeObj.value.fillin.downImg = upImgList.value[0]?.response?.url;
-  activeObj.value.fillin.upImg = downImageList.value[0]?.response?.url;
+  activeObj.value.fillin.upImg = upImgList.value[0]?.response?.url;
+  activeObj.value.fillin.downImg = downImageList.value[0]?.response?.url;
   activeObj.value.fillin.faceImg = faceImageList.value[0]?.response?.url;
   symptomsList.value = [];
   activeObj.value.symptomsData.forEach((item) => {
     symptomsList.value.push({ name: item.name, type: item.selectedValue });
   });
   activeObj.value.fillin.symptomsList = symptomsList.value;
-  // console.log('填写的随访内容', activeObj.value.fillin);
-  // return;
   FillFollowContentMethod(activeObj.value).then(() => {
     notification.success({
       message: '',
@@ -376,7 +374,7 @@ const previewImg = ref<string>('');
         </div>
         <!--      第四个-->
         <div class="border-1 border-solid border-gray:50 pl-2 pd-10 ml-2">
-          <div class="mb-3">4、如果没有其他情况，请留言</div>
+          <div class="mb-3">4、如果有其他情况，请留言</div>
           <div class="mb-4 ml-4">
             <a-input
               v-model:value="activeObj.fillin.otherDesc"
@@ -463,7 +461,6 @@ const previewImg = ref<string>('');
     </div>
     <div class="flex items-center justify-center mt-6 mb-6">
       <a-button size="small" class="mr-4" @click="cancelFollowContent">取消</a-button>
-      <!--      <a-button type="primary" size="small" @click="subFollowContent">提交</a-button>-->
       <a-button
         type="primary"
         size="small"

src/request/api/account.api.ts

@@ -65,61 +65,6 @@ export function getMenusMethod(account: AccountModel) {
   return request.Get<AccountModel, any[]>(`/system/menu/getRouters`, {
     headers: { Authorization: account.token },
     transform(data) {
-      // data.push(
-        // {
-        //   path: '/follow',
-        //   meta: {
-        //     title: '随访管理',
-        //   },
-        //   children: [
-        //     {
-        //       path: 'plan',
-        //       meta: {
-        //         title: '随访计划',
-        //       },
-        //     },
-        //     {
-        //       path: 'task',
-        //       meta: {
-        //         title: '随访任务',
-        //       },
-        //     },
-        //     {
-        //       path: 'assessment',
-        //       meta: {
-        //         title: '随访评估',
-        //       },
-        //     },
-        //   ],
-        // },
-        // {
-        //   path: '/tcmRecuperation',
-        //   meta: {
-        //     title: '中医调养',
-        //   },
-        //   children: [
-        //     {
-        //       path: 'preserve',
-        //       meta: {
-        //         title: '服务项目维护',
-        //       },
-        //     },
-        //     {
-        //       path: 'system',
-        //       meta: {
-        //         title: '系统服务包',
-        //       },
-        //     },
-        //     {
-        //       path: 'institution',
-        //       meta: {
-        //         title: '机构服务包',
-        //       },
-        //     },
-        //   ],
-        // }
-      // );
-      // console.log(data);
       return { ...account, menus: transformMenus(data) };
     },
   });

src/request/api/dictionary.api.ts

@@ -115,7 +115,6 @@ export type Dictionaries = Record<DictionaryKeys, Dictionary[] & { __label__: st
 
 
 export function getDictionaryMethod(key: string) {
-  console.log('key',key);
   return request.Get(`/system/dict/data/type/${ key }`, {
     cacheFor: {
       mode: 'restore',