From 0b4ca2803b1a0d6fd236fdd19ea1fedf87ccd0f8 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Tue, 28 Jul 2020 17:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E4=BC=98=E5=8C=96bu?=
 =?UTF-8?q?g=E3=80=91-=E3=80=90=E7=BB=9F=E4=B8=80=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=AD=89bug=E3=80=91-=EF=BC=88=E9=AD=8F?=
 =?UTF-8?q?=E5=87=AF=EF=BC=89-2020/07/27?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/evaluateinfo.vue     |  8 ++---
 .../modules/custom/evaluateofficercount.vue   |  8 ++---
 .../modules/sys/params-add-or-update.vue      |  2 +-
 .../modules/sys/resource-add-or-update.vue    |  1 +
 src/views/modules/sys/role-add-or-update.vue  |  4 +++
 src/views/modules/user/partymembers.vue       | 29 +++++++++++++++++++
 6 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/custom/evaluateinfo.vue b/src/views/modules/custom/evaluateinfo.vue
index 6a20d146..205ffc3f 100644
--- a/src/views/modules/custom/evaluateinfo.vue
+++ b/src/views/modules/custom/evaluateinfo.vue
@@ -119,17 +119,17 @@ export default {
       optionList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.startTime
+          let beginDateVal = this.dataForm.endTime
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.endTime
+          let EndDateVal = this.dataForm.startTime
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
       }
diff --git a/src/views/modules/custom/evaluateofficercount.vue b/src/views/modules/custom/evaluateofficercount.vue
index bf995f4d..acf3c97f 100644
--- a/src/views/modules/custom/evaluateofficercount.vue
+++ b/src/views/modules/custom/evaluateofficercount.vue
@@ -100,17 +100,17 @@ export default {
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {
-          let beginDateVal = this.dataForm.startTime
+          let beginDateVal = this.dataForm.endTime
           if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal).getTime()
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
           }
         }
       },
       pickerBeginDateAfter: {
         disabledDate: (time) => {
-          let EndDateVal = this.dataForm.endTime
+          let EndDateVal = this.dataForm.startTime
           if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal).getTime()
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
           }
         }
       }
diff --git a/src/views/modules/sys/params-add-or-update.vue b/src/views/modules/sys/params-add-or-update.vue
index 6c30877c..95878ea9 100644
--- a/src/views/modules/sys/params-add-or-update.vue
+++ b/src/views/modules/sys/params-add-or-update.vue
@@ -3,7 +3,7 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="120px">
       <el-form-item prop="paramCode" :label="$t('params.paramCode')">
         <el-input v-model="dataForm.paramCode"
-                  maxlength="50"
+                  maxlength="30"
                   show-word-limit
                   :placeholder="$t('params.paramCode')"></el-input>
       </el-form-item>
diff --git a/src/views/modules/sys/resource-add-or-update.vue b/src/views/modules/sys/resource-add-or-update.vue
index e1cc3b8c..aae89dd0 100644
--- a/src/views/modules/sys/resource-add-or-update.vue
+++ b/src/views/modules/sys/resource-add-or-update.vue
@@ -28,6 +28,7 @@
         <el-input
                 v-model="dataForm.resourceCode"
                 placeholder="请输入资源编码" maxlength="32"
+                show-word-limit
         ></el-input>
       </el-form-item>
 
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 15a7b17c..e2c14600 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -11,6 +11,8 @@
       <el-form-item prop="name"
                     :label="$t('role.name')">
         <el-input v-model="dataForm.name"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('role.name')"></el-input>
       </el-form-item>
       <el-form-item label="角色类型">
@@ -26,6 +28,8 @@
       <el-form-item prop="remark"
                     :label="$t('role.remark')">
         <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
                   :placeholder="$t('role.remark')"></el-input>
       </el-form-item>
       <el-row>
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index 9c47cb40..7ef53402 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -334,10 +334,39 @@ export default {
       .catch(() => { })
     // this.getStreetList()
     this.getRegistOptions()
+    this.initTime()
     // this.getPostOptions()
     this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}`
   },
   methods: {
+    initTime () {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      this.time = [start, end]
+      let year = start.getFullYear()
+      let month = start.getMonth() + 1
+      if (month < 10) {
+        month = '0' + month
+      }
+      let date = start.getDate()
+      if (date < 10) {
+        date = '0' + date
+      }
+      let startDate = year + '-' + month + '-' + date
+      let yearend = end.getFullYear()
+      let monthend = end.getMonth() + 1
+      if (monthend < 10) {
+        monthend = '0' + monthend
+      }
+      let dateend = end.getDate()
+      if (dateend < 10) {
+        dateend = '0' + dateend
+      }
+      let endDate = yearend + '-' + monthend + '-' + dateend
+      this.dataForm.startTime = startDate
+      this.dataForm.endTime = endDate
+    },
     btKeyUpRealName (e) {
       e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】、；‘’，。、]/g, '')
       this.dataForm.realName = e.target.value