Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/enterprise/informationSetting/index.vue

@@ -18,7 +18,7 @@
         <div style="font-size: 14px; color: #999;">只支持JPG、JPEG、PNG类型的图片，大小不超过10M</div>
       </template>
     </CtForm>
-    <v-btn class="buttons mt-5" color="primary" @click.stop="handleSubmit">提 交</v-btn>
+    <v-btn class="buttons mt-5" color="primary" @click.stop="handleSubmit">{{ $t('common.save') }}</v-btn>
   </v-card>
 </template>
 

src/views/enterprise/personnelManagement/components/table.vue

@@ -11,6 +11,7 @@
       :headers="headers"
       hover
       show-select
+      :disable-sort="true"
       height="60vh"
       item-value="id"
     >