From 2d35c9ce43d2224c89f55e5e37b430d70693a0db Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Tue, 1 Sep 2020 14:56:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?20200901=20zjt=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E8=80=83=E8=AF=84=E7=AE=A1=E7=90=86=E9=83=A8=E9=97=A8=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8D=95=E4=BD=8D=E4=B8=8E=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/par/scoreManage/ScoreManageAdd.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/par/scoreManage/ScoreManageAdd.vue b/src/views/par/scoreManage/ScoreManageAdd.vue
index 81073d3..4735531 100644
--- a/src/views/par/scoreManage/ScoreManageAdd.vue
+++ b/src/views/par/scoreManage/ScoreManageAdd.vue
@@ -9,13 +9,6 @@
     @cancel="handleCancel"
   >
     <a-form :form="form" >
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评计划" >
-        <a-select v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]" @change="changePlan" style="width:360px">
-          <a-select-option v-for="d in planList" :value="d.id" :key="d.id">
-            {{ d.kpjhmc }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位" >
         <a-tree-select
           v-decorator="['kpr',{rules: [{ required: true, message: '请输入考评名称信息' }]}]"
@@ -28,6 +21,13 @@
           :treeCheckStrictly="true"
         />
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评计划" >
+        <a-select v-decorator="['kpjhbid',{rules: [{ required: true, message: '请选择考评计划信息' }]}]" @change="changePlan" style="width:360px">
+          <a-select-option v-for="d in planList" :value="d.id" :key="d.id">
+            {{ d.kpjhmc }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" >
         <a-select placeholder="请选择" v-decorator="['jcfs']" style="width:360px">
           <a-select-option :value="'1'" >四不两直检查</a-select-option>
-- 
Gitee


From c8ded69424d2e2225bb2ba077d53e3029eeeb590 Mon Sep 17 00:00:00 2001
From: T-95707 <zhujt@neuray.cn>
Date: Tue, 1 Sep 2020 16:30:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?20200901=20zjt=20=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E8=80=83=E8=AF=84=E7=AE=A1=E7=90=86=E9=83=A8=E9=97=A8=E4=B8=8E?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../par/personScoreManage/PersonScoreManageDeduction.vue      | 4 ++--
 src/views/par/personScoreManage/PersonScoreManageGrade.vue    | 2 +-
 src/views/par/personScoreManage/PersonScoreManageRecord.vue   | 1 +
 src/views/par/scoreManage/ScoreManageDeduction.vue            | 4 ++--
 src/views/par/scoreManage/ScoreManageGrade.vue                | 4 +++-
 src/views/par/scoreManage/ScoreManageRecord.vue               | 2 ++
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/par/personScoreManage/PersonScoreManageDeduction.vue b/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
index 6da4b3b..82904c9 100644
--- a/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageDeduction.vue
@@ -59,9 +59,9 @@ export default {
         { title: '考评总分', dataIndex: 'kpfs' },
         { title: '当前得分',
           dataIndex: 'dqdf',
-          customRender: function (attr1) {
+          customRender: function (attr1, record) {
             if (attr1 === undefined) {
-              return 0
+              return record.kpfs
             } else {
               return attr1
             }
diff --git a/src/views/par/personScoreManage/PersonScoreManageGrade.vue b/src/views/par/personScoreManage/PersonScoreManageGrade.vue
index b01acfa..59d2ca1 100644
--- a/src/views/par/personScoreManage/PersonScoreManageGrade.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageGrade.vue
@@ -53,7 +53,7 @@
         <a-list-item slot="renderItem" slot-scope="item, index">
           <a-row style="width:100%">
             <a-col :span="1">
-              <a-icon type="delete" @click="deleteItem(item)"/>
+              <a-icon type="delete" style="color:red" @click="deleteItem(item)"/>
             </a-col>
             <a-col :span="18">
               <span style="margin-left:-30px">
diff --git a/src/views/par/personScoreManage/PersonScoreManageRecord.vue b/src/views/par/personScoreManage/PersonScoreManageRecord.vue
index 5ecf213..684f1dd 100644
--- a/src/views/par/personScoreManage/PersonScoreManageRecord.vue
+++ b/src/views/par/personScoreManage/PersonScoreManageRecord.vue
@@ -206,6 +206,7 @@ export default {
       this.title = '记成效记差错'
       this.queryParam.kssj = record.kssj
       this.queryParam.jssj = record.jssj
+      this.queryParam.zxr = record.zxrCode
       this.getWorkInfo(this.queryParam)
       this.kpqueryParam.kpnrlx = '3'
       this.kpqueryParam.kpjhbid = record.kpjhbid
diff --git a/src/views/par/scoreManage/ScoreManageDeduction.vue b/src/views/par/scoreManage/ScoreManageDeduction.vue
index e95fadb..7cbc836 100644
--- a/src/views/par/scoreManage/ScoreManageDeduction.vue
+++ b/src/views/par/scoreManage/ScoreManageDeduction.vue
@@ -59,9 +59,9 @@ export default {
         { title: '考评总分', dataIndex: 'kpfs' },
         { title: '当前得分',
           dataIndex: 'dqdf',
-          customRender: function (attr1) {
+          customRender: function (attr1, record) {
             if (attr1 === undefined) {
-              return 0
+              return record.kpfs
             } else {
               return attr1
             }
diff --git a/src/views/par/scoreManage/ScoreManageGrade.vue b/src/views/par/scoreManage/ScoreManageGrade.vue
index a1f771f..cbcc885 100644
--- a/src/views/par/scoreManage/ScoreManageGrade.vue
+++ b/src/views/par/scoreManage/ScoreManageGrade.vue
@@ -53,7 +53,7 @@
         <a-list-item slot="renderItem" slot-scope="item, index">
           <a-row style="width:100%">
             <a-col :span="1">
-              <a-icon type="delete" @click="deleteItem(item)"/>
+              <a-icon type="delete" style="color:red" @click="deleteItem(item)"/>
             </a-col>
             <a-col :span="18">
               <span style="margin-left:-30px">
@@ -78,6 +78,8 @@
                 :defaultValue="item.pf"
                 v-else
               />
+              <span style="float:right;margin-right:60px;font-size:12px;height: 20px;color: red;" v-if="showFlag">注：只允许输入正数或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/ScoreManageRecord.vue b/src/views/par/scoreManage/ScoreManageRecord.vue
index 9544d41..553219b 100644
--- a/src/views/par/scoreManage/ScoreManageRecord.vue
+++ b/src/views/par/scoreManage/ScoreManageRecord.vue
@@ -204,6 +204,7 @@ export default {
       this.title = '加分'
       this.queryParam.kssj = record.kssj
       this.queryParam.jssj = record.jssj
+      this.queryParam.zxr = record.zxrCode
       this.getWorkInfo(this.queryParam)
       this.kpqueryParam.kpnrlx = '1'
       this.kpqueryParam.kpjhbid = record.kpjhbid
@@ -219,6 +220,7 @@ export default {
       this.title = '扣分'
       this.queryParam.kssj = record.kssj
       this.queryParam.jssj = record.jssj
+      this.queryParam.zxr = record.zxrCode
       this.getWorkInfo(this.queryParam)
       this.kpqueryParam.kpnrlx = '2'
       this.kpqueryParam.kpjhbid = record.kpjhbid
-- 
Gitee