解决冲突

riku

2023-12-19 af75a6d0da5ec8fc86d34bba29d21b55e5b411f0

 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
        }
      });
    });
  },