fix: 月薪显示调整

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

@@ -15,7 +15,12 @@
       <a-descriptions-item label="企业成立日期">
         {{ companyInfo.establishmentTime ? dayjs(companyInfo.establishmentTime).format('YYYY-MM-DD') : '' }}
       </a-descriptions-item>
-      <a-descriptions-item label="注册资本">{{ companyInfo.registeredCapital }}万元</a-descriptions-item>
+      <a-descriptions-item label="注册资本">
+        {{ companyInfo.registeredCapital }}
+        <span v-if="companyInfo.registeredCapital != null">
+          万元
+        </span>
+      </a-descriptions-item>
       <a-descriptions-item label="注册地行政区划">{{ companyInfo.signInPoliticalAreaName }}</a-descriptions-item>
       <a-descriptions-item label="所属行业">{{ companyInfo.industryName }}</a-descriptions-item>
       <a-descriptions-item label="所属产业分类">{{ companyInfo.estateCategoryName }}</a-descriptions-item>

vue/src/views/companyService/post/detail.vue

@@ -26,16 +26,12 @@
     <a-divider orientation="left">其他信息</a-divider>
     <a-descriptions bordered>
       <a-descriptions-item label="岗位月薪（元）">
-        {{ postInfo.minSalary }}
-        至
-        {{ postInfo.maxSalary }}
+        {{ showSalary(postInfo.minSalary, postInfo.maxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="是否有试用期">{{ postInfo.isTrail ? '是' : '否' }}</a-descriptions-item>
       <a-descriptions-item label="试用期（月）">{{ postInfo.trailMonths }}</a-descriptions-item>
       <a-descriptions-item label="试用期月薪（元）">
-        {{ postInfo.trailMinSalary }}
-        至
-        {{ postInfo.trailMaxSalary }}
+        {{ showSalary(postInfo.trailMinSalary, postInfo.trailMaxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="工作年限要求">{{ workYear }}</a-descriptions-item>
       <a-descriptions-item label="学历要求">{{ postInfo.cultureLevelName }}</a-descriptions-item>
@@ -106,6 +102,22 @@ function loadData(id: any) {
   })
 }
 
+const showSalary = (minSalary: any, maxSalary: any) => {
+  if (minSalary != null) {
+    if (maxSalary != null) {
+      return minSalary.toString() + "-" + maxSalary.toString();
+    } else {
+      return "≥" + minSalary.toString();
+    }
+  } else {
+    if (maxSalary != null) {
+      return "≤" + maxSalary.toString();
+    } else {
+      return "";
+    }
+  }
+}
+
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;

vue/src/views/companyService/post/edit.vue

@@ -521,13 +521,6 @@ export default defineComponent(
 
       // 月薪变更
       function salaryChange() {
-        if (!postCompany.dataModel.minSalary) {
-          postCompany.dataModel.minSalary = 0;
-        }
-        if (!postCompany.dataModel.maxSalary) {
-          postCompany.dataModel.maxSalary = 0;
-        }
-
         if (postCompany.dataModel.maxSalary < postCompany.dataModel.minSalary) {
           postCompany.dataModel.maxSalary = postCompany.dataModel.minSalary;
         }
@@ -535,13 +528,6 @@ export default defineComponent(
 
       // 试用期月薪变更
       function trailSalaryChange() {
-        if (!postCompany.dataModel.trailMinSalary) {
-          postCompany.dataModel.trailMinSalary = 0;
-        }
-        if (!postCompany.dataModel.trailMaxSalary) {
-          postCompany.dataModel.trailMaxSalary = 0;
-        }
-
         if (postCompany.dataModel.trailMaxSalary < postCompany.dataModel.trailMinSalary) {
           postCompany.dataModel.trailMaxSalary = postCompany.dataModel.trailMinSalary;
         }

vue/src/views/jobUserManager/jobhunt/detail.vue

@@ -4,7 +4,8 @@
     <a-descriptions bordered>
       <a-descriptions-item label="姓名">{{ jobHuntInfo.jobUserName }}</a-descriptions-item>
       <a-descriptions-item label="人才类型">{{ jobHuntInfo.jobUserTypeStr }}</a-descriptions-item>
-      <a-descriptions-item label="月薪要求">{{ jobHuntInfo.minSalary }} 至 {{ jobHuntInfo.maxSalary }}
+      <a-descriptions-item label="月薪要求">
+        {{ showSalary(jobHuntInfo.minSalary, jobHuntInfo.maxSalary) }}
       </a-descriptions-item>
       <a-descriptions-item label="工作年限">{{ jobHuntInfo.workYear }}</a-descriptions-item>
       <a-descriptions-item label="求职类型">{{ jobHuntInfo.jobHuntTypeStr }}</a-descriptions-item>
@@ -57,6 +58,22 @@ function loadData(id: string) {
   });
 }
 
+const showSalary = (minSalary: any, maxSalary: any) => {
+  if (minSalary != null) {
+    if (maxSalary != null) {
+      return minSalary.toString() + "-" + maxSalary.toString();
+    } else {
+      return "≥" + minSalary.toString();
+    }
+  } else {
+    if (maxSalary != null) {
+      return "≤" + maxSalary.toString();
+    } else {
+      return "";
+    }
+  }
+}
+
 // 页面初始化
 onMounted(() => {
   const id = history.state.params?.id;

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -263,13 +263,6 @@ export default defineComponent({
     };
 
     function salaryChange() {
-      if (!formData.dataModel.minSalary) {
-        formData.dataModel.minSalary = 0;
-      }
-      if (!formData.dataModel.maxSalary) {
-        formData.dataModel.maxSalary = 0;
-      }
-
       if (formData.dataModel.maxSalary < formData.dataModel.minSalary) {
         formData.dataModel.maxSalary = formData.dataModel.minSalary
       }