Merge branch 'feature/yujt_police_group' of http://121.42.41.42:7070/r/epdc-admin-yushan into feature/yujt_police_group

src/views/modules/police/police-add-or-update.vue

@@ -38,8 +38,12 @@
                              filterable
                              collapse-tags></el-cascader>
             </el-form-item>
-            <el-form-item label="排序" prop="sort">
+            <el-form-item label="排序"
-                <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
+                          prop="sort">
+                <el-input-number v-model="dataForm.sort"
+                                 controls-position="right"
+                                 :min="0"
+                                 :label="$t('menu.sort')"></el-input-number>
             </el-form-item>
         </el-form>
         <template slot="footer">

src/views/modules/psychology/psychologist-add-or-update.vue

@@ -64,8 +64,12 @@
                 </el-option>
             </el-select>
         </el-form-item>
-        <el-form-item label="排序" prop="sort">
+        <el-form-item label="排序"
-          <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"  placeholder="排序 从小到大"></el-input-number>
+                      prop="sort">
+            <el-input-number v-model="dataForm.sort"
+                             controls-position="right"
+                             :min="0"
+                             :label="$t('menu.sort')"></el-input-number>
         </el-form-item>
       </el-form>
     <template slot="footer">

src/views/modules/psychology/psychologisttitle-add-or-update.vue

@@ -7,8 +7,12 @@
           <el-form-item label="头衔编码" prop="code">
           <el-input v-model="dataForm.code" placeholder="头衔编码"></el-input>
       </el-form-item>
-        <el-form-item label="排序" prop="sort">
+        <el-form-item label="排序"
-            <el-input v-model="dataForm.sort" type="number" placeholder="排序 从小到大"></el-input>
+                      prop="sort">
+            <el-input-number v-model="dataForm.sort"
+                             controls-position="right"
+                             :min="0"
+                             :label="$t('menu.sort')"></el-input-number>
         </el-form-item>
       </el-form>
     <template slot="footer">

src/views/modules/section/sectioncategory-add-or-update.vue

@@ -21,12 +21,13 @@
           <el-form-item label="前端样式" prop="frontStyle">
           <el-input v-model="dataForm.frontStyle" placeholder="前端样式"></el-input>
       </el-form-item>
-        <el-form-item label="排序" prop="sort">
+        <el-form-item label="排序"
-            <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"  placeholder="排序 从小到大"></el-input-number>
+                      prop="sort">
+            <el-input-number v-model="dataForm.sort"
+                             controls-position="right"
+                             :min="0"
+                             :label="$t('menu.sort')"></el-input-number>
         </el-form-item>
-          <!-- <el-form-item label="扩展字段" prop="extend">
-              <el-input type="textarea" maxlength="200" show-word-limit v-model="dataForm.extend" placeholder="扩展字段"></el-input>
-      </el-form-item> -->
           <el-form-item label="备注" prop="remark">
               <el-input type="textarea" maxlength="200" :rows="4" show-word-limit v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>