Merge remote-tracking branch 'origin/master'

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

@@ -136,7 +136,8 @@
             :label-col="{ span: 8 }"
             name="longitude"
           >
-            <a-input v-model:value="dataModel.longitude" placeholder="" :rows="4"/>
+            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.longitude" placeholder=""
+                            :rows="4"/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -145,7 +146,7 @@
             :label-col="{ span: 8 }"
             name="latitude"
           >
-            <a-input v-model:value="dataModel.latitude" placeholder=""/>
+            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.latitude" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -165,7 +166,7 @@
             :label-col="{ span: 8 }"
             name="registeredCapital"
           >
-            <a-input-number style="width: 100%" v-model:value="dataModel.registeredCapital" addon-after="万元"
+            <a-input-number :min="0" style="width: 100%" v-model:value="dataModel.registeredCapital" addon-after="万元"
                             :controls="false"></a-input-number>
           </a-form-item>
         </a-col>
@@ -364,7 +365,9 @@
             name="workSituation"
             :rules="[{ required: false, message: '请输入用工人数!' }]"
           >
-            <a-input v-model:value="dataModel.workSituation" placeholder=""/>
+            <a-input-number :min="1" style="width: 100%" :controls="false" v-model:value="dataModel.workSituation"
+                            placeholder=""
+                            @blur="workSituationChange"/>
           </a-form-item>
         </a-col>
         <a-col :span="8">
@@ -375,7 +378,7 @@
             :rules="[{ required: false, message: '请输入参保人数!' }]"
           >
             <a-input-number :min="0" style="width: 100%" :controls="false" v-model:value="dataModel.insuredCount"
-                            placeholder=""/>
+                            placeholder="" @blur="insuredCountChange"/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -731,6 +734,18 @@ export default defineComponent(
         }
       }, 500)
 
+      function workSituationChange() {
+        if (formState.dataModel.workSituation) {
+          formState.dataModel.workSituation = Math.floor(formState.dataModel.workSituation)
+        }
+      }
+
+      function insuredCountChange() {
+        if (formState.dataModel.insuredCount) {
+          formState.dataModel.insuredCount = Math.floor(formState.dataModel.insuredCount)
+        }
+      }
+
       return {
         ...toRefs(formState),
         loadData,
@@ -762,7 +777,9 @@ export default defineComponent(
         normalBtnLoading,
         likeFindFirm,
         firmNameFetching,
-        firmList
+        firmList,
+        workSituationChange,
+        insuredCountChange
       }
     },
     mounted() {

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

@@ -38,7 +38,7 @@
           <a-form-item label="招聘人数" :label-col="{ span: 9}"
                        name="recruitCount" :rules="[{ required: true, message: '请输入招聘人数!' }]" >
             <a-input-number style="width: 100%" :controls="false" :min="1" v-model:value="dataModel.recruitCount"
-                            placeholder=""/>
+                            placeholder="" @blur="recruitCountChange"/>
           </a-form-item>
         </a-col>
         <a-col flex="250px">
@@ -570,6 +570,13 @@ export default defineComponent(
         postCompany.dataModel.trailMonths = Math.floor(postCompany.dataModel.trailMonths);
       }
 
+      // 招聘人数变更
+      function recruitCountChange() {
+        if (postCompany.dataModel.recruitCount) {
+          postCompany.dataModel.recruitCount = Math.floor(postCompany.dataModel.recruitCount);
+        }
+      }
+
       return {
         ...toRefs(postCompany),
         loadData,
@@ -596,7 +603,8 @@ export default defineComponent(
         salaryChange,
         trailSalaryChange,
         isTrailChange,
-        trailMonthsChange
+        trailMonthsChange,
+        recruitCountChange
       }
     },
     created() {