From 3dde5d15f2e19de6a77ea60bbb70f77ad6358cba Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 17 Sep 2020 17:25:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B8=82=E5=8C=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=E8=87=B3=E5=AE=89=E5=AE=81=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E5=85=B8=E5=9E=8B=E6=A1=88=E4=BE=8B=E3=80=81=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=81=E6=95=B0=E6=8D=AE=E7=AB=AF=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E3=80=91-=E7=8E=8B=E5=85=AC?=
 =?UTF-8?q?=E5=B3=B0-2020-09-17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/api/scanswitch-add-or-update.vue  | 13 +++--
 src/views/modules/api/scanswitch.vue          | 17 +++++-
 .../case/typicalcase-add-or-update.vue        | 14 ++---
 src/views/modules/case/typicalcase-list.vue   | 57 +++++++++++--------
 .../modules/events/category-add-or-update.vue | 14 ++---
 src/views/modules/events/category.vue         | 11 ++--
 .../organize/deptofficer-add-or-update.vue    |  2 +-
 .../modules/organize/deptofficer-add.vue      |  4 +-
 src/views/modules/organize/deptofficer.vue    | 52 ++++++++++++-----
 src/views/modules/organize/metasysdept.vue    | 10 +++-
 .../organize/metasysdeptManagement.vue        |  4 +-
 .../modules/organize/sysdeptmanagement.vue    | 15 +++--
 .../modules/user/usertag-add-or-update.vue    |  2 -
 src/views/modules/user/usertag.vue            |  5 +-
 14 files changed, 140 insertions(+), 80 deletions(-)

diff --git a/src/views/modules/api/scanswitch-add-or-update.vue b/src/views/modules/api/scanswitch-add-or-update.vue
index 63c9b01..69204a4 100644
--- a/src/views/modules/api/scanswitch-add-or-update.vue
+++ b/src/views/modules/api/scanswitch-add-or-update.vue
@@ -6,21 +6,21 @@
     <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="versionNum">
         <el-input v-model="dataForm.versionNum"
-                  placeholder="版本号"></el-input>
+                  placeholder="版本号"
+                  maxlength="20" style="width:50%"></el-input>
       </el-form-item>
       <el-form-item label="扫码开关" prop="scanFlag">
-        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关">
+        <el-select v-model="dataForm.scanFlag" placeholder="扫码开关" style="width:50%">
           <el-option v-for="item in scanFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="维护状态" prop="maintainFlag">
-        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态">
+      <el-form-item label="维护状态" prop="maintainFlag" >
+        <el-select v-model="dataForm.maintainFlag" placeholder="维护状态" style="width:50%">
           <el-option v-for="item in maintainFlagArr" :key="item.maintainValue" :label="item.maintainName" :value="item.maintainValue">
           </el-option>
         </el-select>
@@ -28,7 +28,8 @@
       <el-form-item label="维护信息"
                     prop="maintainInfo">
         <el-input v-model="dataForm.maintainInfo"
-                  placeholder="维护信息"></el-input>
+                  placeholder="维护信息"
+                  maxlength="200"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/api/scanswitch.vue b/src/views/modules/api/scanswitch.vue
index f74ba76..50d861f 100644
--- a/src/views/modules/api/scanswitch.vue
+++ b/src/views/modules/api/scanswitch.vue
@@ -4,14 +4,14 @@
     <div class="mod-api__scanswitch}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataList()">
+               @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-input v-model="dataForm.id"
                     placeholder="id"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary"
@@ -31,31 +31,42 @@
                          header-align="center"
                          align="center"
                          width="50"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column> 
         <el-table-column prop="versionNum"
                          label="版本号"
                          header-align="center"
-                         align="center"></el-table-column>
+                         align="center"
+                         width="120"
+                         show-overflow-tooltip></el-table-column>
         <el-table-column prop="scanFlag"
                          label="开关状态"
                          header-align="center"
                          align="center"
+                         width="120"
                          :formatter="stateFormat"></el-table-column>
         <el-table-column prop="maintainFlag"
                          label="维护状态"
                          header-align="center"
                          align="center"
+                         width="120"
                          :formatter="maintainStateFormat"></el-table-column>
         <el-table-column prop="maintainInfo"
                          label="维护信息"
                          header-align="center"
+                         min-width="400"
+                         show-overflow-tooltip
                          align="center"></el-table-column>
         <el-table-column prop="createdTime"
                          label="创建时间"
                          header-align="center"
+                         width="180"
                          align="center"></el-table-column>
         <el-table-column prop="updatedTime"
                          label="更新时间"
                          header-align="center"
+                         width="180"
                          align="center"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
diff --git a/src/views/modules/case/typicalcase-add-or-update.vue b/src/views/modules/case/typicalcase-add-or-update.vue
index 6a59bc7..6f838ee 100644
--- a/src/views/modules/case/typicalcase-add-or-update.vue
+++ b/src/views/modules/case/typicalcase-add-or-update.vue
@@ -7,7 +7,7 @@
                      ref="dataForm"
                      :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
                 <el-row>
-                    <el-form-item label="banner：" v-loading="loading" prop="mainPicture">
+                    <el-form-item label="banner" v-loading="loading" prop="mainPicture">
                         <el-upload class="avatar-uploader"
                                    :action="uploadUrl"
                                    :show-file-list="false"
@@ -25,7 +25,7 @@
                     </el-form-item>
                 </el-row>
                 <el-row>
-                    <el-form-item label="案例标题：" prop="caseTitle">
+                    <el-form-item label="案例标题" prop="caseTitle">
                         <el-input v-model="dataForm.caseTitle" type="text"
                                   maxlength="40"
                                   show-word-limit
@@ -35,7 +35,7 @@
                     </el-form-item>
                 </el-row>
                 <el-row>
-                    <el-form-item label="摘要：" prop="typicalAbstract">
+                    <el-form-item label="摘要" prop="typicalAbstract">
                         <el-input  v-model="dataForm.typicalAbstract" placeholder="文本输入框，限制200字内" type="textarea"
                                    style="width:500px"
                                    maxlength="200"
@@ -44,9 +44,9 @@
                 </el-row>
                 <el-row>
                     <div v-for="(item, index) in dataForm.dynamicItem" :key="index">
-                        <div style="text-align: left">{{"案例"+(index+1)}}</div>
+                        <div style="text-align: left; font-weight: bold; height:40px; font-size:15px;">{{"案例"+(index+1)+"："}}</div>
                         <el-row>
-                            <el-form-item label="案例来源："
+                            <el-form-item label="案例来源"
                                           prop="caseSource">
                                 <el-input v-model="item.caseSource"
                                           :disabled="true"
@@ -59,7 +59,7 @@
                             </el-form-item>
                         </el-row>
                         <el-row>
-                            <el-form-item label="案例类型："prop="associatedType">
+                            <el-form-item label="案例类型" prop="associatedType">
                                 <el-select v-model="item.associatedType" :disabled="true">
                                     <el-option label="议题" value="0"></el-option>
                                     <el-option label="项目" value="1"></el-option>
@@ -68,7 +68,7 @@
                             </el-form-item>
                         </el-row>
                         <el-row>
-                            <el-form-item label="内容描述：" prop="contentDescription">
+                            <el-form-item label="内容描述" prop="contentDescription">
                                 <el-upload ref="upload"
                                            :action="uploadUrl"
                                            id ="quill-upload"
diff --git a/src/views/modules/case/typicalcase-list.vue b/src/views/modules/case/typicalcase-list.vue
index ec7c29e..fa8b1c1 100644
--- a/src/views/modules/case/typicalcase-list.vue
+++ b/src/views/modules/case/typicalcase-list.vue
@@ -1,18 +1,20 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__typicalcase}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item label="案例标题">
-          <el-input v-model="dataForm.caseTitle" placeholder="请输入" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="优秀案例标题" label-width="100px">
+          <el-input v-model="dataForm.caseTitle" placeholder="请输入" clearable style="width:230px;"  @keyup.native="btKeyUpCaseTitle"></el-input>
         </el-form-item>
-          <el-form-item label="时间"
-                        prop="startTime">
+        <div>
+          <el-form-item label="创建时间" prop="startTime" label-width="100px">
               <el-date-picker v-model="dataForm.startTime"
                               type="date"
                               :picker-options="pickerBeginDateBefore"
                               value-format="yyyy-MM-dd"
                               format="yyyy-MM-dd"
-                              placeholder="选择日期时间">
+                              placeholder="选择日期时间"
+                              style="width:230px;"
+                              @change="changeTime">
               </el-date-picker>
           </el-form-item>
           <el-form-item label="至"
@@ -23,27 +25,28 @@
                               :picker-options="pickerBeginDateAfter"
                               value-format="yyyy-MM-dd"
                               format="yyyy-MM-dd"
-                              placeholder="选择日期时间">
+                              placeholder="选择日期时间"
+                              style="width:230px;"
+                              @change="changeTime">
               </el-date-picker>
           </el-form-item>
         <!--查询按钮-->
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
-      </el-form>
-      <el-form>
         <!--添加按钮-->
         <el-form-item>
           <el-button type="primary" @click="addHandle()">{{"新增典型案例"}}</el-button>
         </el-form-item>
+        </div>
       </el-form>
       <!-- 列表-->
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index"  header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="caseTitle" label="优秀案例标题" min-width="400" show-overflow-tooltip header-align="center" align="left"></el-table-column>
-        <el-table-column prop="state" label="状态" width="60" :formatter="formatState" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="caseNumber" label="优秀案例数" width="100" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" width="180" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="caseTitle" label="优秀案例标题" header-align="center" align="center" min-width="200" show-overflow-tooltip title="caseTitle"></el-table-column>
+        <el-table-column prop="state" label="状态" :formatter="formatState" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="caseNumber" label="优秀案例数" header-align="center" align="center" width="100"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" width=“180“></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('case:actbanner:grounding')" type="text" size="small" @click="changeGroundingHandle(scope.row)">{{ changeGroundingText(scope.row.state) }}</el-button>
@@ -89,20 +92,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()
             }
+          }
         }
     }
   },
@@ -158,7 +161,11 @@ export default {
                 })
             }).catch(() => {})
         }).catch(() => {})
-    }, 1000, { 'leading': true, 'trailing': false })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    btKeyUpCaseTitle(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      this.dataForm.caseTitle= e.target.value
+    }
   }
 }
 </script>
diff --git a/src/views/modules/events/category-add-or-update.vue b/src/views/modules/events/category-add-or-update.vue
index d357ad3..f40c144 100644
--- a/src/views/modules/events/category-add-or-update.vue
+++ b/src/views/modules/events/category-add-or-update.vue
@@ -1,11 +1,8 @@
 <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="categoryName" label="分类名称">
-        <el-input v-model="dataForm.categoryName" placeholder="分类名称"></el-input>
-      </el-form-item>
-      <el-form-item prop="categoryCode" label="分类编码">
-        <el-input v-model="dataForm.categoryCode" placeholder="分类编码"></el-input>
+        <el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="500"></el-input>
       </el-form-item>
       <el-form-item prop="parentName" label="上级分类" class="category-list">
         <el-popover v-model="categoryListVisible" ref="categoryListPopover" placement="bottom-start" trigger="click">
@@ -23,14 +20,17 @@
           <i v-if="dataForm.pid !== '0'" slot="suffix" @click.stop="categoryListTreeSetDefaultHandle()" class="el-icon-circle-close el-input__icon"></i>
         </el-input>
       </el-form-item>
+      <el-form-item prop="categoryCode" label="分类编码">
+        <el-input v-model="dataForm.categoryCode" placeholder="分类编码" maxlength="50" style="width:200px"></el-input>
+      </el-form-item>
       <el-form-item label="分类类型" prop="categoryType">
-        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型">
+        <el-select v-model="dataForm.categoryType" @change="changeOrgType" placeholder="分类类型" style="width:200px">
           <el-option v-for="item in secondOrgDictList" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item prop="sort" label="排序">
-        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序"></el-input-number>
+        <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" label="排序" style="width:200px"></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">
diff --git a/src/views/modules/events/category.vue b/src/views/modules/events/category.vue
index 22572e4..00ebad0 100644
--- a/src/views/modules/events/category.vue
+++ b/src/views/modules/events/category.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
           <el-button v-if="$hasPermission('events:category:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -20,9 +20,12 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
-        <table-tree-column prop="categoryName" :label="$t('dept.name')" header-align="center"></table-tree-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column> 
+        <table-tree-column prop="categoryName" :label="$t('dept.name')" header-align="center" min-width="180"></table-tree-column>
+        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center" show-overflow-tooltip ></el-table-column>
+        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80" show-overflow-tooltip ></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('events:category:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
diff --git a/src/views/modules/organize/deptofficer-add-or-update.vue b/src/views/modules/organize/deptofficer-add-or-update.vue
index d618afc..a89e11c 100644
--- a/src/views/modules/organize/deptofficer-add-or-update.vue
+++ b/src/views/modules/organize/deptofficer-add-or-update.vue
@@ -112,6 +112,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -148,7 +149,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
             }
diff --git a/src/views/modules/organize/deptofficer-add.vue b/src/views/modules/organize/deptofficer-add.vue
index e6faf46..d101d5d 100644
--- a/src/views/modules/organize/deptofficer-add.vue
+++ b/src/views/modules/organize/deptofficer-add.vue
@@ -1,6 +1,6 @@
 <template>
   <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 :model="dataForm" :rules="dataRule" ref="dataForm" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="姓名" prop="name">
           <el-input v-model="dataForm.name" placeholder="姓名" maxlength="10" style="width:75%"></el-input>
       </el-form-item>
@@ -115,6 +115,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -151,7 +152,6 @@ export default {
             type: 'success',
             duration: 500,
             onClose: () => {
-              this.isAble = false
               this.visible = false
               this.$emit('refreshDataList')
             }
diff --git a/src/views/modules/organize/deptofficer.vue b/src/views/modules/organize/deptofficer.vue
index 87a47db..1ab2eeb 100644
--- a/src/views/modules/organize/deptofficer.vue
+++ b/src/views/modules/organize/deptofficer.vue
@@ -1,15 +1,16 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__deptofficer}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
         <el-form-item>
           <el-button type="primary" @click="backToDeptList">返回</el-button>
         </el-form-item>
         </div>
         <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名" clearable></el-input>
+          <el-input v-model="dataForm.name" placeholder="姓名" clearable @keyup.native="btKeyUpName" style="width:250px;"></el-input>
         </el-form-item>
+        <br>
         <el-form-item label="时间"
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
@@ -17,7 +18,8 @@
                           :picker-options="pickerBeginDateBefore"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px;" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -28,11 +30,12 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px;" @change="changeTime">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <!-- <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
@@ -51,13 +54,13 @@
                 {{scope.$index+1}}
             </template>
         </el-table-column>
-        <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <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="name" label="姓名" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" width="100" :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="position" label="职位" header-align="center" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile" label="联系方式" header-align="center" align="center" width="180"></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 prop="createdTime" label="创建时间" header-align="center" align="center" width="180"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
@@ -97,9 +100,28 @@ export default {
         exportURL: '/cloudAnalysis/deptofficer/export'
       },
       dataForm: {
-        id: ''
+        id: '',
+        name:'',
+        startTime:"",
+        endTime:''
+      },
+      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()
+          }
+        }
       },
-      deptofficerAddVisible: false
     }
   },
   mounted () {
@@ -129,6 +151,10 @@ export default {
         this.$refs.deptofficerAdd.dataForm.deptId = deptId
         this.$refs.deptofficerAdd.init()
       })
+    },
+   btKeyUpName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      this.dataForm.name= e.target.value
     }
   }
 }
diff --git a/src/views/modules/organize/metasysdept.vue b/src/views/modules/organize/metasysdept.vue
index 5dc608d..5a63400 100644
--- a/src/views/modules/organize/metasysdept.vue
+++ b/src/views/modules/organize/metasysdept.vue
@@ -1,17 +1,17 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__metasysdept}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div v-if="dataForm.pid != 0">
         <el-form-item>
           <el-button type="primary" @click="backToDeptList">返回</el-button>
         </el-form-item>
         </div>
         <el-form-item label="组织架构名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
+          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $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('sys:metasysdept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
@@ -75,6 +75,10 @@ export default {
     manageHandle (deptId, pid) {
       this.$parent.selectComponent = 'Deptofficer'
       this.$router.push({ path: '/organize-organizedeptroute', query: { deptId: deptId } })
+    },
+    btKeyUpName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      this.dataForm.name= e.target.value
     }
   }
 }
diff --git a/src/views/modules/organize/metasysdeptManagement.vue b/src/views/modules/organize/metasysdeptManagement.vue
index 2398f07..58609be 100644
--- a/src/views/modules/organize/metasysdeptManagement.vue
+++ b/src/views/modules/organize/metasysdeptManagement.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__metasysdept}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div v-if="dataForm.pid != 0">
         <el-form-item>
           <el-button type="primary" @click="backToDeptList">返回</el-button>
@@ -11,7 +11,7 @@
           <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
diff --git a/src/views/modules/organize/sysdeptmanagement.vue b/src/views/modules/organize/sysdeptmanagement.vue
index e29ad5d..485a731 100644
--- a/src/views/modules/organize/sysdeptmanagement.vue
+++ b/src/views/modules/organize/sysdeptmanagement.vue
@@ -1,12 +1,12 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="组织架构名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable></el-input>
+          <el-input v-model="dataForm.name" placeholder="组织架构名称" clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="danger" @click="deptUpdate()">同步</el-button>
@@ -18,7 +18,7 @@
             {{scope.$index+1}}
           </template>
         </el-table-column>
-        <table-tree-column prop="name" :label="$t('dept.name')" header-align="center"></table-tree-column>
+        <table-tree-column prop="name" label="组织架构名称" header-align="center"></table-tree-column>
         <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
@@ -50,6 +50,9 @@ export default {
     return {
       mixinViewModuleOptions: {
         getDataListURL: '/cloudAnalysis/metaSysdeptManager/list'
+      },
+      dataForm:{
+        name:''
       }
     }
   },
@@ -86,6 +89,10 @@ export default {
           })
         }).catch(() => { })
       }).catch(() => { })
+    },
+   btKeyUpName(e){
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+      this.dataForm.name= e.target.value
     }
   }
 }
diff --git a/src/views/modules/user/usertag-add-or-update.vue b/src/views/modules/user/usertag-add-or-update.vue
index 48d7bdc..68b70f1 100644
--- a/src/views/modules/user/usertag-add-or-update.vue
+++ b/src/views/modules/user/usertag-add-or-update.vue
@@ -6,7 +6,6 @@
     <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="tagName">
@@ -26,7 +25,6 @@
                     prop="tagDesc">
         <el-input v-model="dataForm.tagDesc"
                   maxlength="100"
-                  show-word-limit
                   placeholder="标签描述"></el-input>
       </el-form-item>
     </el-form>
diff --git a/src/views/modules/user/usertag.vue b/src/views/modules/user/usertag.vue
index bfd288d..c1de2f7 100644
--- a/src/views/modules/user/usertag.vue
+++ b/src/views/modules/user/usertag.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__usertag}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
@@ -17,6 +17,9 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+         <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
         <el-table-column prop="tagName" label="标签名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tagCode" label="标签编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="tagDesc" label="标签描述" header-align="center" align="center"></el-table-column>