From 7e9a217f6d3610d612328112ee538481f7db089b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 19 十二月 2023 09:14:09 +0800
Subject: [PATCH] Merge branch 'master' into feature-001
---
src/views/fytz/user/UserEdit.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/views/fytz/user/UserEdit.vue b/src/views/fytz/user/UserEdit.vue
index 60e1399..174e18c 100644
--- a/src/views/fytz/user/UserEdit.vue
+++ b/src/views/fytz/user/UserEdit.vue
@@ -15,6 +15,7 @@
<div class="sub-title">鐢ㄦ埛淇℃伅琛�</div>
<FormCol>
<!-- <CompUserInfos :form-info="formUserInfos" /> -->
+ <CompBaseInfo :form-info="formUserInfos"/>
</FormCol>
<el-divider />
<div class="sub-title">浼佷笟淇℃伅</div>
@@ -99,6 +100,7 @@
import userApi from '@/api/fytz/userApi';
// import ComBaseInformation from '@/views/baseinfo/fytz/scene/ComBaseInformation.vue';
import CompUserInfo from './components/CompUserInfo.vue';
+import CompBaseInfo from './components/CompBaseInfo.vue';
// import CompLaint from '@/views/baseinfo/fytz/scene/CompLaint.vue';
// import CompDeviceInfo from "@/views/baseinfo/fytz/scene/CompDeviceInfo.vue";
// import CompPanyInfo from '@/views/baseinfo/fytz/scene/CompPanyInfo.vue';
@@ -116,6 +118,7 @@
// ComBaseInformation,
// CompLaint,
CompUserInfo,
+ CompBaseInfo,
// CompDeviceInfo,
// CompPanyInfo,
// CompFumePurifyDevice,
@@ -157,6 +160,9 @@
guid: to.params.userId,
};
}
+ if(res.baseInfo){
+ vm.formUserInfos = res.baseInfo
+ }
});
});
},
--
Gitblit v1.9.3