From 86196eb5fb7b965009a3621200ed9ad16ff25ad2 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Fri, 24 Jul 2020 16:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90PC=E7=AB=AF=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A1=86=E6=AD=A3=E5=88=99=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-07-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/contentSecurity/checkrecords.vue  | 15 +++++++-----
 .../contentSecurity/violationsrecords.vue     | 23 +++++++++++--------
 src/views/modules/custom/epidemic.vue         |  4 ++--
 src/views/modules/group/leaderboard.vue       |  4 ++--
 src/views/modules/kpi/kpipublicopinion.vue    |  4 ++--
 src/views/modules/kpi/kpitypicalculture.vue   | 14 ++++++-----
 src/views/modules/kpi/resultSuperior.vue      |  6 ++---
 src/views/modules/organize/deptofficer.vue    | 19 ++++++++-------
 src/views/modules/organize/metasysdept.vue    |  4 ++--
 9 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/views/modules/contentSecurity/checkrecords.vue b/src/views/modules/contentSecurity/checkrecords.vue
index dde37fbc..43bdfbb3 100644
--- a/src/views/modules/contentSecurity/checkrecords.vue
+++ b/src/views/modules/contentSecurity/checkrecords.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__checkrecords}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-          <el-form-item label="用户名" prop="name" label-width="90px">
+          <el-form-item label="用户名" prop="name" label-width="75px">
             <el-input v-model="dataForm.name" placeholder="用户名" clearable maxlength="10" @keyup.native="btKeyUpName" style="width:200px"></el-input>
           </el-form-item>
           <el-form-item label="内容" prop="content" label-width="90px">
@@ -11,7 +11,8 @@
           <el-form-item label="功能模块" prop="module" label-width="90px">
             <el-input v-model="dataForm.module" placeholder="功能模块" clearable maxlength="10" @keyup.native="btKeyUpModule" style="width:200px"></el-input>
           </el-form-item>
-          <el-form-item label="手机号" prop="mobile" label-width="90px">
+          <br>
+          <el-form-item label="手机号" prop="mobile" label-width="75px">
             <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="10" @keyup.native="btKeyUpMobile" style="width:200px"></el-input>
           </el-form-item>
           <el-form-item label="审核状态" prop="suggestion" label-width="90px">
@@ -26,15 +27,16 @@
               <el-option label="异常" value="1"> </el-option>
             </el-select>
           </el-form-item>
-
+        <br>
         <el-form-item label="时间"
-                      prop="startTime" label-width="90px">
+                      prop="startTime" label-width="75px">
           <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:200px">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -45,7 +47,8 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:200px">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
diff --git a/src/views/modules/contentSecurity/violationsrecords.vue b/src/views/modules/contentSecurity/violationsrecords.vue
index 786dc443..fb4412bd 100644
--- a/src/views/modules/contentSecurity/violationsrecords.vue
+++ b/src/views/modules/contentSecurity/violationsrecords.vue
@@ -3,19 +3,20 @@
     <div class="mod-news__violationsrecords}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
 
-          <el-form-item label="用户名" prop="name" label-width="90px">
+          <el-form-item label="用户名" prop="name" label-width="75px">
             <el-input v-model="dataForm.name" placeholder="用户名" clearable maxlength="10" @keyup.native="btKeyUpName" style="width:200px"></el-input>
           </el-form-item>
+          <el-form-item label="功能模块" prop="module" label-width="90px">
+                  <el-input v-model="dataForm.module" placeholder="功能模块" clearable maxlength="10" @keyup.native="btKeyUpModule" style="width:200px"></el-input>
+              </el-form-item>
           <el-form-item label="内容" prop="content" label-width="70px">
             <el-input v-model="dataForm.content" placeholder="内容" clearable maxlength="20" @keyup.native="btKeyUpContent" style="width:200px"></el-input>
           </el-form-item>
-              <el-form-item label="功能模块" prop="module" label-width="90px">
-                  <el-input v-model="dataForm.module" placeholder="功能模块" clearable maxlength="10" @keyup.native="btKeyUpModule" style="width:200px"></el-input>
-              </el-form-item>
-              <el-form-item label="手机号" prop="mobile" label-width="90px">
+              <br>
+              <el-form-item label="手机号" prop="mobile" label-width="75px">
                   <el-input v-model="dataForm.mobile" placeholder="手机号" clearable maxlength="10" @keyup.native="btKeyUpMobile" style="width:200px"></el-input>
               </el-form-item>
-        <el-form-item label="判定方式" prop="decision" label-width="70px">
+        <el-form-item label="判定方式" prop="decision" label-width="90px">
           <el-select v-model="dataForm.decision" placeholder="请选择" clearable>
             <el-option label="系统判定" value="1"> </el-option>
             <el-option label="人工审核" value="2"> </el-option>
@@ -23,14 +24,15 @@
         </el-form-item>
 
           <div>
-        <el-form-item label="时间"
-                      prop="startTime" label-width="90px">
+        <el-form-item label="提交时间"
+                      prop="startTime" label-width="75px">
           <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:200px">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -41,7 +43,8 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:200px">
           </el-date-picker>
         </el-form-item>
 
diff --git a/src/views/modules/custom/epidemic.vue b/src/views/modules/custom/epidemic.vue
index 28f1f396..cc3e2789 100644
--- a/src/views/modules/custom/epidemic.vue
+++ b/src/views/modules/custom/epidemic.vue
@@ -3,7 +3,7 @@
     <div class="mod-custom__epidemic}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
-          <el-form-item label="区域" label-width="90px">
+          <el-form-item label="区域" label-width="80px">
             <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px">
             </el-cascader>
           </el-form-item>
@@ -13,7 +13,7 @@
         <div class="block">
           <el-form-item label="提交时间"
                         prop="startTime"
-                        label-width="90px">
+                        label-width="80px">
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
                             :picker-options="pickerBeginDateBefore"
diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue
index 2bdf9b62..90a42014 100644
--- a/src/views/modules/group/leaderboard.vue
+++ b/src/views/modules/group/leaderboard.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-news__topic}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
-        <el-form-item label="所属机构" label-width="90px">
+        <el-form-item label="所属机构" label-width="80px">
           <el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" clearable style="width:250px">
           </el-cascader>
         </el-form-item>
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="时间" label-width="90px" 
+        <el-form-item label="时间" label-width="80px" 
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
diff --git a/src/views/modules/kpi/kpipublicopinion.vue b/src/views/modules/kpi/kpipublicopinion.vue
index 16217601..8980a58b 100644
--- a/src/views/modules/kpi/kpipublicopinion.vue
+++ b/src/views/modules/kpi/kpipublicopinion.vue
@@ -3,7 +3,7 @@
     <div class="mod-kpi__kpipublicopinion}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item>
-          <el-form-item label="部门" label-width="90px">
+          <el-form-item label="部门名称" label-width="80px">
             <el-cascader
               v-model="deptIdList"
               :options="options"
@@ -20,7 +20,7 @@
           </el-date-picker>
         </el-form-item>
         <br>
-        <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
+        <el-form-item label="部门类型" prop="deptTypeKey" label-width="80px">
           <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
diff --git a/src/views/modules/kpi/kpitypicalculture.vue b/src/views/modules/kpi/kpitypicalculture.vue
index 7464e370..bbaf4aeb 100644
--- a/src/views/modules/kpi/kpitypicalculture.vue
+++ b/src/views/modules/kpi/kpitypicalculture.vue
@@ -3,35 +3,37 @@
     <div class="mod-kpi__kpitypicalculture}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <div>
-        <el-form-item label="部门" label-width="90px">
+        <el-form-item label="部门名称" label-width="80px">
           <el-cascader
             v-model="deptIdList"
             :options="options"
             :props="{ checkStrictly: true }"
             filterable
             clearable
+            style="width:250px;"
           ></el-cascader>
         </el-form-item>
         <el-form-item label="考核周期起始年" label-width="110px">
           <el-date-picker v-model="dataForm.year"
               type="year" clearable placeholder="选择年"
-              value-format="yyyy"  format="yyyy">
+              value-format="yyyy"  format="yyyy"
+              style="width:250px;">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="部门类型" prop="deptTypeKey" label-width="90px">
-          <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable>
+          <el-select v-model="dataForm.deptTypeKey" placeholder="部门类型" clearable style="width:250px;">
             <el-option v-for="item in paramNameArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" ></el-option>
           </el-select>
         </el-form-item>
         </div>
-        <el-form-item label="加分类别" prop="bonusCategory" label-width="90px">
-            <el-select v-model="dataForm.bonusCategory" placeholder="加分类别" clearable>
+        <el-form-item label="加分类别" prop="bonusCategory" label-width="80px">
+            <el-select v-model="dataForm.bonusCategory" placeholder="加分类别" clearable style="width:250px;">
               <el-option v-for="item in bonusCategoryArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="加分级别" prop="bonusLevel" label-width="110px">
-            <el-select v-model="dataForm.bonusLevel" placeholder="加分级别" clearable>
+            <el-select v-model="dataForm.bonusLevel" placeholder="加分级别" clearable style="width:250px;">
               <el-option v-for="item in bonusLevelArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue" >
               </el-option>
             </el-select>
diff --git a/src/views/modules/kpi/resultSuperior.vue b/src/views/modules/kpi/resultSuperior.vue
index 6cf78c6c..0793eb55 100644
--- a/src/views/modules/kpi/resultSuperior.vue
+++ b/src/views/modules/kpi/resultSuperior.vue
@@ -1,7 +1,7 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-kpi__kpiresultsuperior}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="所属机构">
           <el-cascader
             v-model="deptIdList"
@@ -17,10 +17,10 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="primary" @click="tableExport()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('kpi:gridResult:export')" type="success" @click="tableExport()">{{ $t('export') }}</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/deptofficer.vue b/src/views/modules/organize/deptofficer.vue
index a9d0eee8..4badd691 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="getDataListOverWrite()">
+      <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 @keyup.native="btKeyUpName"></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;">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="至"
@@ -28,15 +30,16 @@
                           :picker-options="pickerBeginDateAfter"
                           value-format="yyyy-MM-dd"
                           format="yyyy-MM-dd"
-                          placeholder="选择日期时间">
+                          placeholder="选择日期时间"
+                          style="width:250px;">
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataListOverWrite()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <!-- <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button> -->
-          <el-button type="primary" @click="deptofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
+          <el-button type="success" @click="deptofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
@@ -111,10 +114,6 @@ export default {
     deptofficerAdd
   },
   methods: {
-    getDataListOverWrite () {
-      this.page = 1
-      this.getDataList()
-    },
     showFlagFormat (row, column) {
       if (row.sex === '0') {
         return '女'
diff --git a/src/views/modules/organize/metasysdept.vue b/src/views/modules/organize/metasysdept.vue
index 82999ad1..71c8d42e 100644
--- a/src/views/modules/organize/metasysdept.vue
+++ b/src/views/modules/organize/metasysdept.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 @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" @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>