From 24895d5463155d5fc85de38a37642822d9cb7379 Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 09:25:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamCate.vue |  4 ++--
 src/views/par/examPlan/ParExamItem.vue | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue
index 426c7e4..235f2ce 100644
--- a/src/views/par/examPlan/ParExamCate.vue
+++ b/src/views/par/examPlan/ParExamCate.vue
@@ -16,8 +16,8 @@
         :dataSource="cateList"
         :loading="loading"
         :rowKey="row => row.id"
-        :pagination="pagination"
-        @change="handleTableChange">
+        :pagination=false
+        >
         <span slot="action" slot-scope="text, record">
           <a @click="handlePermission(record)" v-if="!record.kpdl">制定考评项</a>
         </span>
diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index 5c80a5c..c6c9c36 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -1,8 +1,8 @@
 <template>
   <a-modal
     title="操作"
-    style="top: 100px;"
-    :width="800"
+    style="top: 100px;height: 500px"
+    :width="1000"
     v-model="editVisible"
     @ok="handleEditOk"
     @cancel="cancelHandel"
@@ -16,8 +16,7 @@
         :dataSource="itemList"
         :loading="loading"
         :rowKey="row => row.id"
-        :pagination="pagination"
-        @change="handleTableChange"
+        :pagination=false
         :rowSelection="{ selectedRowKeys: this.selectedRowKeys, onChange: this.onSelectChange }">
       </a-table>
     </a-card>
@@ -84,11 +83,13 @@ export default {
         },
         {
           title: '考评点',
-          dataIndex: 'kpd'
+          dataIndex: 'kpd',
+          ellipsis: true
         },
         {
           title: '评分标准',
-          dataIndex: 'kpbz'
+          dataIndex: 'kpbz',
+          ellipsis: true
         }
       ]
     }
-- 
Gitee


From 7c2622cec3d1474a13531789702a4d9504ed171f Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 09:37:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamCate.vue | 2 +-
 src/views/par/examPlan/ParExamItem.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue
index 235f2ce..63e586c 100644
--- a/src/views/par/examPlan/ParExamCate.vue
+++ b/src/views/par/examPlan/ParExamCate.vue
@@ -6,6 +6,7 @@
     v-model="editVisible"
     @ok="handleEditOk"
     @cancel="cancelHandel"
+    :bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
     :confirmLoading="confirmLoading"
   >
     <a-card :bordered="false">
@@ -157,5 +158,4 @@ export default {
 }
 </script>
 <style scoped>
-
 </style>
diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index c6c9c36..3769b89 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -1,11 +1,12 @@
 <template>
   <a-modal
     title="操作"
-    style="top: 100px;height: 500px"
+    style="top: 100px"
     :width="1000"
     v-model="editVisible"
     @ok="handleEditOk"
     @cancel="cancelHandel"
+    :bodyStyle="{ 'max-height': '500px', overflow: 'scroll' }"
     :confirmLoading="confirmLoading"
   >
     <a-card :bordered="false">
@@ -200,6 +201,5 @@ export default {
   }
 }
 </script>
-<style scoped>
-
+<style lang="less" scoped>
 </style>
-- 
Gitee


From 4e1f33a889945775c26b90b31216b6f86be861ff Mon Sep 17 00:00:00 2001
From: leewand <liwd@neuray.cn>
Date: Tue, 1 Sep 2020 14:15:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/examPlan/ParExamPlanPersonnel.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue
index a4ee871..8ee9d3b 100644
--- a/src/views/par/examPlan/ParExamPlanPersonnel.vue
+++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue
@@ -9,11 +9,8 @@
             </a-form-item>
           </a-col>
           <a-col :span="6" :offset="1">
-            <a-form-item label="单位类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select placeholder="请选择" v-model="queryParam.dwlx">
-                <a-select-option value="1">机关</a-select-option>
-                <a-select-option value="2">层级单位</a-select-option>
-              </a-select>
+            <a-form-item label="考评单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入" v-model="queryParam.kprName" />
             </a-form-item>
           </a-col>
         </a-row>
-- 
Gitee