15
0

2 Ревизии a3730f03af ... 58b13e3ce3

Автор SHA1 Съобщение Дата
  Liudijing 58b13e3ce3 Merge remote-tracking branch 'origin/master' преди 11 месеца
  Liudijing c926971f7c 企业服务-增加参保人数数据字段 преди 11 месеца

+ 10 - 0
src/main/java/com/hz/employmentsite/model/PcCompany.java

@@ -43,6 +43,8 @@ public class PcCompany {
 
     private Date modifyTime;
 
+    private Integer insuredCount;
+
     public String getCompanyID() {
         return companyID;
     }
@@ -202,4 +204,12 @@ public class PcCompany {
     public void setModifyTime(Date modifyTime) {
         this.modifyTime = modifyTime;
     }
+
+    public Integer getInsuredCount() {
+        return insuredCount;
+    }
+
+    public void setInsuredCount(Integer insuredCount) {
+        this.insuredCount = insuredCount;
+    }
 }

+ 60 - 0
src/main/java/com/hz/employmentsite/model/PcCompanyExample.java

@@ -1464,6 +1464,66 @@ 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 {

+ 10 - 0
src/main/java/com/hz/employmentsite/model/PcJobuser.java

@@ -65,6 +65,8 @@ public class PcJobuser {
 
     private Integer keyPersonTypeID;
 
+    private String personalSkills;
+
     private String createUserID;
 
     private Date createTime;
@@ -321,6 +323,14 @@ public class PcJobuser {
         this.keyPersonTypeID = keyPersonTypeID;
     }
 
+    public String getPersonalSkills() {
+        return personalSkills;
+    }
+
+    public void setPersonalSkills(String personalSkills) {
+        this.personalSkills = personalSkills == null ? null : personalSkills.trim();
+    }
+
     public String getCreateUserID() {
         return createUserID;
     }

+ 70 - 0
src/main/java/com/hz/employmentsite/model/PcJobuserExample.java

@@ -2175,6 +2175,76 @@ public class PcJobuserExample {
             return (Criteria) this;
         }
 
+        public Criteria andPersonalSkillsIsNull() {
+            addCriterion("PersonalSkills is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsIsNotNull() {
+            addCriterion("PersonalSkills is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsEqualTo(String value) {
+            addCriterion("PersonalSkills =", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsNotEqualTo(String value) {
+            addCriterion("PersonalSkills <>", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsGreaterThan(String value) {
+            addCriterion("PersonalSkills >", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsGreaterThanOrEqualTo(String value) {
+            addCriterion("PersonalSkills >=", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsLessThan(String value) {
+            addCriterion("PersonalSkills <", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsLessThanOrEqualTo(String value) {
+            addCriterion("PersonalSkills <=", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsLike(String value) {
+            addCriterion("PersonalSkills like", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsNotLike(String value) {
+            addCriterion("PersonalSkills not like", value, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsIn(List<String> values) {
+            addCriterion("PersonalSkills in", values, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsNotIn(List<String> values) {
+            addCriterion("PersonalSkills not in", values, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsBetween(String value1, String value2) {
+            addCriterion("PersonalSkills between", value1, value2, "personalSkills");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonalSkillsNotBetween(String value1, String value2) {
+            addCriterion("PersonalSkills not between", value1, value2, "personalSkills");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateUserIDIsNull() {
             addCriterion("CreateUserID is null");
             return (Criteria) this;

+ 2 - 0
src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -78,6 +78,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setRecordStatus(data.getRecordStatus());
             dbData.setBusinScope(data.getBusinScope());
             dbData.setCompanyDesc(data.getCompanyDesc());
+            dbData.setInsuredCount(data.getInsuredCount());
             dbData.setCreateTime(new Date());
             dbData.setCreateUserID(userId);
             result = pcCompanyMapper.insert(dbData);
@@ -100,6 +101,7 @@ public class CompanyServiceImpl implements CompanyService {
             dbData.setRecordStatus(data.getRecordStatus());
             dbData.setBusinScope(data.getBusinScope());
             dbData.setCompanyDesc(data.getCompanyDesc());
+            dbData.setInsuredCount(data.getInsuredCount());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
             result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);

+ 2 - 0
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobuserServiceImpl.java

@@ -140,6 +140,7 @@ public class JobuserServiceImpl implements JobuserService {
             dbData.setEmail(data.getEmail());
             dbData.setHobby(data.getHobby());
             dbData.setKeyPersonTypeID(data.getKeyPersonTypeID());
+            dbData.setPersonalSkills(data.getPersonalSkills());
             dbData.setCreateTime(new Date());
             dbData.setCreateUserID(userId);
             result = pcJobuserMapper.insert(dbData);
@@ -176,6 +177,7 @@ public class JobuserServiceImpl implements JobuserService {
             dbData.setEmail(data.getEmail());
             dbData.setHobby(data.getHobby());
             dbData.setKeyPersonTypeID(data.getKeyPersonTypeID());
+            dbData.setPersonalSkills(data.getPersonalSkills());
             dbData.setModifyTime(new Date());
             dbData.setModifyUserID(userId);
             result = pcJobuserMapper.updateByPrimaryKeySelective(dbData);

+ 2 - 0
src/main/java/com/hz/employmentsite/vo/companyService/CompanyVo.java

@@ -64,4 +64,6 @@ public class CompanyVo {
 
     public String errorMessage;
 
+    public Integer insuredCount;
+
 }

+ 24 - 7
src/main/resources/mapping/PcCompanyMapper.xml

@@ -22,6 +22,7 @@
     <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" />
@@ -88,7 +89,7 @@
   <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
+    ValidTime, RecordStatus, CreateUserID, CreateTime, ModifyUserID, ModifyTime, InsuredCount
   </sql>
   <sql id="Blob_Column_List">
     BusinScope, CompanyDesc
@@ -148,16 +149,16 @@
       Address, UserName, UserMobile, 
       CompanyEmail, FrName, ValidTime, 
       RecordStatus, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime, BusinScope, 
-      CompanyDesc)
+      ModifyUserID, ModifyTime, InsuredCount, 
+      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}, #{businScope,jdbcType=LONGVARCHAR}, 
-      #{companyDesc,jdbcType=LONGVARCHAR})
+      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}, #{insuredCount,jdbcType=INTEGER}, 
+      #{businScope,jdbcType=LONGVARCHAR}, #{companyDesc,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcCompanyWithBLOBs">
     insert into pc_company
@@ -222,6 +223,9 @@
       <if test="modifyTime != null">
         ModifyTime,
       </if>
+      <if test="insuredCount != null">
+        InsuredCount,
+      </if>
       <if test="businScope != null">
         BusinScope,
       </if>
@@ -290,6 +294,9 @@
       <if test="modifyTime != null">
         #{modifyTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="insuredCount != null">
+        #{insuredCount,jdbcType=INTEGER},
+      </if>
       <if test="businScope != null">
         #{businScope,jdbcType=LONGVARCHAR},
       </if>
@@ -367,6 +374,9 @@
       <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>
@@ -400,6 +410,7 @@
       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">
@@ -427,7 +438,8 @@
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{row.modifyTime,jdbcType=TIMESTAMP},
+      InsuredCount = #{row.insuredCount,jdbcType=INTEGER}
     <if test="example != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -492,6 +504,9 @@
       <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>
@@ -522,6 +537,7 @@
       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,7 +562,8 @@
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},
-      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP}
+      ModifyTime = #{modifyTime,jdbcType=TIMESTAMP},
+      InsuredCount = #{insuredCount,jdbcType=INTEGER}
     where CompanyID = #{companyID,jdbcType=VARCHAR}
   </update>
 </mapper>

+ 22 - 5
src/main/resources/mapping/PcJobuserMapper.xml

@@ -33,6 +33,7 @@
     <result column="Hobby" jdbcType="VARCHAR" property="hobby" />
     <result column="JobStatusID" jdbcType="INTEGER" property="jobStatusID" />
     <result column="KeyPersonTypeID" jdbcType="INTEGER" property="keyPersonTypeID" />
+    <result column="PersonalSkills" jdbcType="VARCHAR" property="personalSkills" />
     <result column="CreateUserID" jdbcType="VARCHAR" property="createUserID" />
     <result column="CreateTime" jdbcType="TIMESTAMP" property="createTime" />
     <result column="ModifyUserID" jdbcType="VARCHAR" property="modifyUserID" />
@@ -101,7 +102,7 @@
     Birthplace, BirthDay, FamilyNatureID, CultureRank, HealthID, BloodTypeID, Height, 
     Vision, Weight, MaritalStatusID, ProvinceCode, RegionCode, StreetCode, UserName, 
     UserMobile, Address, FamilyAddress, PostalCode, Email, Hobby, JobStatusID, KeyPersonTypeID, 
-    CreateUserID, CreateTime, ModifyUserID, ModifyTime
+    PersonalSkills, CreateUserID, CreateTime, ModifyUserID, ModifyTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcJobuserExample" resultMap="BaseResultMap">
     select
@@ -144,8 +145,9 @@
       StreetCode, UserName, UserMobile, 
       Address, FamilyAddress, PostalCode, 
       Email, Hobby, JobStatusID, 
-      KeyPersonTypeID, CreateUserID, CreateTime, 
-      ModifyUserID, ModifyTime)
+      KeyPersonTypeID, PersonalSkills, CreateUserID, 
+      CreateTime, ModifyUserID, ModifyTime
+      )
     values (#{jobuserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{identityNumber,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{pyName,jdbcType=VARCHAR}, #{engName,jdbcType=VARCHAR}, 
       #{sex,jdbcType=INTEGER}, #{nation,jdbcType=VARCHAR}, #{politicsStatusID,jdbcType=INTEGER}, 
@@ -156,8 +158,9 @@
       #{streetCode,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{userMobile,jdbcType=VARCHAR}, 
       #{address,jdbcType=VARCHAR}, #{familyAddress,jdbcType=VARCHAR}, #{postalCode,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{hobby,jdbcType=VARCHAR}, #{jobStatusID,jdbcType=INTEGER}, 
-      #{keyPersonTypeID,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP})
+      #{keyPersonTypeID,jdbcType=INTEGER}, #{personalSkills,jdbcType=VARCHAR}, #{createUserID,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{modifyUserID,jdbcType=VARCHAR}, #{modifyTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcJobuser">
     insert into pc_jobuser
@@ -255,6 +258,9 @@
       <if test="keyPersonTypeID != null">
         KeyPersonTypeID,
       </if>
+      <if test="personalSkills != null">
+        PersonalSkills,
+      </if>
       <if test="createUserID != null">
         CreateUserID,
       </if>
@@ -362,6 +368,9 @@
       <if test="keyPersonTypeID != null">
         #{keyPersonTypeID,jdbcType=INTEGER},
       </if>
+      <if test="personalSkills != null">
+        #{personalSkills,jdbcType=VARCHAR},
+      </if>
       <if test="createUserID != null">
         #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -478,6 +487,9 @@
       <if test="row.keyPersonTypeID != null">
         KeyPersonTypeID = #{row.keyPersonTypeID,jdbcType=INTEGER},
       </if>
+      <if test="row.personalSkills != null">
+        PersonalSkills = #{row.personalSkills,jdbcType=VARCHAR},
+      </if>
       <if test="row.createUserID != null">
         CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       </if>
@@ -528,6 +540,7 @@
       Hobby = #{row.hobby,jdbcType=VARCHAR},
       JobStatusID = #{row.jobStatusID,jdbcType=INTEGER},
       KeyPersonTypeID = #{row.keyPersonTypeID,jdbcType=INTEGER},
+      PersonalSkills = #{row.personalSkills,jdbcType=VARCHAR},
       CreateUserID = #{row.createUserID,jdbcType=VARCHAR},
       CreateTime = #{row.createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{row.modifyUserID,jdbcType=VARCHAR},
@@ -629,6 +642,9 @@
       <if test="keyPersonTypeID != null">
         KeyPersonTypeID = #{keyPersonTypeID,jdbcType=INTEGER},
       </if>
+      <if test="personalSkills != null">
+        PersonalSkills = #{personalSkills,jdbcType=VARCHAR},
+      </if>
       <if test="createUserID != null">
         CreateUserID = #{createUserID,jdbcType=VARCHAR},
       </if>
@@ -676,6 +692,7 @@
       Hobby = #{hobby,jdbcType=VARCHAR},
       JobStatusID = #{jobStatusID,jdbcType=INTEGER},
       KeyPersonTypeID = #{keyPersonTypeID,jdbcType=INTEGER},
+      PersonalSkills = #{personalSkills,jdbcType=VARCHAR},
       CreateUserID = #{createUserID,jdbcType=VARCHAR},
       CreateTime = #{createTime,jdbcType=TIMESTAMP},
       ModifyUserID = #{modifyUserID,jdbcType=VARCHAR},

+ 13 - 2
vue/src/views/companyService/company/edit.vue

@@ -200,7 +200,18 @@
           </a-form-item>
         </a-col>
       </a-row>
-
+      <a-row :gutter="24">
+        <a-col :span="8">
+          <a-form-item
+            label="企业参保人数"
+            :label-col="{ span: 6 }"
+            name="insuredCount"
+            :rules="[{ required: true, message: '请输入企业参保人数!' }]"
+          >
+            <a-input v-model:value="dataModel.insuredCount" type="number" min="1" placeholder=""/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-divider orientation="left">其他信息</a-divider>
       <a-row>
         <a-col class="table-bottom-a1">
@@ -269,7 +280,7 @@ export default defineComponent(
       })
 
       const changeCity = () => {
-        if(formState.dataModel.regionCode){
+        if (formState.dataModel.regionCode) {
           get('system/area/getAreaList', {code: formState.dataModel.regionCode}).then(data => {
             streetList.value = data;
             formState.dataModel.streetCode = "";

+ 1 - 1
vue/src/views/companyService/company/index.vue

@@ -172,7 +172,7 @@ export default defineComponent({
           return item.record.recordStatus == 1 ? "在营" : "关闭";
         }
       },
-      {title: '参保人数', dataIndex: 'peopleCount', key: 'peopleCount', align: "center"},
+      {title: '参保人数', dataIndex: 'insuredCount', key: 'insuredCount', align: "center"},
       {title: '企业规模', dataIndex: 'companyModel', key: 'companyModel', align: "center"},
       {title: '当前岗位数量', dataIndex: 'postCount', key: 'postCount', align: "center"},
       {title: '录入人', dataIndex: 'createUserName', key: 'createUserName', align: "center"},

+ 8 - 0
vue/src/views/jobUserManager/jobuser/edit.vue

@@ -486,6 +486,14 @@
           </a-table>
         </a-col>
       </a-row>
+      <a-divider orientation="left">其他</a-divider>
+      <a-row>
+        <a-col class="table-bottom-a1">
+          <a-form-item :label-col="{span:8}" label="" name="personalSkills">
+            <a-textarea v-model:value="dataModel.personalSkills" placeholder="个人技能" :rows="4"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-form-item class="buttom-btns">
         <a-button @click="onClose">取消</a-button>
         <a-button type="primary" html-type="submit">提交</a-button>

+ 1 - 1
vue/src/views/jobUserManager/jobuser/index.vue

@@ -139,6 +139,7 @@ import {message, Modal} from "ant-design-vue";
 import {DownOutlined, ExclamationCircleOutlined, UpOutlined} from "@ant-design/icons-vue";
 import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import BImportExcel from "@/components/basic/excel/importExcel/importExcel.vue";
+// import type {ImportProps} from "@/components/basic/excel/importExcel/ImportProps";
 
 export default defineComponent({
   name: 'JobUserList',
@@ -336,7 +337,6 @@ export default defineComponent({
       getEducationList,
       getEmphasisTypeList,
       calculateAge
-
     };
   },
   created() {