web-企业信息编辑页面及表字段类型调整

h5app/src/views/pages/post/detail.vue

@@ -88,11 +88,6 @@
           <ion-button shape="round" expand="block" @click="onAllRecommend">全部推荐</ion-button>
         </div>
       </ion-toolbar>
-      <ion-loading
-          :is-open="formStatus.loading"
-          message="加载中..."
-          @didDismiss="setOpen(false)" >
-      </ion-loading>
     </ion-footer>
   </ion-page>
 </template>
@@ -155,11 +150,7 @@ export default defineComponent({
     const formStatus = reactive({
       total:0,
       loading:false
-    })
-
-    const setOpen = (isOpen: boolean) => {
-      formStatus.loading = isOpen;
-    };
+    });
 
     const presentAlert = async (title:string,message: string) => {
       const alert = await alertController.create({
@@ -222,13 +213,13 @@ export default defineComponent({
       router.push("./list");
     }
 
-
     const getCurHuntList = async function(jobUserID:any){
       const huntJobResult :any = await getUserHuntList(jobUserID);
-      huntJobList.value = huntJobResult;
+      huntJobList.value = huntJobResult == null? []:huntJobResult;
+      console.log("huntJobList",huntJobList.value);
       /*处理意向岗位显示*/
       dataModel.value.postNames = '';
-      if(huntJobList.value.length>0){
+      if(huntJobList.value && huntJobList.value.length>0){
         for(let i=0;i<huntJobList.value.length;i++){
           if(i<huntJobList.value.length-1){
             dataModel.value.postNames += huntJobList.value[i].postName+",";
@@ -236,17 +227,18 @@ export default defineComponent({
             dataModel.value.postNames += huntJobList.value[i].postName;
           }
         }
+      }else{
+        dataModel.value.postNames ='暂无';
       }
-      console.log("huntJobList",huntJobList.value);
     }
     const getCurCommendPostList = async function(searchParams:any){
       const huntPostResult :any = await getCommendPostList(searchParams);
       recommendPostList.value = huntPostResult.list;
       console.log("recommendPostList",recommendPostList.value);
     }
-
     const loadData = async (jobUserID: any) => {
       formStatus.loading = true;
+      recommendPostList.value = [];
       /*查询求职人员信息*/
       const userInfo :any = await getJobUserById(jobUserID);
       dataModel.value = userInfo;
@@ -256,6 +248,7 @@ export default defineComponent({
       /*查询推荐岗位信息*/
       pageParams.jobUserID = jobUserID;
       await getCurCommendPostList(pageParams);
+      formStatus.total = recommendPostList.value.length;
       formStatus.loading = false;
     };
 
@@ -267,8 +260,6 @@ export default defineComponent({
 
     const reload = (jobUserID:any) => {
       pageParams.pageIndex = 1;
-      recommendPostList.value = [];
-      dataModel.value.recommendedCount = 0;
       loadData(jobUserID);
     }
 
@@ -289,7 +280,6 @@ export default defineComponent({
       pageParams,
       formStatus,
       commendStr,
-      setOpen,
       onCommend,
       onAllRecommend,
       onBack,

src/main/java/com/hz/employmentsite/controller/companyService/CompanyController.java

@@ -51,6 +51,8 @@ public class CompanyController {
         if (data == null) {
             data = new CompanyVo();
             data.companyID=UUID.randomUUID().toString();
+            data.recordStatus =1;
+            data.validTime = "长期";
         }
         return RespGenerstor.success(data);
     }

src/main/java/com/hz/employmentsite/model/PcCompany.java

@@ -9,13 +9,15 @@ public class PcCompany {
 
     private String regionCode;
 
+    private Integer insuredCount;
+
     private String streetCode;
 
     private String companyName;
 
     private String companyCode;
 
-    private String companyModel;
+    private Integer companyModel;
 
     private String workSituation;
 
@@ -31,7 +33,7 @@ public class PcCompany {
 
     private String frName;
 
-    private Date validTime;
+    private String validTime;
 
     private Integer recordStatus;
 
@@ -43,8 +45,6 @@ public class PcCompany {
 
     private Date modifyTime;
 
-    private Integer insuredCount;
-
     public String getCompanyID() {
         return companyID;
     }
@@ -69,6 +69,14 @@ public class PcCompany {
         this.regionCode = regionCode == null ? null : regionCode.trim();
     }
 
+    public Integer getInsuredCount() {
+        return insuredCount;
+    }
+
+    public void setInsuredCount(Integer insuredCount) {
+        this.insuredCount = insuredCount;
+    }
+
     public String getStreetCode() {
         return streetCode;
     }
@@ -93,12 +101,12 @@ public class PcCompany {
         this.companyCode = companyCode == null ? null : companyCode.trim();
     }
 
-    public String getCompanyModel() {
+    public Integer getCompanyModel() {
         return companyModel;
     }
 
-    public void setCompanyModel(String companyModel) {
-        this.companyModel = companyModel == null ? null : companyModel.trim();
+    public void setCompanyModel(Integer companyModel) {
+        this.companyModel = companyModel;
     }
 
     public String getWorkSituation() {
@@ -157,12 +165,12 @@ public class PcCompany {
         this.frName = frName == null ? null : frName.trim();
     }
 
-    public Date getValidTime() {
+    public String getValidTime() {
         return validTime;
     }
 
-    public void setValidTime(Date validTime) {
-        this.validTime = validTime;
+    public void setValidTime(String validTime) {
+        this.validTime = validTime == null ? null : validTime.trim();
     }
 
     public Integer getRecordStatus() {
@@ -204,12 +212,4 @@ public class PcCompany {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
-
-    public Integer getInsuredCount() {
-        return insuredCount;
-    }
-
-    public void setInsuredCount(Integer insuredCount) {
-        this.insuredCount = insuredCount;
-    }
 }

src/main/java/com/hz/employmentsite/model/PcCompanyExample.java

@@ -315,6 +315,66 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
+        public Criteria andInsuredCountIsNull() {
+            addCriterion("InsuredCount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountIsNotNull() {
+            addCriterion("InsuredCount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountEqualTo(Integer value) {
+            addCriterion("InsuredCount =", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountNotEqualTo(Integer value) {
+            addCriterion("InsuredCount <>", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountGreaterThan(Integer value) {
+            addCriterion("InsuredCount >", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountGreaterThanOrEqualTo(Integer value) {
+            addCriterion("InsuredCount >=", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountLessThan(Integer value) {
+            addCriterion("InsuredCount <", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountLessThanOrEqualTo(Integer value) {
+            addCriterion("InsuredCount <=", value, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountIn(List<Integer> values) {
+            addCriterion("InsuredCount in", values, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountNotIn(List<Integer> values) {
+            addCriterion("InsuredCount not in", values, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountBetween(Integer value1, Integer value2) {
+            addCriterion("InsuredCount between", value1, value2, "insuredCount");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsuredCountNotBetween(Integer value1, Integer value2) {
+            addCriterion("InsuredCount not between", value1, value2, "insuredCount");
+            return (Criteria) this;
+        }
+
         public Criteria andStreetCodeIsNull() {
             addCriterion("StreetCode is null");
             return (Criteria) this;
@@ -535,62 +595,52 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelEqualTo(String value) {
+        public Criteria andCompanyModelEqualTo(Integer value) {
             addCriterion("CompanyModel =", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelNotEqualTo(String value) {
+        public Criteria andCompanyModelNotEqualTo(Integer value) {
             addCriterion("CompanyModel <>", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelGreaterThan(String value) {
+        public Criteria andCompanyModelGreaterThan(Integer value) {
             addCriterion("CompanyModel >", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelGreaterThanOrEqualTo(String value) {
+        public Criteria andCompanyModelGreaterThanOrEqualTo(Integer value) {
             addCriterion("CompanyModel >=", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelLessThan(String value) {
+        public Criteria andCompanyModelLessThan(Integer value) {
             addCriterion("CompanyModel <", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelLessThanOrEqualTo(String value) {
+        public Criteria andCompanyModelLessThanOrEqualTo(Integer value) {
             addCriterion("CompanyModel <=", value, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelLike(String value) {
-            addCriterion("CompanyModel like", value, "companyModel");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyModelNotLike(String value) {
-            addCriterion("CompanyModel not like", value, "companyModel");
-            return (Criteria) this;
-        }
-
-        public Criteria andCompanyModelIn(List<String> values) {
+        public Criteria andCompanyModelIn(List<Integer> values) {
             addCriterion("CompanyModel in", values, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelNotIn(List<String> values) {
+        public Criteria andCompanyModelNotIn(List<Integer> values) {
             addCriterion("CompanyModel not in", values, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelBetween(String value1, String value2) {
+        public Criteria andCompanyModelBetween(Integer value1, Integer value2) {
             addCriterion("CompanyModel between", value1, value2, "companyModel");
             return (Criteria) this;
         }
 
-        public Criteria andCompanyModelNotBetween(String value1, String value2) {
+        public Criteria andCompanyModelNotBetween(Integer value1, Integer value2) {
             addCriterion("CompanyModel not between", value1, value2, "companyModel");
             return (Criteria) this;
         }
@@ -1095,52 +1145,62 @@ public class PcCompanyExample {
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeEqualTo(Date value) {
+        public Criteria andValidTimeEqualTo(String value) {
             addCriterion("ValidTime =", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotEqualTo(Date value) {
+        public Criteria andValidTimeNotEqualTo(String value) {
             addCriterion("ValidTime <>", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeGreaterThan(Date value) {
+        public Criteria andValidTimeGreaterThan(String value) {
             addCriterion("ValidTime >", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeGreaterThanOrEqualTo(Date value) {
+        public Criteria andValidTimeGreaterThanOrEqualTo(String value) {
             addCriterion("ValidTime >=", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeLessThan(Date value) {
+        public Criteria andValidTimeLessThan(String value) {
             addCriterion("ValidTime <", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeLessThanOrEqualTo(Date value) {
+        public Criteria andValidTimeLessThanOrEqualTo(String value) {
             addCriterion("ValidTime <=", value, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeIn(List<Date> values) {
+        public Criteria andValidTimeLike(String value) {
+            addCriterion("ValidTime like", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeNotLike(String value) {
+            addCriterion("ValidTime not like", value, "validTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidTimeIn(List<String> values) {
             addCriterion("ValidTime in", values, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotIn(List<Date> values) {
+        public Criteria andValidTimeNotIn(List<String> values) {
             addCriterion("ValidTime not in", values, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeBetween(Date value1, Date value2) {
+        public Criteria andValidTimeBetween(String value1, String value2) {
             addCriterion("ValidTime between", value1, value2, "validTime");
             return (Criteria) this;
         }
 
-        public Criteria andValidTimeNotBetween(Date value1, Date value2) {
+        public Criteria andValidTimeNotBetween(String value1, String value2) {
             addCriterion("ValidTime not between", value1, value2, "validTime");
             return (Criteria) this;
         }
@@ -1464,66 +1524,6 @@ public class PcCompanyExample {
             addCriterion("ModifyTime not between", value1, value2, "modifyTime");
             return (Criteria) this;
         }
-
-        public Criteria andInsuredCountIsNull() {
-            addCriterion("InsuredCount is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountIsNotNull() {
-            addCriterion("InsuredCount is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountEqualTo(Integer value) {
-            addCriterion("InsuredCount =", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountNotEqualTo(Integer value) {
-            addCriterion("InsuredCount <>", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountGreaterThan(Integer value) {
-            addCriterion("InsuredCount >", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountGreaterThanOrEqualTo(Integer value) {
-            addCriterion("InsuredCount >=", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountLessThan(Integer value) {
-            addCriterion("InsuredCount <", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountLessThanOrEqualTo(Integer value) {
-            addCriterion("InsuredCount <=", value, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountIn(List<Integer> values) {
-            addCriterion("InsuredCount in", values, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountNotIn(List<Integer> values) {
-            addCriterion("InsuredCount not in", values, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountBetween(Integer value1, Integer value2) {
-            addCriterion("InsuredCount between", value1, value2, "insuredCount");
-            return (Criteria) this;
-        }
-
-        public Criteria andInsuredCountNotBetween(Integer value1, Integer value2) {
-            addCriterion("InsuredCount not between", value1, value2, "insuredCount");
-            return (Criteria) this;
-        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -11,9 +11,11 @@ import com.hz.employmentsite.mapper.cquery.CompanyCQuery;
 import com.hz.employmentsite.model.*;
 import com.hz.employmentsite.services.impl.system.DictionaryServiceImpl;
 import com.hz.employmentsite.services.service.companyService.CompanyService;
+import com.hz.employmentsite.services.service.system.DictionaryService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.companyService.AppCompanyPostVo;
 import com.hz.employmentsite.vo.companyService.CompanyVo;
+import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,6 +36,9 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private StringUtils stringUtils;
 
+    @Autowired
+    private DictionaryService dictionaryService;
+
     @Autowired
     private PcCompanyMapper pcCompanyMapper;
 
@@ -151,6 +156,8 @@ public class CompanyServiceImpl implements CompanyService {
         reginExp.or().andLvEqualTo("4");
         List<AreaCode> streetList = areaCodeMapper.selectByExample(streetExp);
         List<CompanyVo> resultList = new ArrayList<>();
+        //企业规模
+        List<SysDictionaryItem> dicCompanyModelList = dictionaryService.getDictionaryItemList("CompanyModel");
 
         dataList.forEach(item -> {
             String errorInfo = "";
@@ -187,12 +194,18 @@ public class CompanyServiceImpl implements CompanyService {
                 errorInfo += "请填写企业办公地址!";
             if (stringUtils.IsNullOrEmpty(item.workSituation))
                 errorInfo += "请填写用工情况!";
-            if (stringUtils.IsNullOrEmpty(item.companyModel))
+            if (stringUtils.IsNullOrEmpty(item.companyModelStr))
                 errorInfo += "请填写企业规模!";
+            else {
+                item.companyModel = dicCompanyModelList.stream().filter(it -> it.getName().equals(item.companyModelStr.trim()))
+                        .findFirst().orElse(new SysDictionaryItem()).getValue();
+                if (item.companyModel == null || item.companyModel == 0)
+                    errorInfo += "企业规模不存在！";
+            }
             if (stringUtils.IsNullOrEmpty(item.userName))
                 errorInfo += "请填写企业联系人!";
             if (stringUtils.IsNullOrEmpty(item.userMobile))
-                errorInfo += "请填写!";
+                errorInfo += "请填写联系电话!";
             if (stringUtils.IsNullOrEmpty(item.companyEmail))
                 errorInfo += "请填写企业邮箱!";
             if (stringUtils.IsNullOrEmpty(item.frName))

src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -17,8 +17,9 @@ public class CompanyVo {
     public String companyName;
 
     public String companyCode;
+    public Integer companyModel;
 
-    public String companyModel;
+    public String companyModelStr;
 
     public String workSituation;
 
@@ -33,8 +34,7 @@ public class CompanyVo {
     public String companyEmail;
 
     public String frName;
-
-    public Date validTime;
+    public String validTime;
 
     public Integer recordStatus;
 

src/main/resources/generatorConfig.xml

@@ -104,6 +104,5 @@
 <!--        <table schema="" tableName="pc_jobuser"><property name="useActualColumnNames" value="true"/></table>-->
 <!--        <table schema="" tableName="pc_education"><property name="useActualColumnNames" value="true"/></table>-->
 
-
     </context>
 </generatorConfiguration>

src/main/resources/mapping/PcCompanyMapper.xml

@@ -5,10 +5,11 @@
     <id column="CompanyID" jdbcType="VARCHAR" property="companyID" />
     <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
     <result column="RegionCode" jdbcType="VARCHAR" property="regionCode" />
+    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount" />
     <result column="StreetCode" jdbcType="VARCHAR" property="streetCode" />
     <result column="CompanyName" jdbcType="VARCHAR" property="companyName" />
     <result column="CompanyCode" jdbcType="VARCHAR" property="companyCode" />
-    <result column="CompanyModel" jdbcType="VARCHAR" property="companyModel" />
+    <result column="CompanyModel" jdbcType="INTEGER" property="companyModel" />
     <result column="WorkSituation" jdbcType="VARCHAR" property="workSituation" />
     <result column="CompanyType" jdbcType="VARCHAR" property="companyType" />
     <result column="Address" jdbcType="VARCHAR" property="address" />
@@ -16,13 +17,12 @@
     <result column="UserMobile" jdbcType="VARCHAR" property="userMobile" />
     <result column="CompanyEmail" jdbcType="VARCHAR" property="companyEmail" />
     <result column="FrName" jdbcType="VARCHAR" property="frName" />
-    <result column="ValidTime" jdbcType="TIMESTAMP" property="validTime" />
+    <result column="ValidTime" jdbcType="VARCHAR" property="validTime" />
     <result column="RecordStatus" jdbcType="INTEGER" property="recordStatus" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
     <result column="ModifyTime" jdbcType="TIMESTAMP" property="modifyTime" />
-    <result column="InsuredCount" jdbcType="INTEGER" property="insuredCount" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     <result column="BusinScope" jdbcType="LONGVARCHAR" property="businScope" />
@@ -87,9 +87,9 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    CompanyID, SiteID, RegionCode, StreetCode, CompanyName, CompanyCode, CompanyModel, 
-    WorkSituation, CompanyType, Address, UserName, UserMobile, CompanyEmail, FrName, 
-    ValidTime, RecordStatus, CreateUserID, CreateTime, ModifyUserID, ModifyTime, InsuredCount
+    CompanyID, SiteID, RegionCode, InsuredCount, StreetCode, CompanyName, CompanyCode, 
+    CompanyModel, WorkSituation, CompanyType, Address, UserName, UserMobile, CompanyEmail, 
+    FrName, ValidTime, RecordStatus, CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -144,20 +144,20 @@
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company (CompanyID, SiteID, RegionCode, 
-      StreetCode, CompanyName, CompanyCode, 
-      CompanyModel, WorkSituation, CompanyType, 
-      Address, UserName, UserMobile, 
-      CompanyEmail, FrName, ValidTime, 
-      RecordStatus, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime, InsuredCount, 
+      InsuredCount, StreetCode, CompanyName, 
+      CompanyCode, CompanyModel, WorkSituation, 
+      CompanyType, Address, UserName, 
+      UserMobile, CompanyEmail, FrName, 
+      ValidTime, RecordStatus, CreateUserID, 
+      CreateTime, ModifyUserID, ModifyTime, 
       BusinScope, CompanyDesc)
     values (#{companyID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{regionCode,jdbcType=VARCHAR}, 
-      #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, 
-      #{companyModel,jdbcType=VARCHAR}, #{workSituation,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, 
-      #{address,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userMobile,jdbcType=VARCHAR}, 
-      #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, #{validTime,jdbcType=TIMESTAMP}, 
-      #{recordStatus,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{insuredCount,jdbcType=INTEGER}, 
+      #{insuredCount,jdbcType=INTEGER}, #{streetCode,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
+      #{companyCode,jdbcType=VARCHAR}, #{companyModel,jdbcType=INTEGER}, #{workSituation,jdbcType=VARCHAR}, 
+      #{companyType,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, 
+      #{userMobile,jdbcType=VARCHAR}, #{companyEmail,jdbcType=VARCHAR}, #{frName,jdbcType=VARCHAR}, 
+      #{validTime,jdbcType=VARCHAR}, #{recordStatus,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, 
       #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
@@ -172,6 +172,9 @@
       <if test="regionCode != null">
         RegionCode,
       </if>
+      <if test="insuredCount != null">
+        InsuredCount,
+      </if>
       <if test="streetCode != null">
         StreetCode,
       </if>
@@ -223,9 +226,6 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
-      <if test="insuredCount != null">
-        InsuredCount,
-      </if>
       <if test="businScope != null">
         BusinScope,
       </if>
@@ -243,6 +243,9 @@
       <if test="regionCode != null">
         #{regionCode,jdbcType=VARCHAR},
       </if>
+      <if test="insuredCount != null">
+        #{insuredCount,jdbcType=INTEGER},
+      </if>
       <if test="streetCode != null">
         #{streetCode,jdbcType=VARCHAR},
       </if>
@@ -253,7 +256,7 @@
         #{companyCode,jdbcType=VARCHAR},
       </if>
       <if test="companyModel != null">
-        #{companyModel,jdbcType=VARCHAR},
+        #{companyModel,jdbcType=INTEGER},
       </if>
       <if test="workSituation != null">
         #{workSituation,jdbcType=VARCHAR},
@@ -277,7 +280,7 @@
         #{frName,jdbcType=VARCHAR},
       </if>
       <if test="validTime != null">
-        #{validTime,jdbcType=TIMESTAMP},
+        #{validTime,jdbcType=VARCHAR},
       </if>
       <if test="recordStatus != null">
         #{recordStatus,jdbcType=INTEGER},
@@ -294,9 +297,6 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="insuredCount != null">
-        #{insuredCount,jdbcType=INTEGER},
-      </if>
       <if test="businScope != null">
         #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -323,6 +323,9 @@
       <if test="row.regionCode != null">
         RegionCode = #{row.regionCode,jdbcType=VARCHAR},
       </if>
+      <if test="row.insuredCount != null">
+        InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
+      </if>
       <if test="row.streetCode != null">
         StreetCode = #{row.streetCode,jdbcType=VARCHAR},
       </if>
@@ -333,7 +336,7 @@
         CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
       </if>
       <if test="row.companyModel != null">
-        CompanyModel = #{row.companyModel,jdbcType=VARCHAR},
+        CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       </if>
       <if test="row.workSituation != null">
         WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
@@ -357,7 +360,7 @@
         FrName = #{row.frName,jdbcType=VARCHAR},
       </if>
       <if test="row.validTime != null">
-        ValidTime = #{row.validTime,jdbcType=TIMESTAMP},
+        ValidTime = #{row.validTime,jdbcType=VARCHAR},
       </if>
       <if test="row.recordStatus != null">
         RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
@@ -374,9 +377,6 @@
       <if test="row.modifyTime != null">
         ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="row.insuredCount != null">
-        InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
-      </if>
       <if test="row.businScope != null">
         BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -393,10 +393,11 @@
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
       SiteID = #{row.siteID,jdbcType=VARCHAR},
       RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
       StreetCode = #{row.streetCode,jdbcType=VARCHAR},
       CompanyName = #{row.companyName,jdbcType=VARCHAR},
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=VARCHAR},
+      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
       CompanyType = #{row.companyType,jdbcType=VARCHAR},
       Address = #{row.address,jdbcType=VARCHAR},
@@ -404,13 +405,12 @@
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
       FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidTime = #{row.validTime,jdbcType=TIMESTAMP},
+      ValidTime = #{row.validTime,jdbcType=VARCHAR},
       RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
       BusinScope = #{row.businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{row.companyDesc,jdbcType=LONGVARCHAR}
     <if test="example != null">
@@ -422,10 +422,11 @@
     set CompanyID = #{row.companyID,jdbcType=VARCHAR},
       SiteID = #{row.siteID,jdbcType=VARCHAR},
       RegionCode = #{row.regionCode,jdbcType=VARCHAR},
+      InsuredCount = #{row.insuredCount,jdbcType=INTEGER},
       StreetCode = #{row.streetCode,jdbcType=VARCHAR},
       CompanyName = #{row.companyName,jdbcType=VARCHAR},
       CompanyCode = #{row.companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{row.companyModel,jdbcType=VARCHAR},
+      CompanyModel = #{row.companyModel,jdbcType=INTEGER},
       WorkSituation = #{row.workSituation,jdbcType=VARCHAR},
       CompanyType = #{row.companyType,jdbcType=VARCHAR},
       Address = #{row.address,jdbcType=VARCHAR},
@@ -433,13 +434,12 @@
       UserMobile = #{row.userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{row.companyEmail,jdbcType=VARCHAR},
       FrName = #{row.frName,jdbcType=VARCHAR},
-      ValidTime = #{row.validTime,jdbcType=TIMESTAMP},
+      ValidTime = #{row.validTime,jdbcType=VARCHAR},
       RecordStatus = #{row.recordStatus,jdbcType=INTEGER},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
-      InsuredCount = #{row.insuredCount,jdbcType=INTEGER}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -453,6 +453,9 @@
       <if test="regionCode != null">
         RegionCode = #{regionCode,jdbcType=VARCHAR},
       </if>
+      <if test="insuredCount != null">
+        InsuredCount = #{insuredCount,jdbcType=INTEGER},
+      </if>
       <if test="streetCode != null">
         StreetCode = #{streetCode,jdbcType=VARCHAR},
       </if>
@@ -463,7 +466,7 @@
         CompanyCode = #{companyCode,jdbcType=VARCHAR},
       </if>
       <if test="companyModel != null">
-        CompanyModel = #{companyModel,jdbcType=VARCHAR},
+        CompanyModel = #{companyModel,jdbcType=INTEGER},
       </if>
       <if test="workSituation != null">
         WorkSituation = #{workSituation,jdbcType=VARCHAR},
@@ -487,7 +490,7 @@
         FrName = #{frName,jdbcType=VARCHAR},
       </if>
       <if test="validTime != null">
-        ValidTime = #{validTime,jdbcType=TIMESTAMP},
+        ValidTime = #{validTime,jdbcType=VARCHAR},
       </if>
       <if test="recordStatus != null">
         RecordStatus = #{recordStatus,jdbcType=INTEGER},
@@ -504,9 +507,6 @@
       <if test="modifyTime != null">
         ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="insuredCount != null">
-        InsuredCount = #{insuredCount,jdbcType=INTEGER},
-      </if>
       <if test="businScope != null">
         BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -520,10 +520,11 @@
     update pc_company
     set SiteID = #{siteID,jdbcType=VARCHAR},
       RegionCode = #{regionCode,jdbcType=VARCHAR},
+      InsuredCount = #{insuredCount,jdbcType=INTEGER},
       StreetCode = #{streetCode,jdbcType=VARCHAR},
       CompanyName = #{companyName,jdbcType=VARCHAR},
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=VARCHAR},
+      CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
       CompanyType = #{companyType,jdbcType=VARCHAR},
       Address = #{address,jdbcType=VARCHAR},
@@ -531,13 +532,12 @@
       UserMobile = #{userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
       FrName = #{frName,jdbcType=VARCHAR},
-      ValidTime = #{validTime,jdbcType=TIMESTAMP},
+      ValidTime = #{validTime,jdbcType=VARCHAR},
       RecordStatus = #{recordStatus,jdbcType=INTEGER},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
       ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER},
       BusinScope = #{businScope,jdbcType=LONGVARCHAR},
       CompanyDesc = #{companyDesc,jdbcType=LONGVARCHAR}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
@@ -546,10 +546,11 @@
     update pc_company
     set SiteID = #{siteID,jdbcType=VARCHAR},
       RegionCode = #{regionCode,jdbcType=VARCHAR},
+      InsuredCount = #{insuredCount,jdbcType=INTEGER},
       StreetCode = #{streetCode,jdbcType=VARCHAR},
       CompanyName = #{companyName,jdbcType=VARCHAR},
       CompanyCode = #{companyCode,jdbcType=VARCHAR},
-      CompanyModel = #{companyModel,jdbcType=VARCHAR},
+      CompanyModel = #{companyModel,jdbcType=INTEGER},
       WorkSituation = #{workSituation,jdbcType=VARCHAR},
       CompanyType = #{companyType,jdbcType=VARCHAR},
       Address = #{address,jdbcType=VARCHAR},
@@ -557,13 +558,12 @@
       UserMobile = #{userMobile,jdbcType=VARCHAR},
       CompanyEmail = #{companyEmail,jdbcType=VARCHAR},
       FrName = #{frName,jdbcType=VARCHAR},
-      ValidTime = #{validTime,jdbcType=TIMESTAMP},
+      ValidTime = #{validTime,jdbcType=VARCHAR},
       RecordStatus = #{recordStatus,jdbcType=INTEGER},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
-      InsuredCount = #{insuredCount,jdbcType=INTEGER}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

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

@@ -2,12 +2,11 @@
   <div class="card-edit">
     <a-form :model="dataModel" autocomplete="off" @finish="onFinish">
       <a-divider orientation="left">企业信息管理</a-divider>
-
       <a-row :gutter="24">
-        <a-col :span="8">
+        <a-col :span="7">
           <a-form-item
             label="企业名称"
-            :label-col="{ span: 6 }"
+            :label-col="{ span: 7 }"
             name="companyName"
             :rules="[{ required: true, message: '请输入企业名称!' }]"
           >
@@ -16,103 +15,66 @@
         </a-col>
         <a-col :span="8">
           <a-form-item
-            label="统一信用代码"
-            :label-col="{ span: 6 }"
+            label="统一社会信用代码"
+            :label-col="{ span: 8 }"
             name="companyCode"
             :rules="[{ required: true, message: '请输入统一信用代码!' }]"
           >
             <a-input v-model:value="dataModel.companyCode" placeholder=""/>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="9">
           <a-form-item
-            label="所属驿站"
-            :label-col="{ span: 6 }"
-            name="siteID"
-            :rules="[{ required: true, message: '请选择所属驿站!' }]"
+            label="法定代表人(负责人)"
+            :label-col="{ span: 9 }"
+            name="frName"
+            :rules="[{ required: true, message: '请选择法定代表人!' }]"
           >
-            <a-select
-              ref="select"
-              v-model:value="dataModel.siteID"
-              :options="siteList"
-              :field-names="{ label: 'siteName', value: 'siteID' }"
-            >
-            </a-select>
+            <a-input v-model:value="dataModel.frName" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="8">
+        <a-col :span="7">
           <a-form-item
-            label="所属县区"
-            :label-col="{ span: 6 }"
-            name="regionCode"
-            :rules="[{ required: true, message: '请选择所属县区!' }]"
-          >
-            <a-select
-              ref="select"
-              v-model:value="dataModel.regionCode"
-              :options="regionList"
-              :field-names="{ label: 'name', value: 'code' }"
-              @change="regionChange"
-            >
-            </a-select>
-          </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item
-            label="所属街道"
-            :label-col="{ span: 6 }"
-            name="streetCode"
-            :rules="[{ required: true, message: '请选择所属街道!' }]"
+            label="企业状态"
+            :label-col="{ span: 7 }"
+            name="recordStatus"
+            :rules="[{ required: true, message: '请选择企业状态!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.streetCode"
-              :options="streetList"
-              :field-names="{ label: 'name', value: 'code' }"
+              v-model:value="dataModel.recordStatus"
+              :options="companyStatusList"
+              :field-names="{ label: 'name', value: 'value' }"
             >
             </a-select>
           </a-form-item>
-        </a-col>
-        <a-col :span="8">
-          <a-form-item
-            label="企业办公地址"
-            :label-col="{ span: 6 }"
-            name="address"
-            :rules="[{ required: true, message: '请输入企业办公地址!' }]"
-          >
-            <a-input v-model:value="dataModel.address" placeholder=""/>
-          </a-form-item>
-        </a-col>
-      </a-row>
-
 
-      <a-row :gutter="24">
-        <a-col :span="8">
-          <a-form-item
-            label="用工情况"
-            :label-col="{ span: 6 }"
-            name="workSituation"
-            :rules="[{ required: true, message: '请输入用工情况!' }]"
-          >
-            <a-input v-model:value="dataModel.workSituation" placeholder=""/>
-          </a-form-item>
         </a-col>
         <a-col :span="8">
           <a-form-item
-            label="企业规模"
-            :label-col="{ span: 6 }"
-            name="companyModel"
-            :rules="[{ required: true, message: '请输入企业规模!' }]"
+            label="营业执照有效期"
+            :label-col="{ span: 8 }"
+            name="validTime"
+            :rules="[{ required: true, message: '请输入营业执照有效期!' }]"
           >
-            <a-input v-model:value="dataModel.companyModel" placeholder=""/>
+            <label v-if="!showPicker" style="float:left;line-height: 30px;height: 30px;font-size: 16px;">{{dataModel.validTime}}</label>
+            <div   v-if="showPicker" style="width:65%;float:left;">
+              <a-date-picker
+                v-model:value="dataModel.validTime"
+                picker="date"
+                value-format="YYYY-MM-DD"
+              />
+            </div>
+            <div  v-if="!showPicker"  style="width:34%;margin-left:1%;color:blue;float:left;line-height: 30px;height: 30px;font-size: 16px;"
+                  v-on:click="showDataPicker">选择有效期</div>
           </a-form-item>
         </a-col>
-        <a-col :span="8">
+        <a-col :span="9">
           <a-form-item
             label="企业分类"
-            :label-col="{ span: 6 }"
+            :label-col="{ span: 9 }"
             name="companyType"
             :rules="[{ required: false, message: '请选择企业分类!' }]"
           >
@@ -127,30 +89,32 @@
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="8">
+        <a-col :span="7">
           <a-form-item
-            label="企业联系人"
-            :label-col="{ span: 6 }"
+            label="联系人姓名"
+            :label-col="{ span: 7 }"
             name="userName"
             :rules="[{ required: true, message: '请输入企业联系人!' }]"
           >
             <a-input v-model:value="dataModel.userName" placeholder=""/>
           </a-form-item>
+
         </a-col>
         <a-col :span="8">
           <a-form-item
-            label="企业联系电话"
-            :label-col="{ span: 6 }"
+            label="联系电话"
+            :label-col="{ span: 8 }"
             name="userMobile"
             :rules="[{ required: true, message: '请输入企业联系电话!' }]"
           >
             <a-input v-model:value="dataModel.userMobile" placeholder=""/>
           </a-form-item>
+
         </a-col>
-        <a-col :span="8">
+        <a-col :span="9">
           <a-form-item
-            label="企业邮箱"
-            :label-col="{ span: 6 }"
+            label="联系邮箱"
+            :label-col="{ span: 9 }"
             name="companyEmail"
             :rules="[{ required: true, message: '请选择企业邮箱!' }]"
           >
@@ -159,58 +123,105 @@
         </a-col>
       </a-row>
       <a-row :gutter="24">
-        <a-col :span="8">
+        <a-col :span="7">
           <a-form-item
-            label="法定代表人"
-            :label-col="{ span: 6 }"
-            name="frName"
-            :rules="[{ required: true, message: '请选择法定代表人!' }]"
+            label="所属驿站"
+            :label-col="{ span: 7 }"
+            name="siteID"
+            :rules="[{ required: true, message: '请选择所属驿站!' }]"
           >
-            <a-input v-model:value="dataModel.frName" placeholder=""/>
+            <a-select
+              ref="select"
+              v-model:value="dataModel.siteID"
+              v-on:change="siteChange"
+              :options="siteList"
+              :field-names="{ label: 'siteName', value: 'siteID' }"
+            >
+            </a-select>
           </a-form-item>
+
         </a-col>
         <a-col :span="8">
           <a-form-item
-            label="营业执照有效期"
-            :label-col="{ span: 6 }"
-            name="validTime"
-            :rules="[{ required: true, message: '请输入营业执照有效期!' }]"
+            label="所属县区"
+            :label-col="{ span: 8 }"
+            name="regionCode"
+            :rules="[{ required: true, message: '请选择所属县区!' }]"
           >
-            <a-date-picker
-              v-model:value="dataModel.validTime"
-              picker="date"
-              value-format="YYYY-MM-DD"
-            />
+            <a-select
+              ref="select"
+              v-model:value="dataModel.regionCode"
+              :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }"
+              @change="regionChange"
+            >
+            </a-select>
           </a-form-item>
+
         </a-col>
-        <a-col :span="8">
+        <a-col :span="9">
           <a-form-item
-            label="企业状态"
-            :label-col="{ span: 6 }"
-            name="recordStatus"
-            :rules="[{ required: true, message: '请选择企业状态!' }]"
+            label="所属街道"
+            :label-col="{ span: 9 }"
+            name="streetCode"
+            :rules="[{ required: true, message: '请选择所属街道!' }]"
           >
             <a-select
               ref="select"
-              v-model:value="dataModel.recordStatus"
-              :options="companyStatuslist"
-              :field-names="{ label: 'name', value: 'value' }"
+              v-model:value="dataModel.streetCode"
+              :options="streetList"
+              :field-names="{ label: 'name', value: 'code' }"
             >
             </a-select>
           </a-form-item>
+
         </a-col>
       </a-row>
       <a-row :gutter="24">
+        <a-col :span="7">
+          <a-form-item
+            label="企业办公地址"
+            :label-col="{ span: 7 }"
+            name="address"
+            :rules="[{ required: true, message: '请输入企业办公地址!' }]"
+          >
+            <a-textarea v-model:value="dataModel.address" placeholder="" :rows="4"/>
+          </a-form-item>
+        </a-col>
         <a-col :span="8">
           <a-form-item
-            label="企业参保人数"
-            :label-col="{ span: 6 }"
+            label="企业规模"
+            :label-col="{ span: 8 }"
+            name="companyModel"
+            :rules="[{ required: false, message: '请选择企业规模!' }]"
+          >
+            <a-select
+              ref="select"
+              v-model:value="dataModel.companyModel"
+              :options="companyModelList"
+              :field-names="{ label: 'name', value: 'value' }"
+            >
+            </a-select>
+          </a-form-item>
+          <a-form-item
+            label="参保人数(人)"
+            :label-col="{ span: 8 }"
             name="insuredCount"
-            :rules="[{ required: true, message: '请输入企业参保人数!' }]"
+            :rules="[{ required: true, message: '请输入参保人数!' }]"
           >
             <a-input v-model:value="dataModel.insuredCount" type="number" min="1" placeholder=""/>
           </a-form-item>
         </a-col>
+        <a-col :span="9">
+          <a-form-item
+            label="用工情况(人)"
+            :label-col="{ span: 9 }"
+            name="workSituation"
+            :rules="[{ required: true, message: '请输入用工人数!' }]"
+          >
+            <a-input v-model:value="dataModel.workSituation" placeholder=""/>
+          </a-form-item>
+        </a-col>
       </a-row>
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
@@ -242,7 +253,9 @@ import type {SelectProps} from 'ant-design-vue';
 import {useTabsViewStore} from '@/store/modules/tabsView';
 import BUploadFile from '@/components/file/uploadFile.vue';
 import {get} from "@/api/common";
-import {save, getCompanyById} from '@/api/companyService/company'
+import {save, getCompanyById} from '@/api/companyService/company';
+import {getSiteByID} from '@/api/baseSettings/siteInfo';
+import {getSysDictionaryList} from '@/api/system/dictionary';
 
 interface FormState {
   dataModel: any;
@@ -256,14 +269,19 @@ export default defineComponent(
       const router = useRouter();
       const siteList = ref<SelectProps['options']>();
       const tabsViewStore = useTabsViewStore();
-
-      const companyStatuslist = ref<SelectProps['options']>([
+      const showPicker = ref<boolean>(false);
+      const showDataPicker = ()=>{
+        formState.dataModel.validTime ='2023-01-01';
+        showPicker.value = true;
+      }
+      const companyStatusList = ref<SelectProps['options']>([
         {value: 1, name: '在营'},
         {value: 0, name: '关闭'},
       ]);
       const regionList = ref<SelectProps['options']>();
       const streetList = ref<SelectProps['options']>();
-      const fullpath = router.currentRoute.value.fullPath;
+      const companyModelList = ref<SelectProps['options']>();
+      const fullPath = router.currentRoute.value.fullPath;
 
       const onClose = () => {
         tabsViewStore.closeCurrentTabByPath('/companyService/enterprise/add');
@@ -279,6 +297,21 @@ export default defineComponent(
         siteList.value = data;
       })
 
+      const getCompanyModelList = async function(){
+        const data :any = await getSysDictionaryList("CompanyModel");
+        companyModelList.value = data;
+        console.log("companyModelList",companyModelList.value );
+      }
+
+      const siteChange = async function(){
+        const curSiteData :any = await getSiteByID(formState.dataModel.siteID);
+        formState.dataModel.regionCode = curSiteData.regionCode;
+        get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
+          streetList.value = data;
+          formState.dataModel.streetCode = curSiteData.streetCode;
+        })
+      }
+
       const changeCity = () => {
         if (formState.dataModel.regionCode) {
           get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
@@ -296,15 +329,17 @@ export default defineComponent(
       const onFinish = () => {
         save(formState.dataModel).then(result => {
           if (result) {
-            tabsViewStore.closeCurrentTab(fullpath);
+            tabsViewStore.closeCurrentTab(fullPath);
             tabsViewStore.addTabByPath('/companyService/enterprise/index', {reload: 1});
           }
         })
       }
 
       const loadData = (id: any) => {
+        getCompanyModelList();
         getCompanyById(id).then(result => {
           formState.dataModel = result;
+          showPicker.value = formState.dataModel.validTime !='长期';
           changeCity();
         })
       };
@@ -314,10 +349,14 @@ export default defineComponent(
         loadData,
         onClose,
         onFinish,
+        siteChange,
+        showPicker,
         siteList,
         regionList,
         streetList,
-        companyStatuslist,
+        companyModelList,
+        companyStatusList,
+        showDataPicker,
         changeCity,
         regionChange,
       }

vue/src/views/companyService/company/index.vue

@@ -118,7 +118,7 @@ import type {FormInstance} from 'ant-design-vue';
 import type {TableColumnsType, TableProps} from 'ant-design-vue';
 import {getList, del} from '@/api/companyService/company';
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
-  import BImportExcel from '@/components/basic/excel/importExcel/importExcel.vue';
+import BImportExcel from '@/components/basic/excel/importExcel/importExcel.vue';
 import {getPaginationTotalTitle} from "@/utils/common";
 import {Modal, SelectProps} from "ant-design-vue";
 import dayjs from "dayjs";
@@ -148,24 +148,24 @@ export default defineComponent({
     const expand = ref(false);
     const importOptions = ref<ImportProps>({
       title: '导入',
-      url: 'companyService/company/importCompany  ',
+      url: 'companyService/company/importCompany',
       columns: [
         {cnName: '企业名称', enName: 'companyName', width: 100},
-        {cnName: '统一信用代码', enName: 'companyCode', width: 100},
+        {cnName: '统一社会信用代码', enName: 'companyCode', width: 100},
+        {cnName: '法定代表人(负责人)', enName: 'frName', width: 100},
+        {cnName: '企业状态', enName: 'recordStatusName', width: 100},
+        {cnName: '营业执照有效期', enName: 'validTime', width: 100},
+        {cnName: '企业分类', enName: 'companyType', width: 100},
+        {cnName: '联系人姓名', enName: 'userName', width: 100},
+        {cnName: '联系电话', enName: 'userMobile', width: 100},
+        {cnName: '联系邮箱', enName: 'companyEmail', width: 100},
         {cnName: '所属驿站', enName: 'SiteName', width: 100},
         {cnName: '所属县区', enName: 'regionName', width: 100},
         {cnName: '所属街道', enName: 'streetName', width: 100},
         {cnName: '企业办公地址', enName: 'address', width: 100},
-        {cnName: '用工情况', enName: 'workSituation', width: 100},
         {cnName: '企业规模', enName: 'companyModel', width: 100},
-        {cnName: '企业分类', enName: 'companyType', width: 100},
-        {cnName: '企业联系人', enName: 'userName', width: 100},
-        {cnName: '企业联系电话', enName: 'userMobile', width: 100},
-        {cnName: '企业邮箱', enName: 'companyEmail', width: 100},
-        {cnName: '法定代表人', enName: 'frName', width: 100},
-        {cnName: '企业参保人数', enName: 'insuredCount', width: 100},
-        {cnName: '企业状态', enName: 'recordStatusName', width: 100},
-        {cnName: '营业执照有效期', enName: 'validTime', width: 100},
+        {cnName: '用工情况(人)', enName: 'workSituation', width: 100},
+        {cnName: '参保人数(人)', enName: 'insuredCount', width: 100},
         {cnName: '经营范围', enName: 'businScope', width: 100},
         {cnName: '企业简介', enName: 'companyDesc', width: 100}
       ],