From cc609d28f438889407e6d73cf97930859724d0ba Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 5 Mar 2020 09:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/organize/deptofficer-add-or-update.vue |  9 +++++----
 src/views/modules/organize/deptofficer-add.vue     | 14 +++++++++-----
 src/views/modules/organize/deptofficer.vue         |  2 +-
 src/views/modules/organize/metasysdept.vue         |  4 ++--
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/modules/organize/deptofficer-add-or-update.vue b/src/views/modules/organize/deptofficer-add-or-update.vue
index 7329d26b..bb96b058 100644
--- a/src/views/modules/organize/deptofficer-add-or-update.vue
+++ b/src/views/modules/organize/deptofficer-add-or-update.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="sex">
         <el-select v-model="dataForm.sex" placeholder="性别">
@@ -11,7 +11,7 @@
         </el-select>
       </el-form-item>
           <el-form-item label="职位" prop="position">
-          <el-input v-model="dataForm.position" placeholder="职位"></el-input>
+          <el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
       </el-form-item>
           <el-form-item label="联系方式" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
@@ -20,7 +20,7 @@
           <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
           <el-form-item label="主显标识" prop="masterFlag">
-          <el-input v-model="dataForm.masterFlag" placeholder="主显标识"></el-input>
+          <el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -71,7 +71,8 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '请输入正确号码格式', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
diff --git a/src/views/modules/organize/deptofficer-add.vue b/src/views/modules/organize/deptofficer-add.vue
index 7329d26b..db72b634 100644
--- a/src/views/modules/organize/deptofficer-add.vue
+++ b/src/views/modules/organize/deptofficer-add.vue
@@ -2,7 +2,7 @@
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+          <el-input v-model="dataForm.name" placeholder="姓名" maxlength="10"></el-input>
       </el-form-item>
       <el-form-item label="性别" prop="sex">
         <el-select v-model="dataForm.sex" placeholder="性别">
@@ -11,7 +11,7 @@
         </el-select>
       </el-form-item>
           <el-form-item label="职位" prop="position">
-          <el-input v-model="dataForm.position" placeholder="职位"></el-input>
+          <el-input v-model="dataForm.position" placeholder="职位" maxlength="10"></el-input>
       </el-form-item>
           <el-form-item label="联系方式" prop="mobile">
           <el-input v-model="dataForm.mobile" placeholder="联系方式"></el-input>
@@ -20,7 +20,7 @@
           <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
           <el-form-item label="主显标识" prop="masterFlag">
-          <el-input v-model="dataForm.masterFlag" placeholder="主显标识"></el-input>
+          <el-input v-model="dataForm.masterFlag" placeholder="主显标识" maxlength="10" disabled></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -44,7 +44,7 @@ export default {
         position: '',
         mobile: '',
         sort: '',
-        masterFlag: '',
+        masterFlag: '1',
         revision: '',
         delFlag: '',
         createdBy: '',
@@ -67,11 +67,15 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         position: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+          { pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/, message: '请输入正确号码格式', trigger: 'blur' }
         ],
         sort: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
diff --git a/src/views/modules/organize/deptofficer.vue b/src/views/modules/organize/deptofficer.vue
index f5e268df..23b364b0 100644
--- a/src/views/modules/organize/deptofficer.vue
+++ b/src/views/modules/organize/deptofficer.vue
@@ -52,7 +52,7 @@
         <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
         <el-table-column prop="position" label="职位" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系方式" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="masterFlag" label="主显标识" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="masterFlag" label="主显标识" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
diff --git a/src/views/modules/organize/metasysdept.vue b/src/views/modules/organize/metasysdept.vue
index 5daa9561..9677321b 100644
--- a/src/views/modules/organize/metasysdept.vue
+++ b/src/views/modules/organize/metasysdept.vue
@@ -90,7 +90,7 @@ export default {
       this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList), deptId: deptId } })
     },
     lookHandle (id, pid) {
-      // this.dataForm.page = 1
+      this.page = 1
       this.pidList.push(id)
       this.$parent.selectComponent = 'Metasysdept'
       this.$router.push({ path: '/organize-organizedeptroute', query: { pidList: JSON.stringify(this.pidList) } })
@@ -103,7 +103,7 @@ export default {
       this.getDataList()
     },
     backToDeptList () {
-      // this.dataForm.page = 1
+      this.page = 1
       var m = this.pidList.splice(this.pidList.length - 1, 1)
       m.pop()
       this.$emit('refreshDataList')