修改企业显示

src/views/company/detail.vue

@@ -33,9 +33,10 @@
                   </el-col>
                 </el-col>
                 <el-col :span="24" class="right_2">
-                  <el-tag v-for="(val, indexs) in info.tags" :key="indexs" type="primary">{{
-                    val
-                  }}</el-tag>
+                  <el-col :span="24" class="right_2">
+                    <el-tag type="primary">{{ getDict(info.pattern, 'pattern') }}</el-tag>
+                    <el-tag type="primary">{{ getDict(info.scale, 'scale') }}</el-tag>
+                  </el-col>
                 </el-col>
                 <el-col :span="24" class="right_3">
                   <el-col :span="8" class="info">
@@ -139,10 +140,10 @@ const router = useRouter()
 const loading = ref(false)
 const info = ref({})
 // 字典表
-const educationList = ref([])
 const fieldList = ref([])
 const statusList = ref([])
-const titleList = ref([])
+const patternList = ref([])
+const scaleList = ref([])
 // 成果列表
 const list = ref([])
 let skip = 0
@@ -178,26 +179,26 @@ const searchAchieve = async (query = { skip: 0, limit }) => {
 }
 const searchOther = async () => {
   let result
-  // 学历
-  result = await dictDataStore.query({ code: 'education', is_use: '0' })
-  if ($checkRes(result)) educationList.value = result.data
   // 技术领域
   result = await dictDataStore.query({ code: 'field', is_use: '0' })
   if ($checkRes(result)) fieldList.value = result.data
-  // 职称
-  result = await dictDataStore.query({ code: 'title', is_use: '0' })
-  if ($checkRes(result)) titleList.value = result.data
   // 企业状态
   result = await dictDataStore.query({ code: 'companyStatus', is_use: '0' })
   if ($checkRes(result)) statusList.value = result.data
+  // 企业类型
+  result = await dictDataStore.query({ code: 'companyType', is_use: '0' })
+  if ($checkRes(result)) patternList.value = result.data
+  // 企业规模
+  result = await dictDataStore.query({ code: 'companyScale', is_use: '0' })
+  if ($checkRes(result)) scaleList.value = result.data
 }
 // 字典数据转换
 const getDict = (data, model) => {
   let res
-  if (model == 'education') res = educationList.value.find((f) => f.value == data)
-  else if (model == 'field') res = fieldList.value.find((f) => f.value == data)
-  else if (model == 'title') res = titleList.value.find((f) => f.value == data)
+  if (model == 'field') res = fieldList.value.find((f) => f.value == data)
   else if (model == 'status') res = statusList.value.find((f) => f.value == data)
+  else if (model == 'pattern') res = patternList.value.find((f) => f.value == data)
+  else if (model == 'scale') res = scaleList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
 // 地区

src/views/company/index.vue

@@ -41,15 +41,14 @@
                     </el-tooltip>
                   </el-col>
                   <el-col :span="2" class="tags">
-                    <el-tag :type="[item.status == '0' ? 'success' : 'info']">{{
-                      getDict(item.status, 'status')
+                    <el-tag :type="[item.companyStatus == '0' ? 'success' : 'info']">{{
+                      getDict(item.companyStatus, 'status')
                     }}</el-tag>
                   </el-col>
                 </el-col>
                 <el-col :span="24" class="right_2">
-                  <el-tag v-for="(val, indexs) in item.tags" :key="indexs" type="primary">{{
-                    val
-                  }}</el-tag>
+                  <el-tag type="primary">{{ getDict(item.pattern, 'pattern') }}</el-tag>
+                  <el-tag type="primary">{{ getDict(item.scale, 'scale') }}</el-tag>
                 </el-col>
                 <el-col :span="24" class="right_3">
                   <el-col :span="4" class="info">
@@ -112,6 +111,8 @@ const total = ref(0)
 // 字典表
 const fieldList = ref([])
 const statusList = ref([])
+const patternList = ref([])
+const scaleList = ref([])
 const searchList = ref([
   {
     title: '注册资本',
@@ -206,6 +207,12 @@ const searchOther = async () => {
   // 企业状态
   result = await dictDataStore.query({ code: 'companyStatus', is_use: '0' })
   if ($checkRes(result)) statusList.value = result.data
+  // 企业类型
+  result = await dictDataStore.query({ code: 'companyType', is_use: '0' })
+  if ($checkRes(result)) patternList.value = result.data
+  // 企业规模
+  result = await dictDataStore.query({ code: 'companyScale', is_use: '0' })
+  if ($checkRes(result)) scaleList.value = result.data
 }
 const search = async (query = { skip: 0, limit }) => {
   const info = {
@@ -226,12 +233,10 @@ const getDict = (data, model) => {
   let res
   if (model == 'field') res = fieldList.value.find((f) => f.value == data)
   else if (model == 'status') res = statusList.value.find((f) => f.value == data)
+  else if (model == 'pattern') res = patternList.value.find((f) => f.value == data)
+  else if (model == 'scale') res = scaleList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
-// 地区显示
-const getArea = (data) => {
-  if (data) return data.join(',')
-}
 const currentPage = ref(1)
 // 分页
 const changePage = (page = currentPage.value) => {

src/views/home/index.vue

@@ -189,9 +189,8 @@
                     }}</el-tag>
                   </el-col>
                   <el-col :span="24" class="right_2">
-                    <el-tag v-for="(val, indexs) in item.tags" :key="indexs" type="primary">{{
-                      val
-                    }}</el-tag>
+                    <el-tag type="primary">{{ getDict(item.pattern, 'pattern') }}</el-tag>
+                    <el-tag type="primary">{{ getDict(item.scale, 'scale') }}</el-tag>
                   </el-col>
                   <el-col :span="24" class="right_3">
                     <el-col :span="4" class="info">
@@ -337,6 +336,8 @@ const maturityList = ref([])
 const industryList = ref([])
 const statusList = ref([])
 const fieldList = ref([])
+const patternList = ref([])
+const scaleList = ref([])
 // 成果
 const achievementList = ref([])
 // 专家
@@ -370,6 +371,12 @@ const searchOther = async () => {
   // 企业状态
   result = await dictDataStore.query({ code: 'companyStatus', is_use: '0' })
   if ($checkRes(result)) statusList.value = result.data
+  // 企业类型
+  result = await dictDataStore.query({ code: 'companyType', is_use: '0' })
+  if ($checkRes(result)) patternList.value = result.data
+  // 企业规模
+  result = await dictDataStore.query({ code: 'companyScale', is_use: '0' })
+  if ($checkRes(result)) scaleList.value = result.data
   // 技术领域
   result = await dictDataStore.query({ code: 'field', is_use: '0' })
   if ($checkRes(result)) fieldList.value = result.data
@@ -433,6 +440,8 @@ const getDict = (data, model) => {
   else if (model == 'type') res = industryList.value.find((f) => f.value == data)
   else if (model == 'status') res = statusList.value.find((f) => f.value == data)
   else if (model == 'field') res = fieldList.value.find((f) => f.value == data)
+  else if (model == 'pattern') res = patternList.value.find((f) => f.value == data)
+  else if (model == 'scale') res = scaleList.value.find((f) => f.value == data)
   return get(res, 'label')
 }
 // 地区显示

src/views/register/index.vue

@@ -85,6 +85,7 @@ const scaleList = ref([])
 const IndustryList = ref([])
 const cardTypeList = ref([])
 const contributionList = ref([])
+const companyList = ref([])
 // 用户类型
 const type = ref('0')
 // 用户协议
@@ -127,6 +128,9 @@ const searchOther = async () => {
   // 是否使用
   result = await dictDataStore.query({ code: 'isUse', is_use: '0' })
   if ($checkRes(result)) isUseList.value = result.data
+  // 公司状态
+  result = await dictDataStore.query({ code: 'companyStatus', is_use: '0' })
+  if ($checkRes(result)) companyList.value = result.data
   // 基础设置
   result = await designStore.query({})
   if ($checkRes(result)) configInfo.value = result.data[0] || {}
@@ -164,6 +168,7 @@ provide('scaleList', scaleList)
 provide('IndustryList', IndustryList)
 provide('cardTypeList', cardTypeList)
 provide('contributionList', contributionList)
+provide('companyList', companyList)
 // 方法
 provide('toLogin', toLogin)
 provide('toBack', toBack)

src/views/register/parts/company.vue

@@ -4,7 +4,7 @@
       ref="ruleFormRef"
       :model="form"
       :rules="rules"
-      label-width="100px"
+      label-width="110px"
       class="form"
       label-position="left"
     >
@@ -212,13 +212,29 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-col :span="24">
-        <el-form-item label="是否公开" prop="is_show">
-          <el-radio-group v-model="form.info.is_show">
-            <el-radio v-for="i in isUseList" :key="i._id" :label="i.value">{{ i.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-col>
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="公司状态" prop="companyStatus">
+            <el-select clearable v-model="form.info.companyStatus" placeholder="请选择公司状态">
+              <el-option
+                v-for="(item, index) in companyList"
+                :key="index"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否公开" prop="is_show">
+            <el-radio-group v-model="form.info.is_show">
+              <el-radio v-for="i in isUseList" :key="i._id" :label="i.value">{{
+                i.label
+              }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-col :span="24">
         <el-form-item label="简介" prop="brief">
           <el-input
@@ -264,6 +280,7 @@ const scaleList = inject('scaleList')
 const IndustryList = inject('IndustryList')
 const cityList = inject('cityList')
 const isUseList = inject('isUseList')
+const companyList = inject('companyList')
 // 方法
 const toLogin = inject('toLogin')
 const toBack = inject('toBack')
@@ -299,7 +316,18 @@ const rules = reactive({
   phone: [{ required: true, validator: validatePhoneNumber, trigger: 'blur' }],
   account: [{ required: true, message: '请输入账号', trigger: 'blur' }],
   password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-  refpassword: [{ required: true, validator: validatePassword, trigger: 'blur' }]
+  refpassword: [{ required: true, validator: validatePassword, trigger: 'blur' }],
+  logo: [{ required: true, message: '请输入企业Logo', trigger: 'blur' }],
+  name: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
+  pattern: [{ required: true, message: '请输入企业类型', trigger: 'blur' }],
+  scale: [{ required: true, message: '请输入企业规模', trigger: 'blur' }],
+  type: [{ required: true, message: '请输入所属行业', trigger: 'blur' }],
+  representative: [{ required: true, message: '请输入法定代表人', trigger: 'blur' }],
+  companyStatus: [{ required: true, message: '请输入公司状态', trigger: 'blur' }],
+  create_time: [{ required: true, message: '请输入成立时间', trigger: 'blur' }],
+  code: [{ required: true, message: '请输入统一社会信用代码', trigger: 'blur' }],
+  email: [{ required: true, message: '请输入邮箱', trigger: 'blur' }],
+  address: [{ required: true, message: '请输入地址', trigger: 'blur' }]
 })
 // 上传图片
 const onFUpload = (e) => {
@@ -329,7 +357,10 @@ const submitForm = async (formEl) => {
       }
       const res = await store.create(info)
       if (res.errcode === 0) {
-        const form = { ...{ user: get(res.data, '_id'), ...get(data, 'info') } }
+        const form = {
+          ...{ user: get(res.data, '_id'), phone: get(data, 'phone') },
+          ...get(data, 'info')
+        }
         const arr = await companyStore.create(form)
         if (arr.errcode === 0) {
           ElMessage({