From b406a097c1214c964c4f1deb373b2e19a4dd24a3 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 18 Mar 2020 15:34:54 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E7=BE=A4=E6=88=90=E5=91=98=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../masteruserrelation-add-or-update.vue      | 21 ++++++++++++-------
 .../modules/master/masteruserrelation.vue     | 16 ++++++++++++++
 .../master/masteruserrelationroute.vue        |  2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/master/masteruserrelation-add-or-update.vue b/src/views/modules/master/masteruserrelation-add-or-update.vue
index 2e081ab1..99a49346 100755
--- a/src/views/modules/master/masteruserrelation-add-or-update.vue
+++ b/src/views/modules/master/masteruserrelation-add-or-update.vue
@@ -1,26 +1,26 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false" customClass="customWidth">
     <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="nickname">
-          <el-input v-model="dataForm.nickname" placeholder="群内昵称"></el-input>
+          <el-input v-model="dataForm.nickname" placeholder="群内昵称" style="width:90%"></el-input>
       </el-form-item>
           <el-form-item label="用户头像" prop="userAvatar">
-          <el-input v-model="dataForm.userAvatar" placeholder="" disabled></el-input>
+          <el-input v-model="dataForm.userAvatar" placeholder="" disabled style="width:90%"></el-input>
       </el-form-item>
           <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="" disabled></el-input>
+          <el-input v-model="dataForm.mobile" placeholder="" disabled style="width:90%"></el-input>
       </el-form-item>
           <el-form-item label="真实姓名" prop="realName">
-          <el-input v-model="dataForm.realName" placeholder="" disabled></el-input>
+          <el-input v-model="dataForm.realName" placeholder="" disabled style="width:90%"></el-input>
       </el-form-item>
           <el-form-item label="登录名" prop="loginName">
-          <el-input v-model="dataForm.loginName" placeholder="" disabled></el-input>
+          <el-input v-model="dataForm.loginName" placeholder="" disabled style="width:90%"></el-input>
       </el-form-item>
           <el-form-item label="所属部门" prop="deptName">
-          <el-input v-model="dataForm.deptName" placeholder="" disabled></el-input>
+          <el-input v-model="dataForm.deptName" placeholder="" disabled style="width:90%"></el-input>
       </el-form-item>
       <el-form-item label="管理标识" prop="manageFlag">
-        <el-select v-model="dataForm.manageFlag" placeholder="" disabled>
+        <el-select v-model="dataForm.manageFlag" placeholder="" disabled style="width:90%">
           <el-option v-for="item in manageFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
@@ -169,3 +169,8 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+  .customWidth {
+    width:30%
+  }
+</style>
diff --git a/src/views/modules/master/masteruserrelation.vue b/src/views/modules/master/masteruserrelation.vue
index e258581c..dc5c963c 100755
--- a/src/views/modules/master/masteruserrelation.vue
+++ b/src/views/modules/master/masteruserrelation.vue
@@ -98,6 +98,22 @@ export default {
       },
       dataForm: {
         id: ''
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
       }
     }
   },
diff --git a/src/views/modules/master/masteruserrelationroute.vue b/src/views/modules/master/masteruserrelationroute.vue
index 15308f83..e1292312 100644
--- a/src/views/modules/master/masteruserrelationroute.vue
+++ b/src/views/modules/master/masteruserrelationroute.vue
@@ -1,5 +1,5 @@
 <template>
-    <keep-alive include="evaluatedept">
+    <keep-alive include="masteruserrelation">
         <component :is="selectComponent"></component>
     </keep-alive>
 </template>