人员管理bug修复

src/api/codeManagement/index.js

@@ -38,3 +38,16 @@ export async function getCodeDetail (id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+/**
+ * 检查编码是否存在
+ * @param code 编码
+ */
+export async function checkCode (code) {
+  const res = await request.get('/main/codemanage/getByCode/' + code);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/codeManagement/components/addDialog.vue

@@ -21,7 +21,6 @@
                   <el-input
                     v-model="addForm.code"
                     type="text"
-
                     placeholder="请输入"
                   ></el-input>
                 </el-form-item>
@@ -31,7 +30,6 @@
                   <el-input
                     v-model="addForm.name"
                     type="text"
-
                     placeholder="请输入"
                   ></el-input>
                 </el-form-item>
@@ -41,7 +39,8 @@
                   <el-input
                     v-model="addForm.remark"
                     placeholder="请输入"
-
+                    maxlength="100"
+                    show-word-limit
                   ></el-input>
                 </el-form-item>
               </el-col>
@@ -65,7 +64,7 @@
 </template>
 
 <script>
-import { saveNew , getCodeDetail } from '@/api/codeManagement/index';
+import { saveNew , getCodeDetail , checkCode } from '@/api/codeManagement/index';
 import myTable from './myTable.vue'
 export default {
   components:{
@@ -82,7 +81,28 @@ export default {
       },
       addFormRules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        code: [{ required: true, message: '请输入编码', trigger: 'blur' }]
+        code: [
+          {
+            required: true,
+            trigger: 'blur',
+            validator: (_rule, value, callback) => {
+              if (!value) {
+                return callback(new Error('请输入编码'));
+              }
+              checkCode(this.addForm.code)
+                .then(res => {
+                  if(res!=true&&res!=this.addForm.id){
+                    callback(new Error('编号已经存在'));
+                  }else{
+                    callback();
+                  }
+                })
+                .catch(() => {
+                  callback();
+                });
+            }
+          }
+        ],
       },
       codeConfigurationList:[],
       openType:'add',

src/views/codeManagement/components/code-list.vue

@@ -48,7 +48,7 @@
       </template>
     </ele-pro-table>
     <!-- 编辑弹窗 -->
-    <addDialog 
+    <addDialog
       ref="addDialog"
       @done="reload"
     ></addDialog>
@@ -83,22 +83,22 @@
           {
             prop: 'code',
             label: '编码',
-            sortable: 'custom',
+            // sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
             prop: 'name',
             label: '名称',
-            sortable: 'custom',
+            // sortable: 'custom',
             showOverflowTooltip: true,
             minWidth: 110
           },
           {
             prop: 'remark',
             label: '描述',
-            align: 'center',
-            sortable: 'custom',
+            align: 'left',
+            // sortable: 'custom',
             minWidth: 200,
             showOverflowTooltip: true,
           },

src/views/codeManagement/components/code-search.vue

@@ -48,6 +48,15 @@
           >
             查询
           </el-button>
+          <el-button
+            size="small"
+            type="primary"
+            icon="el-icon-refresh-left"
+            class="ele-btn-icon"
+            @click="reset"
+          >
+            重置
+          </el-button>
           <slot></slot>
         </el-form-item>
       </el-col>

src/views/codeManagement/components/myTable.vue

@@ -2,7 +2,7 @@
   <div class="bmpz-wrap">
     <div class="btn-wrap">
       <el-button type="primary" @click="add" size="small">添加</el-button>
-      <el-button type="primary" @click="_delete" size="small">删除</el-button>
+      <el-button type="danger" @click="_delete" size="small">删除</el-button>
     </div>
     <el-form class="table-wrap" :model="form" ref="tableForm" :rules="rules">
       <el-table
@@ -238,6 +238,8 @@
             this.form.tableData.splice(itemIndex, 1);
             this.againSort();
           }
+        }else{
+           this.$message.info('请先勾选需删除的配置项')
         }
       },
       add () {

src/views/dashboard.vue

@@ -14,7 +14,7 @@
     },
     data() {
       return {
-        
+
       }
     },
     computed: {

src/views/ledgerAssets/boat/index.vue

@@ -0,0 +1,27 @@
+<template>
+  <div class="ele-body">
+    舟皿台账
+  </div>
+</template>
+
+<script>
+  export default {
+    // name: 'boatLedger',
+    components: {},
+    data () {
+      return {
+
+      };
+    },
+    computed: {
+
+    },
+    methods: {
+
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/system/organization/components/org-user-edit.vue

@@ -86,10 +86,11 @@
           <el-form-item label="工号:" prop="jobNumber">
             <el-input
               clearable
-              :maxlength="20"
+              type="text"
+              :maxlength="10"
               v-model="form.jobNumber"
               placeholder="请输入工号"
-              onKeyUp="value=value.replace(/[\W]/g,'')"
+              onkeyup="value=value.replace(/[^\x00-\xff]/g, '')"
             />
           </el-form-item>
           <el-form-item label="姓名:" prop="name">