Merge remote-tracking branch 'origin/master'

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

@@ -29,7 +29,8 @@
         <a-col flex="340px">
           <a-form-item label="招聘人数" :label-col="{ span: 8}"
                        name="recruitCount" :rules="[{ required: true, message: '请输入招聘人数!' }]" >
-            <a-input v-model:value="dataModel.recruitCount" placeholder=""/>
+            <a-input-number style="width: 100%" :controls="false" :min="1" v-model:value="dataModel.recruitCount"
+                            placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col flex="280px">
@@ -107,7 +108,8 @@
             :label-col="{span:9}"
             :rules="[{ required: false, message: '请输入金额!' }]"
           >
-            <a-input v-model:value="dataModel.minSalary" placeholder="请输入金额"/>
+            <a-input-number style="width: 100%" :controls="false" :min="0" v-model:value="dataModel.minSalary"
+                            placeholder="请输入金额"/>
           </a-form-item>
         </a-col>
         <label style="margin:5px 8px 5px 8px;">至</label>
@@ -117,7 +119,9 @@
             name="maxSalary"
             :rules="[{ required: false, message: '请输入金额' }]"
           >
-            <a-input v-model:value="dataModel.maxSalary" placeholder="请输入金额"/>
+            <a-input-number style="width: 100%" :controls="false" :min="dataModel.minSalary"
+                            v-model:value="dataModel.maxSalary"
+                            placeholder="请输入金额"/>
           </a-form-item>
         </a-col>
         <a-col flex="400px">
@@ -143,7 +147,7 @@
             name="trailMonths"
             :rules="[{ required: false, message: '请选择试用期时长!' }]"
           >
-            <a-input v-model:value="dataModel.trailMonths" placeholder=""/>
+            <a-input-number style="width: 100%" :controls="false" v-model:value="dataModel.trailMonths" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -155,7 +159,8 @@
             :label-col="{span:9}"
             :rules="[{ required: false, message: '请输入金额!' }]"
           >
-            <a-input v-model:value="dataModel.trailMaxSalary" placeholder="请输入金额"/>
+            <a-input-number style="width: 100%" :controls="false" :min="0" v-model:value="dataModel.trailMinSalary"
+                            placeholder="请输入金额"/>
           </a-form-item>
         </a-col>
         <label style="margin:5px 8px 5px 8px;">至</label>
@@ -165,7 +170,9 @@
             name="trailMinSalary"
             :rules="[{ required: false, message: '请输入金额' }]"
           >
-            <a-input v-model:value="dataModel.trailMinSalary" placeholder="请输入金额"/>
+            <a-input-number style="width: 100%" :controls="false" :min="dataModel.trailMinSalary"
+                            v-model:value="dataModel.trailMaxSalary"
+                            placeholder="请输入金额"/>
           </a-form-item>
         </a-col>
         <a-col flex="400px">

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

@@ -26,11 +26,14 @@
           <a-form-item label="月薪要求" name="salary" style="overflow: hidden;line-height: 35px;height: 35px;" :label-col="{span:7}">
             <label style="color:red;float: left;position:relative;right:80px;line-height: 35px;" >*</label>
             <a-form-item name="minSalary" :rules="[{ required: true, message: '请输入最低月薪!' }]"  style="float:left;">
-              <a-input type="number" name="minSalary" v-model:value="dataModel.minSalary" style="min-width: 145px;max-width: 150px;"  placeholder=""  />
+              <a-input-number :controls="false" :min="0" name="minSalary" v-model:value="dataModel.minSalary"
+                              style="min-width: 145px;max-width: 150px;" placeholder=""/>
             </a-form-item>
             <label style="margin-right:10px;margin-left:10px;float: left;">-</label>
             <a-form-item name="maxSalary"  :rules="[{ required: true, message: '请输入最高月薪!' }]" style="float: left;" >
-              <a-input type="number" name="maxSalary" v-model:value="dataModel.maxSalary" style="min-width: 145px;max-width: 150px;"   placeholder=""  />
+              <a-input-number :controls="false" :min="dataModel.minSalary" name="maxSalary"
+                              v-model:value="dataModel.maxSalary"
+                              style="min-width: 145px;max-width: 150px;" placeholder=""/>
             </a-form-item>
           </a-form-item>
         </a-col>