From 0eccb1653b29f3bc78458e0409fffbe6c8312345 Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Mon, 7 Sep 2020 16:31:47 +0800
Subject: [PATCH] =?UTF-8?q?20200907=20zjt=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PersonScoreManageDeduction.vue                  |  4 ++--
 .../personScoreManage/PersonScoreManageGrade.vue    | 13 ++++++++++++-
 src/views/par/scoreManage/ScoreManageDeduction.vue  |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/views/par/personScoreManage/PersonScoreManageDeduction.vue b/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
index b4966c7..e44931e 100644
--- a/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     title="选择考评内容"
-    style="top: 100px;"
+    style="top: 100px"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -10,7 +10,7 @@
     :maskClosable="false"
   >
     <!-- 记差错 -->
-    <a-card :bordered="false">
+    <a-card :bordered="false" style="height:450px;overflow-y:auto">
       <a-table
         :columns="deductionColumns"
         :data-source="deductionLoadData"
diff --git a/src/views/par/personScoreManage/PersonScoreManageGrade.vue b/src/views/par/personScoreManage/PersonScoreManageGrade.vue
index 6a40bb1..dd863a9 100644
--- a/src/views/par/personScoreManage/PersonScoreManageGrade.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageGrade.vue
@@ -63,12 +63,23 @@
             <a-col :span="5">
               <a-input-number
                 style="width:80%"
-                :min="-11111"
+                :min="0"
                 :max="999999"
                 :precision="0"
                 :id="item.key+''"
                 :defaultValue="item.pf"
+                v-if="item.kpd.indexOf('加') >= 0"
               />
+              <a-input-number
+                style="width:80%"
+                :max="0"
+                :precision="0"
+                :id="item.key+''"
+                :defaultValue="item.pf"
+                v-else
+              />
+              <span style="float:right;margin-right:60px;font-size:12px;height: 20px;color: red;" v-if="item.kpd.indexOf('加') >= 0">注：只允许输入正数或0</span>
+              <span style="float:right;margin-right:60px;font-size:12px;height: 20px;color: red;" v-else>注：只允许输入负数或0</span>
             </a-col>
           </a-row>
         </a-list-item>
diff --git a/src/views/par/scoreManage/ScoreManageDeduction.vue b/src/views/par/scoreManage/ScoreManageDeduction.vue
index 169e7c9..565ea0e 100644
--- a/src/views/par/scoreManage/ScoreManageDeduction.vue
+++ b/src/views/par/scoreManage/ScoreManageDeduction.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     title="选择考评内容"
-    style="top: 100px;"
+    style="top: 100px"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -10,7 +10,7 @@
     :maskClosable="false"
   >
     <!-- 记差错 -->
-    <a-card :bordered="false">
+    <a-card :bordered="false" style="height:450px;overflow-y:auto">
       <a-table
         :columns="deductionColumns"
         :data-source="deductionLoadData"
-- 
Gitee