From 96afbf4d12c586a6d2d9249c51c6105464579d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Mon, 2 Nov 2020 17:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |   4 +--
 src/utils/common.js                           |   6 ++++
 src/views/kpi/assessment/goals/index.vue      |  30 ++++++++++++++++--
 src/views/kpi/assessment/homeList/index.vue   |   2 +-
 .../performance/components/imgs/nojixiao.png  | Bin 0 -> 3663 bytes
 .../performance/components/table.vue          |  16 +++++++---
 .../kpi/assessment/performance/index.vue      |   2 +-
 src/views/kpi/set/index.vue                   |   5 ++-
 .../edit/components/Perform.vue               |  24 +++++++++++---
 .../edit/components/ScoreList.vue             |   3 +-
 .../edit/components/imgs/zhixing.png          | Bin 0 -> 3792 bytes
 .../edit/components/templateSet.vue           |  23 ++++++++++++--
 .../workbench/assessmentGroup/edit/index.vue  |   2 +-
 .../workbench/assessmentGroup/groundTable.vue |   2 +-
 14 files changed, 97 insertions(+), 22 deletions(-)
 create mode 100644 src/views/kpi/assessment/performance/components/imgs/nojixiao.png
 create mode 100644 src/views/kpi/workbench/assessmentGroup/edit/components/imgs/zhixing.png

diff --git a/src/main.js b/src/main.js
index 26d62d1..40475cf 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,7 @@ import store from './store'
 import './utils/elementConfig'
 import './utils/permission'
 import './style/index.less'
-import {debounce, departGetForm, personlGetForm} from '@/utils/common'
+import {debounce, departGetForm, personlGetForm, handleInput} from '@/utils/common'
 import '@/icons'
 import {
   format
@@ -19,7 +19,7 @@ Vue.prototype.$format = format
 Vue.prototype.debounce = debounce
 Vue.prototype.$personlGetForm = personlGetForm
 Vue.prototype.$departGetForm = departGetForm
-
+Vue.prototype.$handleInputInt = handleInput
 /* eslint-disable no-new */
 new Vue({
   el: '#app',
diff --git a/src/utils/common.js b/src/utils/common.js
index 08336af..c794c08 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -76,3 +76,9 @@ export function departGetForm (arr = []) {
   }
   return params
 }
+
+export function handleInput (form) {
+  let value = this[form.split('.')[0]][form.split('.')[1]]
+  if (value.split('.').length > 2) value = String(parseFloat(value))
+  this[form.split('.')[0]][form.split('.')[1]] = Number(value) > 100 ? 0 : value.replace(/[^.\d]/g, '')
+}
diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue
index 5e090d3..6125ec6 100644
--- a/src/views/kpi/assessment/goals/index.vue
+++ b/src/views/kpi/assessment/goals/index.vue
@@ -62,6 +62,14 @@
                       </div>
                   </div>
                   </draggable>
+                  <div style=" padding: 10px;font-size:16px;" class="commonFont">
+                    <div>
+                      业务指标权重：{{handleGetWeight(i)}}%/{{Math.round((i.weight * 100)*1000)/1000}}%
+                    </div>
+                    <div>
+                      所有指标总权重: {{ Math.round((obj.weight * 100)*1000)/1000}}%
+                    </div>
+                  </div>
                   <div style=" padding: 10px;">
                     <!-- <el-button size="mini"  plain>选择指标项</el-button> -->
                     <el-button  @click="hanidleEdit(i,-1,index)" size="mini" plain>增加指标项</el-button>
@@ -90,7 +98,7 @@
                     <el-input size="small" clearable  type="textarea"  v-model="formIndicators.keyResult"></el-input>
                   </el-form-item>
                    <el-form-item label="权重" prop="weight">
-                     <el-input size="small" clearable  v-model="formIndicators.checkWeight">
+                     <el-input size="small" @input="handleInput"  clearable  v-model="formIndicators.checkWeight">
                        <template slot="append">%</template>
                      </el-input>
                   </el-form-item>
@@ -165,11 +173,29 @@ export default {
     this.handleGetTbale()
   },
   methods: {
+    handleInput (value) {
+      if (value.split('.').length > 2) value = String(parseFloat(value))
+      this.formIndicators.checkWeight = Number(value) > 100 ? '' : value.replace(/[^.\d]/g, '')
+    },
+    handleGetWeight (arr) {
+      const weight = arr.detailDtos.reduce((num, i) => {
+        num += i.isDelete !== 1 ? i.checkWeight : 0
+        return num
+      }, 0)
+      arr.isTrue = weight === arr.weight
+      return Math.round((weight * 100) * 1000) / 1000
+    },
     async handleSaveDetail (params = this.obj) {
+      console.log('params: ', params)
+      for (let i in params.recortModelDtos) {
+        if (!params.recortModelDtos[i].isTrue) {
+          this.$message.error(params.recortModelDtos[i].name + '维度内的权重和必须为' + Math.round((params.recortModelDtos[i].weight * 100) * 1000) / 1000)
+          return
+        }
+      }
       let res = await apiSaveDetail(params)
       if (res.code !== 200) {
         this.$message.error(res.msg)
-        return
       }
       this.$message({
         message: res.msg,
diff --git a/src/views/kpi/assessment/homeList/index.vue b/src/views/kpi/assessment/homeList/index.vue
index e52a124..1f2cf95 100644
--- a/src/views/kpi/assessment/homeList/index.vue
+++ b/src/views/kpi/assessment/homeList/index.vue
@@ -15,7 +15,7 @@
               </el-select>
             </el-form-item>
             <el-form-item >
-              <el-input @change="handleChange" @keyup.enter="handleChange"   size="small"  clearable prefix-icon="el-icon-search" v-model="form.name" placeholder="搜索考核名称"></el-input>
+              <el-input  @change="handleChange" @keyup.enter="handleChange"   size="small"  clearable prefix-icon="el-icon-search" v-model="form.name" placeholder="搜索考核名称"></el-input>
             </el-form-item>
           </div>
           <div>
diff --git a/src/views/kpi/assessment/performance/components/imgs/nojixiao.png b/src/views/kpi/assessment/performance/components/imgs/nojixiao.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e72bf69d9745e17c877433bfedfb4c42666fc5d
GIT binary patch
literal 3663
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
PiVVj37JA=wp2z+VtVBG$

literal 0
HcmV?d00001

diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue
index 227e81e..c86ff84 100644
--- a/src/views/kpi/assessment/performance/components/table.vue
+++ b/src/views/kpi/assessment/performance/components/table.vue
@@ -1,6 +1,6 @@
 <template>
     <div class='table'>
-        <div class="table-list">
+        <div v-if="obj.recortModelDtos.length !== 0"  class="table-list commonFont">
           <div class="table-header">
             <div class="table-left">维度</div>
             <div class="table-header-flex name">名称</div>
@@ -10,12 +10,11 @@
             <div class="table-header-flex"  v-if="tableInfo.score">上级评分</div>
             <div class="table-header-flex"  v-if="tableInfo.score">评分说明</div>
           </div>
-          <div v-if="obj.recortModelDtos.length === 0"  class='listNone'>
-            <!-- -->
+          <!-- <div v-if="obj.recortModelDtos.length === 0"  class='listNone'>
                 <div>
                     暂无数据
                 </div>
-          </div>
+          </div> -->
           <div  v-for="(item,index) in obj.recortModelDtos" :key="index" class="table-content">
             <div class="table-content-left table-left">
               <!-- {{item.name}} -->
@@ -59,6 +58,12 @@
             </div>
           </div>
         </div>
+        <div v-else class='nojixiao'>
+          <img src="./imgs/nojixiao.png" alt="">
+          <div class="commonFont">
+            未制定绩效目标，暂无数据
+          </div>
+        </div>
 
         <div v-if="tableInfo.result || tableInfo.score" class="table-bottom">
                 <div class="table-bottom-content">
@@ -133,6 +138,9 @@ export default {
 }
 </script>
 <style lang='less' scoped>
+.nojixiao{
+  text-align: center;
+}
 .listNone{
   height: 100px;
   text-align: center;
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index b2d83e4..3359f35 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -14,7 +14,7 @@
       </div>
       <div class="performance-content-center">
         <div
-          class="performance-content-center-item"
+          class="performance-content-center-item commonFont"
           :class="{
                   active:i.isActive,
                   right:true,
diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue
index f3ececc..d7b6b12 100644
--- a/src/views/kpi/set/index.vue
+++ b/src/views/kpi/set/index.vue
@@ -11,7 +11,7 @@
       <el-menu-item index="0">考评组设置</el-menu-item>
       <el-menu-item index="1">默认值设置</el-menu-item>
     </el-menu>
-    <ground-table v-if="activeIndex==='0'"></ground-table>
+    <ground-table class="kaoping" v-if="activeIndex==='0'"></ground-table>
     <div v-else-if="activeIndex==='1'">
       <try-authority></try-authority>
     </div>
@@ -51,4 +51,7 @@ export default {
   padding-top: 0px;
   // min-height: 600px;
 }
+.kaoping{
+  padding: 20px 0 00 0;
+}
 </style>
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/Perform.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/Perform.vue
index 8ce4607..68f62e6 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/Perform.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/Perform.vue
@@ -1,7 +1,15 @@
 <!-- 执行中 -->
 <template>
-    <div>
-       执行中
+    <div class="zhixing">
+       <div class="zhixing-center">
+         <img src="./imgs/zhixing.png" alt="">
+       </div>
+       <div class="commonFont zhixing-center">
+         该节点为业务节点，目标确认后，流程将停在执行中节点，
+       </div>
+       <div class="commonFont zhixing-center">
+         当管理员发起考评后，绩效流程将自动流转到评分节点
+       </div>
     </div>
 </template>
 
@@ -22,6 +30,14 @@ export default {
 
 </script>
 
-<style lang='' scoped>
-
+<style lang='less' scoped>
+.zhixing{
+  padding: 20px 0;
+}
+.zhixing-center{
+  img{
+    padding: 10px;
+  }
+  .center()
+}
 </style>
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
index acc2f05..29a354e 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue
@@ -45,7 +45,7 @@
               <div style="padding:20px 0 0 0 ">
                 <span>评分权重：</span>
                 <div style="padding:10px 0 0 20px">
-                   <el-input style="width:200px;" size="small" clearable  v-model="itemInfo.weight1">
+                   <el-input @input.native="$handleInputInt('itemInfo.weight1')" style="width:200px;" size="small" clearable  v-model="itemInfo.weight1">
                        <template slot="append">%</template>
                      </el-input>
                 </div>
@@ -129,7 +129,6 @@ export default {
   beforeMount () {},
   mounted () {
     this.list = this.handleListFor(this.info)
-    console.log('info: ', this.info)
   },
   methods: {
     // 将传入的数值复现
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/imgs/zhixing.png b/src/views/kpi/workbench/assessmentGroup/edit/components/imgs/zhixing.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf6a3cd09a6fcde252c63aee4aa6e781cfc6384d
GIT binary patch
literal 3792
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

literal 0
HcmV?d00001

diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
index 3b40537..62f93c0 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/components/templateSet.vue
@@ -150,7 +150,7 @@
                       <el-radio  label="">不限数量</el-radio>
                       <el-radio  label="1">自定义</el-radio>
                     </el-radio-group>
-                    <el-input clearable size="small" style="width:160px;'" v-if="maxCount" v-model="form.maxCount"></el-input>
+                    <el-input  @input="handleInputWeiduZhi"   clearable size="small" style="width:160px;'" v-if="maxCount" v-model="form.maxCount"></el-input>
                   </el-form-item>
                    <el-form-item label="所含指标总权重">
                      <div slot="label">所含指标总权重
@@ -162,7 +162,7 @@
                       <el-radio  :label="0">不限权重</el-radio>
                       <el-radio  :label="1">自定义</el-radio>
                     </el-radio-group>
-                     <el-input clearable size="small" style="width:160px;'" v-if="weight!==0" v-model="form.weight">
+                     <el-input @input.native="$handleInputInt('form.weight')"  clearable size="small" style="width:160px;'" v-if="weight!==0" v-model="form.weight">
                        <template slot="append">%</template>
                      </el-input>
                   </el-form-item>
@@ -188,7 +188,7 @@
                     <el-input size="small" clearable  type="textarea"  v-model="formIndicators.keyResult"></el-input>
                   </el-form-item>
                    <el-form-item label="权重" prop="weight">
-                     <el-input size="small" clearable  v-model="formIndicators.weight">
+                     <el-input size="small" @input.native="$handleInputInt('formIndicators.weight')"   clearable  v-model="formIndicators.weight">
                        <template slot="append">%</template>
                      </el-input>
                   </el-form-item>
@@ -291,6 +291,9 @@ export default {
     this.handleGetDimensions()
   },
   methods: {
+    handleInputWeiduZhi (value) {
+      this.form.maxCount = value.replace(/[^\d]/g, '')
+    },
     async handleGetByGroupId (id) {
       try {
         let res = await getByGroupId({id})
@@ -344,6 +347,20 @@ export default {
       this.show = false
     },
     handleSubmit () {
+      if (!this.form.maxCount && this.maxCount) {
+        this.$message({
+          message: '请填写指标数量',
+          type: 'warning'
+        })
+        return
+      }
+      if (!this.form.weight && this.weight) {
+        this.$message({
+          message: '请填写指标权重',
+          type: 'warning'
+        })
+        return
+      }
       this.$refs.form.validate((v) => {
         if (v) {
           this.form.weight = this.form.weight / 100 > 1 ? 1 : this.form.weight / 100
diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
index 1af783b..d34d502 100644
--- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue
+++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue
@@ -135,7 +135,7 @@ export default {
     .center()
   }
   &-content{
-    height: 600px;
+    min-height: 600px;
     background: #fff;
     padding: 40px 28px;
     overflow: auto;
diff --git a/src/views/kpi/workbench/assessmentGroup/groundTable.vue b/src/views/kpi/workbench/assessmentGroup/groundTable.vue
index 8e01598..26e9d60 100644
--- a/src/views/kpi/workbench/assessmentGroup/groundTable.vue
+++ b/src/views/kpi/workbench/assessmentGroup/groundTable.vue
@@ -4,7 +4,7 @@
       <div class="assessment-form">
         <el-form ref="form" @submit.native.prevent inline :model="form" >
             <el-form-item >
-              <el-input @change="handleChange" @keyup.enter="handleChange"   size="small" clearable prefix-icon="el-icon-search" v-model="form.name" placeholder="搜索考核名称"></el-input>
+              <el-input  @change="handleChange" @keyup.enter="handleChange"   size="small" clearable prefix-icon="el-icon-search" v-model="form.name" placeholder="搜索考核名称"></el-input>
             </el-form-item>
             <el-form-item >
               <el-dropdown  >