【pc端 - 优化bug】-【统一时间控件等bug】-（魏凯）-2020/07/27

src/views/modules/analysis/export/operation.vue

@@ -27,16 +27,27 @@
           </template>
         </el-form-item>
         <el-row>
-          <el-form-item prop="newsReleaseStartTime"
-                        v-if="this.timeFlag==1"
-                        label="有效时间">
-            <el-date-picker @change='setRegistTime'
-                            v-model="time"
+          <el-form-item label="提交时间"
+                        prop="startTime">
+            <el-date-picker v-model="dataForm.operationStartTime"
+                            type="date"
+                            :picker-options="pickerBeginDateBefore"
+                            value-format="yyyy-MM-dd"
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期时间"
+                            style="width:250px;">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="至"
+                        label-width="25px"
+                        prop="endTime">
+            <el-date-picker v-model="dataForm.operationEndTime"
+                            type="date"
+                            :picker-options="pickerBeginDateAfter"
                             value-format="yyyy-MM-dd"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期">
+                            format="yyyy-MM-dd"
+                            placeholder="选择日期时间"
+                            style="width:250px;">
             </el-date-picker>
           </el-form-item>
         </el-row>
@@ -94,7 +105,23 @@ export default {
       options: [],
       categorys: [],
       loading: false,
-      timeFlag: '1'
+      timeFlag: '1',
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.operationEndTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.operationStartTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   activated () {

src/views/modules/analysis/issue/issue-classified-statistic.vue

@@ -103,17 +103,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()
           }
         }
       },

src/views/modules/analysis/user/gridopening.vue

@@ -25,18 +25,31 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="提交时间">
-          <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
+        <el-form-item label="提交时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success"
@@ -276,7 +289,9 @@ export default {
         exportURL: '/analysis/user/export/grid0pining'
       },
       dataForm: {
-        category: '1'
+        category: '1',
+        startTime:'',
+        endTime:''
       },
       isAble:false,
       time: '',
@@ -297,7 +312,23 @@ export default {
         onLineState: ''
       },
       totalList: [],
-      totalVisible: false
+      totalVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   created () {

src/views/modules/analysis/user/party.vue

@@ -23,16 +23,29 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="提交时间">
-          <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker>
-        </el-form-item> 
+        <el-form-item label="提交时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
@@ -148,7 +161,9 @@ export default {
         exportURL: '/analysis/user/export/party'
       },
       dataForm: {
-        partyFlag: '1'
+        partyFlag: '1',
+        startTime:'',
+        endTime:''
       },
       time: '',
       options: [],
@@ -181,7 +196,23 @@ export default {
       onLine: {
         id: '',
         onLineState: ''
-      }
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   created () {
@@ -300,11 +331,7 @@ export default {
       this.dataForm.dept = choosenItem.name
       this.dataForm.deptId = choosenItem.id
     },
-    setRegistTime () {
-      console.log(this.time[0])
-      this.dataForm.startTime = this.time[0]
-      this.dataForm.endTime = this.time[1]
-    },
+
     // getListCategory () {
     //   this.$http.get(`/news/newscategory/category/`).then(({ data: res }) => {
     //     if (res.code !== 0) {

src/views/modules/analysis/user/register.vue

@@ -11,16 +11,6 @@
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
         </el-form-item>
-        <br>
-        <span class="demonstration">提交时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker> &nbsp; &nbsp;
         <el-form-item label="排序规则">
           <el-select v-model="dataForm.category"
                      clearable
@@ -32,8 +22,32 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <br>
+        <el-form-item label="提交时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="success"
@@ -172,7 +186,9 @@ export default {
         newsCount: '',
         noticeCount: '',
         partyCount: '',
-        registerCount: ''
+        registerCount: '',
+        startTime:'',
+        endTime:''
       },
       time: '',
       options: [],
@@ -205,7 +221,23 @@ export default {
       onLine: {
         id: '',
         onLineState: ''
-      }
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   created () {

src/views/modules/case/typicalcase-list.vue

@@ -90,20 +90,20 @@ export default {
         endTime: ''
       },
         pickerBeginDateBefore: {
-            disabledDate: (time) => {
-                let beginDateVal = this.dataForm.startTime
-                if (beginDateVal) {
-                    return time.getTime() > new Date(beginDateVal).getTime()
-                }
+          disabledDate: (time) => {
+            let beginDateVal = this.dataForm.endTime
+            if (beginDateVal) {
+              return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
             }
+          }
         },
         pickerBeginDateAfter: {
-            disabledDate: (time) => {
-                let EndDateVal = this.dataForm.endTime
-                if (EndDateVal) {
-                    return time.getTime() < new Date(EndDateVal).getTime()
-                }
+          disabledDate: (time) => {
+            let EndDateVal = this.dataForm.startTime
+            if (EndDateVal) {
+              return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
             }
+          }
         }
     }
   },

src/views/modules/custom/epidemic.vue

@@ -96,17 +96,17 @@ export default {
       options: [],
       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()
           }
         }
       }

src/views/modules/custom/evaluatedeptcount.vue

@@ -97,17 +97,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()
           }
         }
       }

src/views/modules/custom/evaluateofficer.vue

@@ -35,10 +35,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:topic:export')" type="success" @click="exportHandle()">{{ $t('export') }}</el-button>

src/views/modules/events/issue-close-detail-view.vue

@@ -260,19 +260,30 @@ export default {
       })
     },
     deleteComment (val) {
-      this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.getCommentList()
-          }
-        })
-      }).catch(() => { })
+        this.$confirm('是否屏蔽评论?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            this.$http['post']('/events/issue/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.$message({
+                    message: this.$t('prompt.success'),
+                    type: 'success',
+                    duration: 500,
+                    onClose: () => {
+                        this.getCommentList()
+                    }
+                })
+            })
+        }).catch(() => {
+            this.$message({
+                type: 'info',
+                message: '已取消屏蔽'
+            });
+        });
     },
     clickImg (url) {
       this.previewImgList = []

src/views/modules/events/issue-process-detail-view.vue

@@ -122,7 +122,9 @@
                       prop="advice">
           <el-input v-model="dataForm.advice"
                     type="textarea"
-                    placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"></el-input>
+                    maxlength="500"
+                    placeholder="请您填写居民诉求的处理情况及答复意见，向居民公开展示，500字以内"
+                    ></el-input>
         </el-form-item>
         <el-form-item style="float: right;">
           <el-button size="small"

src/views/modules/events/item-close-detail-view.vue

@@ -240,19 +240,30 @@ export default {
       this.previewImgList.push(url)
     },
     deleteComment (val) {
-      this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.getCommentList()
-          }
-        })
-      }).catch(() => {})
+        this.$confirm('是否屏蔽评论?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
+                if (res.code !== 0) {
+                    return this.$message.error(res.msg)
+                }
+                this.$message({
+                    message: this.$t('prompt.success'),
+                    type: 'success',
+                    duration: 500,
+                    onClose: () => {
+                        this.getCommentList()
+                    }
+                })
+            })
+        }).catch(() => {
+            this.$message({
+                type: 'info',
+                message: '已取消屏蔽'
+            });
+        });
     },
     getInfo () {
       this.$http.get(`/events/item/contentDetail/${this.dataForm.id}`).then(({ data: res }) => {

src/views/modules/events/item-deal-detail-view.vue

@@ -146,12 +146,16 @@
                         prop="outHandleAdvice">
             <el-input v-model="postDataForm.outHandleAdvice"
                       type="textarea"
+                      maxlength="100"
+                      show-word-limit
                       placeholder="请您选择居民诉求的处理情况及答复意见，向居民公开展示"></el-input>
           </el-form-item>
           <el-form-item label="项目处理意见:"
                         prop="handleAdvice">
             <el-input v-model="postDataForm.handleAdvice"
                       type="textarea"
+                      maxlength="100"
+                      show-word-limit
                       placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>
           </el-form-item>
           <el-form-item label="满意度评价:"

src/views/modules/group/leaderboard.vue

@@ -92,17 +92,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()
           }
         }
       },

src/views/modules/group/topic-list.vue

@@ -115,17 +115,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()
           }
         }
       },

src/views/modules/heart/actphrase.vue

@@ -35,10 +35,10 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="success"
+          <el-button type="primary"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>

src/views/modules/job/schedule-add-or-update.vue

@@ -1,17 +1,29 @@
 <template>
   <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="120px">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm"  label-width="120px">
       <el-form-item prop="beanName" :label="$t('schedule.beanName')">
-        <el-input v-model="dataForm.beanName" :placeholder="$t('schedule.beanNameTips')"></el-input>
+        <el-input v-model="dataForm.beanName"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('schedule.beanNameTips')"></el-input>
       </el-form-item>
       <el-form-item prop="params" :label="$t('schedule.params')">
-        <el-input v-model="dataForm.params" :placeholder="$t('schedule.params')"></el-input>
+        <el-input v-model="dataForm.params"
+                  maxlength="120"
+                  show-word-limit
+                  :placeholder="$t('schedule.params')"></el-input>
       </el-form-item>
       <el-form-item prop="cronExpression" :label="$t('schedule.cronExpression')">
-        <el-input v-model="dataForm.cronExpression" :placeholder="$t('schedule.cronExpressionTips')"></el-input>
+        <el-input v-model="dataForm.cronExpression"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('schedule.cronExpressionTips')"></el-input>
       </el-form-item>
       <el-form-item prop="remark"  :label="$t('schedule.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('schedule.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('schedule.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">

src/views/modules/news/allnews.vue

@@ -29,18 +29,32 @@
                       clearable></el-input>
           </el-form-item>
         </el-form-item>
-        <el-form-item label="提交时间">
-          <el-date-picker @change='setRegistTime'
-                          v-model="time"
+      <br>
+        <el-form-item label="提交时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
-                          type="daterange"
-                          range-separator="至"
-                          start-placeholder="开始日期"
-                          end-placeholder="结束日期">
-          </el-date-picker> &nbsp;
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:news:save')"
@@ -175,7 +189,23 @@ export default {
       onLine: {
         id: '',
         onLineState: ''
-      }
+      },
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   created () {

src/views/modules/news/news.vue

@@ -67,18 +67,32 @@
                   </el-select>
                 </el-form-item>-->
                 <br>
-                <span class="demonstration">提交时间</span>&nbsp;&nbsp;
-                <el-date-picker @change='setRegistTime'
-                                v-model="time"
-                                value-format="yyyy-MM-dd"
-                                type="daterange"
-                                range-separator="至"
-                                start-placeholder="开始日期"
-                                end-placeholder="结束日期">
-                </el-date-picker> &nbsp; &nbsp;
+                <el-form-item label="提交时间"
+                              prop="startTime">
+                    <el-date-picker v-model="dataForm.startTime"
+                                    type="date"
+                                    :picker-options="pickerBeginDateBefore"
+                                    value-format="yyyy-MM-dd"
+                                    format="yyyy-MM-dd"
+                                    placeholder="选择日期时间"
+                                    style="width:250px;">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="至"
+                              label-width="25px"
+                              prop="endTime">
+                    <el-date-picker v-model="dataForm.endTime"
+                                    type="date"
+                                    :picker-options="pickerBeginDateAfter"
+                                    value-format="yyyy-MM-dd"
+                                    format="yyyy-MM-dd"
+                                    placeholder="选择日期时间"
+                                    style="width:250px;">
+                    </el-date-picker>
+                </el-form-item>
 
                 <el-form-item>
-                    <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                    <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
                 </el-form-item>
                 <el-form-item>
                     <el-button v-if="$hasPermission('news:news:save')"
@@ -228,7 +242,23 @@
                 onLine: {
                     id: '',
                     onLineState: ''
-                }
+                },
+                pickerBeginDateBefore: {
+                    disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime
+                        if (beginDateVal) {
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                },
+                pickerBeginDateAfter: {
+                    disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime
+                        if (EndDateVal) {
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                },
             }
         },
         created() {

src/views/modules/news/newsdraft.vue

@@ -10,54 +10,8 @@
                        :options="options"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
-        </el-form-item>
-        <!--<el-form-item label="所属街道"
-                      prop="deptId">
-          <el-select v-model="dataForm.streetId"
-                     clearable
-                     @change="changeStreet"
-                     placeholder="所属街道">
-            <el-option v-for="item in streetList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属社区">
-          <el-select v-model="dataForm.communityId"
-                     @change="changeCommunity"
-                     clearable
-                     placeholder="所属社区">
-            <el-option v-for="item in communityList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="所属网格">
-          <el-select v-model="dataForm.gridId"
-                     @change="changeGrid"
-                     clearable
-                     placeholder="所属网格">
-            <el-option v-for="item in gridList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>-->
-        <span class="demonstration">提交时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime'
-                        v-model="time"
-                        value-format="yyyy-MM-dd"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期">
-        </el-date-picker> &nbsp; &nbsp;
-        <br>
+        </el-form-item>&nbsp;
+
         <el-form-item label="类别"  label-width="68px">
           <el-select v-model="dataForm.category"
                      clearable
@@ -76,8 +30,32 @@
                       clearable></el-input>
           </el-form-item>
         </el-form-item>
+        <br>
+        <el-form-item label="提交时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:250px;">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('news:news:save')"
@@ -204,7 +182,23 @@ export default {
       options: [],
       deptIdList: [],
       categorys: [],
-      id: ''
+      id: '',
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   created () {

src/views/modules/organize/deptofficer.vue

@@ -102,7 +102,23 @@ export default {
       dataForm: {
         id: ''
       },
-      deptofficerAddVisible: false
+      deptofficerAddVisible: false,
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
     }
   },
   mounted () {

src/views/modules/oss/oss-config.vue

@@ -22,26 +22,36 @@
         <el-form-item prop="qiniuDomain"
                       :label="$t('oss.qiniuDomain')">
           <el-input v-model="dataForm.qiniuDomain"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuPrefix"
                       :label="$t('oss.qiniuPrefix')">
           <el-input v-model="dataForm.qiniuPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuAccessKey"
                       :label="$t('oss.qiniuAccessKey')">
           <el-input v-model="dataForm.qiniuAccessKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuAccessKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuSecretKey"
                       :label="$t('oss.qiniuSecretKey')">
           <el-input v-model="dataForm.qiniuSecretKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qiniuBucketName"
                       :label="$t('oss.qiniuBucketName')">
           <el-input v-model="dataForm.qiniuBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qiniuBucketNameTips')"></el-input>
         </el-form-item>
       </template>
@@ -49,31 +59,43 @@
         <el-form-item prop="aliyunDomain"
                       :label="$t('oss.aliyunDomain')">
           <el-input v-model="dataForm.aliyunDomain"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunPrefix"
                       :label="$t('oss.aliyunPrefix')">
           <el-input v-model="dataForm.aliyunPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunEndPoint"
                       :label="$t('oss.aliyunEndPoint')">
           <el-input v-model="dataForm.aliyunEndPoint"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunEndPointTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeyId"
                       :label="$t('oss.aliyunAccessKeyId')">
           <el-input v-model="dataForm.aliyunAccessKeyId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunAccessKeyIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunAccessKeySecret"
                       :label="$t('oss.aliyunAccessKeySecret')">
           <el-input v-model="dataForm.aliyunAccessKeySecret"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunAccessKeySecretTips')"></el-input>
         </el-form-item>
         <el-form-item prop="aliyunBucketName"
                       :label="$t('oss.aliyunBucketName')">
           <el-input v-model="dataForm.aliyunBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.aliyunBucketNameTips')"></el-input>
         </el-form-item>
       </template>
@@ -81,31 +103,43 @@
         <el-form-item prop="qcloudDomain"
                       :label="$t('oss.qcloudDomain')">
           <el-input v-model="dataForm.qcloudDomain"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudPrefix"
                       :label="$t('oss.qcloudPrefix')">
           <el-input v-model="dataForm.qcloudPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudAppId"
                       :label="$t('oss.qcloudAppId')">
           <el-input v-model="dataForm.qcloudAppId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudAppIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretId"
                       :label="$t('oss.qcloudSecretId')">
           <el-input v-model="dataForm.qcloudSecretId"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudSecretIdTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudSecretKey"
                       :label="$t('oss.qcloudSecretKey')">
           <el-input v-model="dataForm.qcloudSecretKey"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudSecretKeyTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudBucketName"
                       :label="$t('oss.qcloudBucketName')">
           <el-input v-model="dataForm.qcloudBucketName"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.qcloudBucketNameTips')"></el-input>
         </el-form-item>
         <el-form-item prop="qcloudRegion"
@@ -141,6 +175,8 @@
         <el-form-item prop="fastdfsDomain"
                       :label="$t('oss.fastdfsDomain')">
           <el-input v-model="dataForm.fastdfsDomain"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.fastdfsDomainTips')"></el-input>
         </el-form-item>
       </template>
@@ -148,16 +184,22 @@
         <el-form-item prop="localDomain"
                       :label="$t('oss.localDomain')">
           <el-input v-model="dataForm.localDomain"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.localDomainTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPrefix"
                       :label="$t('oss.localPrefix')">
           <el-input v-model="dataForm.localPrefix"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.localPrefixTips')"></el-input>
         </el-form-item>
         <el-form-item prop="localPath"
                       :label="$t('oss.localPath')">
           <el-input v-model="dataForm.localPath"
+                    maxlength="50"
+                    show-word-limit
                     :placeholder="$t('oss.localPathTips')"></el-input>
         </el-form-item>
       </template>

src/views/modules/sys/app-menu-add-or-update.vue

@@ -9,7 +9,6 @@
       :model="dataForm"
       :rules="dataRule"
       ref="dataForm"
-      @keyup.enter.native="dataFormSubmitHandle()"
       label-width="120px"
     >
       <el-form-item prop="type" :label="$t('menu.type')" size="mini">
@@ -22,18 +21,24 @@
         <el-input
           v-model="dataForm.name"
           :placeholder="$t('menu.name')"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="menuCode" :label="$t('menu.menuCode')">
         <el-input
           v-model="dataForm.menuCode"
           :placeholder="$t('menu.menuCode')"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item prop="className" label="样式名称">
         <el-input
           v-model="dataForm.className"
           placeholder="样式名称"
+          maxlength="30"
+          show-word-limit
         ></el-input>
       </el-form-item>
       <el-form-item
@@ -124,7 +129,11 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="remark" label="备注">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input v-model="dataForm.remark"
+                  type="text"
+                  maxlength="100"
+                  show-word-limit
+                   placeholder="备注"></el-input>
       </el-form-item>
       <el-form-item prop="numFlag"
                     label="是否显示数字"

src/views/modules/sys/dept-add-or-update.vue

@@ -10,11 +10,15 @@
       <el-form-item prop="name"
                     :label="$t('dept.name')">
         <el-input v-model="dataForm.name"
+                  maxlength="50"
+                  show-word-limit
                   :placeholder="$t('dept.name')"></el-input>
       </el-form-item>
       <el-form-item prop="partyCode"
                     :label="$t('dept.partyCode')">
         <el-input v-model="dataForm.partyCode"
+                  maxlength="50"
+                  show-word-limit
                   :placeholder="$t('dept.partyCode')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName"

src/views/modules/sys/dict-add-or-update.vue

@@ -2,19 +2,34 @@
   <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" label-width="120px">
       <el-form-item prop="dictName" :label="$t('dict.dictName')">
-        <el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
+        <el-input v-model="dataForm.dictName"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictName')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.pid === '0'" prop="dictType" :label="$t('dict.dictType')">
-        <el-input v-model="dataForm.dictType" :placeholder="$t('dict.dictType')"></el-input>
+        <el-input v-model="dataForm.dictType"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictType')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.pid !== '0'" prop="dictValue" :label="$t('dict.dictValue')">
-        <el-input v-model="dataForm.dictValue" :placeholder="$t('dict.dictValue')"></el-input>
+        <el-input v-model="dataForm.dictValue"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('dict.dictValue')"></el-input>
       </el-form-item>
       <el-form-item prop="sort" :label="$t('dict.sort')">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
+        <el-input-number v-model="dataForm.sort"
+                         maxlength="50"
+                         show-word-limit
+                         controls-position="right" :min="0" :label="$t('dict.sort')"></el-input-number>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('dict.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('dict.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('dict.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">

src/views/modules/sys/menu-add-or-update.vue

@@ -6,7 +6,6 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              label-width="120px">
       <el-form-item prop="type"
                     :label="$t('menu.type')"
@@ -20,12 +19,16 @@
       <el-form-item prop="name"
                     :label="$t('menu.name')">
         <el-input v-model="dataForm.name"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('menu.name')"></el-input>
       </el-form-item>
       <el-form-item v-if="dataForm.type === 0"
                     prop="menuCode"
                     :label="$t('menu.menuCode')">
         <el-input v-model="dataForm.menuCode"
+                  maxlength="50"
+                  show-word-limit
                   :placeholder="$t('menu.menuCode')"></el-input>
       </el-form-item>
       <el-form-item prop="parentName"
@@ -59,6 +62,8 @@
                     prop="url"
                     :label="$t('menu.url')">
         <el-input v-model="dataForm.url"
+                  maxlength="60"
+                  show-word-limit
                   :placeholder="$t('menu.url')"></el-input>
       </el-form-item>
       <el-form-item prop="sort"

src/views/modules/sys/params-add-or-update.vue

@@ -1,14 +1,23 @@
 <template>
   <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="120px">
+    <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" :placeholder="$t('params.paramCode')"></el-input>
+        <el-input v-model="dataForm.paramCode"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('params.paramCode')"></el-input>
       </el-form-item>
       <el-form-item prop="paramValue" :label="$t('params.paramValue')">
-        <el-input v-model="dataForm.paramValue" :placeholder="$t('params.paramValue')"></el-input>
+        <el-input v-model="dataForm.paramValue"
+                  maxlength="50"
+                  show-word-limit
+                  :placeholder="$t('params.paramValue')"></el-input>
       </el-form-item>
       <el-form-item prop="remark" :label="$t('params.remark')">
-        <el-input v-model="dataForm.remark" :placeholder="$t('params.remark')"></el-input>
+        <el-input v-model="dataForm.remark"
+                  maxlength="100"
+                  show-word-limit
+                  :placeholder="$t('params.remark')"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">

src/views/modules/sys/params.vue

@@ -6,10 +6,10 @@
           <el-input v-model="dataForm.paramCode" :placeholder="$t('params.paramCode')" clearable @keyup.native="btKeyUpParamCode"></el-input>
         </el-form-item> 
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:params:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:params:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:params:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>

src/views/modules/sys/totalconfig-add-or-update.vue

@@ -1,11 +1,17 @@
 <template>
   <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 :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
         <el-form-item label="统计名称" prop="totalName">
-            <el-input v-model="dataForm.totalName" placeholder="统计名称"></el-input>
+            <el-input v-model="dataForm.totalName"
+                      maxlength="50"
+                      show-word-limit
+                      placeholder="统计名称"></el-input>
         </el-form-item>
         <el-form-item label="统计类型" prop="totalType">
-          <el-input v-model="dataForm.totalType" placeholder="统计类型（自定义）"></el-input>
+          <el-input v-model="dataForm.totalType"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="统计类型（自定义）"></el-input>
         </el-form-item>
         <el-form-item label="统计方式" prop="totalStyle">
             <el-select v-model="dataForm.totalStyle" placeholder="统计方式" clearable>
@@ -15,7 +21,10 @@
             </el-select>
         </el-form-item>
         <el-form-item label="统计规格" prop="spec">
-            <el-input v-model="dataForm.spec" placeholder="统计规格"></el-input>
+            <el-input v-model="dataForm.spec"
+                      maxlength="50"
+                      show-word-limit
+                      placeholder="统计规格"></el-input>
         </el-form-item>
         <el-form-item prop="sort" label="排序">
             <el-input-number

src/views/modules/sys/totalconfig-list.vue

@@ -25,10 +25,10 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+            <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+            <el-button v-if="$hasPermission('workRecord:totalconfig:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           </el-form-item>
         </div>
       </el-form>

src/views/modules/sys/user-add-or-update.vue

@@ -6,11 +6,12 @@
     <el-form :model="dataForm"
              :rules="dataRule"
              ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()"
              label-width="120px">
       <el-form-item prop="username"
                     :label="$t('user.username')">
         <el-input v-model="dataForm.username"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.username')"></el-input>
       </el-form-item>
       <el-form-item prop="deptName"
@@ -51,6 +52,8 @@
                     :class="{ 'is-required': !dataForm.id }">
         <el-input v-model="dataForm.password"
                   type="password"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.password')"></el-input>
       </el-form-item>
       <el-form-item prop="comfirmPassword"
@@ -58,11 +61,15 @@
                     :class="{ 'is-required': !dataForm.id }">
         <el-input v-model="dataForm.comfirmPassword"
                   type="password"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.comfirmPassword')"></el-input>
       </el-form-item>
       <el-form-item prop="realName"
                     :label="$t('user.realName')">
         <el-input v-model="dataForm.realName"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.realName')"></el-input>
       </el-form-item>
       <el-form-item prop="gender"
@@ -76,11 +83,15 @@
       <el-form-item prop="email"
                     :label="$t('user.email')">
         <el-input v-model="dataForm.email"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.email')"></el-input>
       </el-form-item>
       <el-form-item prop="mobile"
                     :label="$t('user.mobile')">
         <el-input v-model="dataForm.mobile"
+                  maxlength="30"
+                  show-word-limit
                   :placeholder="$t('user.mobile')"></el-input>
       </el-form-item>
       <el-form-item prop="roleIdList"

src/views/modules/sys/user.vue

@@ -16,10 +16,10 @@
           <el-input v-model="dataForm.mobile" placeholder="手机号" clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListSearch()" type="primary">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:save')" type="success" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>