fix: 企业信息查询修正

src/main/resources/mapping/cquery/CompanyCQuery.xml

@@ -5,11 +5,13 @@
         select company.*,city.name as regionName,area.name as streetName,sys_cmodel.Name as companyModelType,
         (select count(*) from pc_post where CompanyID=company.CompanyID) as postCount,u.`Name` as createUserName
         ,inSites.InstitutionID as institutionID,site.SiteName,com_status.Name as recordStatusName,
-        com_profession.Name as professionName, com_estate.Name as estateCategoryName
+        com_profession.Name as professionName, com_estate.Name as estateCategoryName,com_type.Name as companyTypeName
         from pc_company company
         left join sys_user u on u.UserID = company.CreateUserID
         left join (select * from sys_dictionary_item where DictionaryCode ='CompanyModel') sys_cmodel on
         company.CompanyModel = sys_cmodel.Value
+        left join (select * from sys_dictionary_item where DictionaryCode ='CompanyType') com_type on
+        company.CompanyType = com_type.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='CompanyStatus') com_status on
         company.RecordStatus = com_status.Value
         left join (select * from sys_dictionary_item where DictionaryCode ='CompanyProfession') com_profession on

vue/src/views/companyService/company/detail.vue

@@ -33,7 +33,7 @@
         {{ companyInfo.validDate ? dayjs(companyInfo.validDate).format('YYYY-MM-DD') : '' }}
       </a-descriptions-item>
       <a-descriptions-item label="企业邮箱">{{ companyInfo.companyEmail }}</a-descriptions-item>
-      <a-descriptions-item label="企业分类">{{ companyInfo.companyType }}</a-descriptions-item>
+      <a-descriptions-item label="经济类型">{{ companyInfo.companyTypeName }}</a-descriptions-item>
       <a-descriptions-item label="所属县区">{{ companyInfo.regionName }}</a-descriptions-item>
       <a-descriptions-item label="所属街道">{{ companyInfo.streetName }}</a-descriptions-item>
       <a-descriptions-item label="企业规模">{{ companyInfo.companyModel }}</a-descriptions-item>
@@ -69,6 +69,7 @@ const companyInfo = reactive({
   validDate: "",
   companyEmail: "",
   companyType: "",
+  companyTypeName: "",
   regionName: "",
   streetName: "",
   companyModel: "",

vue/src/views/companyService/company/edit.vue

@@ -257,10 +257,10 @@
       <a-row>
         <a-col :span="8">
           <a-form-item
-            label="企业分类"
+            label="经济类型"
             :label-col="{ span: 8 }"
             name="companyType"
-            :rules="[{ required: false, message: '请选择企业分类!' }]"
+            :rules="[{ required: false, message: '请选择经济类型!' }]"
           >
             <a-select
               ref="select"