Bladeren bron

修改护理变更出现的BUG

unknown 3 maanden geleden
bovenliggende
commit
cef74ec7f5
2 gewijzigde bestanden met toevoegingen van 12 en 6 verwijderingen
  1. 1 1
      src/main.ts
  2. 11 5
      src/views/elderly/elder/nurse-change/ProcessForm.vue

+ 1 - 1
src/main.ts

@@ -51,7 +51,7 @@ import { Flex } from 'ant-design-vue'
 import 'ant-design-vue/dist/reset.css'
 import fetchPlugin from './config/axios/fetch';
 //版本号
-export const MAIN_VERSION = '4.3.3'
+export const MAIN_VERSION = '4.3.4'
 
 // 创建实例
 const setupAll = async () => {

+ 11 - 5
src/views/elderly/elder/nurse-change/ProcessForm.vue

@@ -51,7 +51,7 @@
         <el-col :span="12" :xs="24">
           <el-form-item label="能力评估结果">
             <el-button
-              :disabled="!!!dataForm.associateId"
+              :disabled="!dataForm.associateId"
               style="width: 100%"
               @click="handleOpenReport"
               ><Icon icon="ep:document" />{{ propertiesName }}</el-button
@@ -318,8 +318,8 @@ const isDetail = ref(false)
 /** 打开弹窗 */
 const init = async (id, detail, status) => {
   dataForm.value.startTenantId = getTenantId()
-  getTreeData()
-  getNurseLevelList()
+  await getTreeData()
+  await getNurseLevelList()
   isDetail.value = detail
   if (id) {
     const res = await getNurseChangeRecordById(id, status,isDetail.value)
@@ -329,13 +329,19 @@ const init = async (id, detail, status) => {
     discount.value = formatNum(res.discount)
     discountAmount.value = formatNum(res.discountAmount)
     syntheticAbilityId.value = res.syntheticAbilityId
-    getEvaluation()
+    await getEvaluation()
     active.value = getSyntheticAbilityName(res.totalScore)
     if(!res.startTenantId){
       dataForm.value.startTenantId = getTenantId()
     }
+
+  }
+ await getOverheadList()
+  if(id){
+    handleChange()
+    console.log("AAAA",dataForm.value)
   }
-  getOverheadList()
+
 }
 
 const submitForm = async () => {