优化

src/views/kpi/assessment/homeList/index.vue

@@ -93,7 +93,7 @@ export default {
     return {
       params: {
         'currPage': 1,
-        'pageSize': 5
+        'pageSize': 10
       },
       show: false,
       options: [ {

src/views/kpi/assessment/performance/components/table copy 2.vue

@@ -7,45 +7,61 @@
             <div class="title table-header-flex kaohe">考核标准</div>
             <div class="title table-header-flex jieguo" >结果值</div>
             <div class="title table-header-flex quanzhong" >权重({{obj.weight*100}}%)</div>
-            <div class="title table-header-flex pingfen" v-for="i in 3" >
+            <template v-if="tableAuth.editScore">
-              <div class="pingfen-title">上级评分</div>
+              <div class="title table-header-flex pingfen" v-for="k in obj.recortModelDtos[0].detailDtos[0].scoreDtos" >
-              <div class="pingfen-content">
+                <div class="pingfen-title">上级评分 - {{k.approvalName}} ( {{( Math.round((k.weight * 100) * 1000) / 1000 )}}%)</div>
-                  <div class="pingfen-content-ping"  >评分</div>
+                <div class="pingfen-content">
-                <div class="pingfen-content-defen"  >得分</div>
+                    <div class="pingfen-content-ping"  >评分</div>
-                <div class=" pingfen-content-shuoming"  >评分说明</div>
+                  <div class="pingfen-content-defen"  >得分</div>
+                  <div class=" pingfen-content-shuoming"  >评分说明</div>
+                </div>
               </div>
-            </div>
+            </template>
           </div>
-         <div class="table-weidu">
+         <div class="table-weidu" v-for="(item,index) in ((tableInfo.score || tableAuth.showScore) && tableAuth.editScore?obj.recortModelDtos:obj.recortModelDtos.slice(0,obj.recortModelDtos.length-1))" :key="index">
            <div class="weidu">
-              维度
+               {{item.name}}
             </div>
             <div>
-              <div class="table-content" v-for="i in 4">
+              <div class="table-content" v-for="i in item.detailDtos">
                 <div class="name">
-                  名称
+                 {{i.target}}
                 </div>
                 <div class="kaohe">
-                  考核标准
+                   {{i.keyResult}}
                 </div>
                 <div class="jieguo">
-                  结果值
+                    {{i.checkResult}}
                 </div>
                 <div  class="quanzhong">
-                  权重
+                    {{( Math.round((i.checkWeight * 100) * 1000) / 1000 )}}%
                 </div>
-                <div v-for="i in 3" class="pingfen table-content-pingfen">
+                <div v-for="dto in i.scoreDtos" class="pingfen table-content-pingfen">
                   <div class="pingfen-content-ping">
-                    20000
+                    {{dto.acquireScore}}
                   </div>
                   <div class="pingfen-content-defen">
-                    20000
+                     {{dto.acquireScore}}
                   </div>
                   <div class="pingfen-content-shuoming">
-                    20000
+                     {{dto.scoreComment || '--'}}
                   </div>
                 </div>
               </div>
+               <div class="table-content" v-if="item.detailDtos.length===0">
+                <div class="name">
+                  --
+                </div>
+                <div class="kaohe">
+                  --
+                </div>
+                <div class="jieguo">
+                  --
+                </div>
+                <div  class="quanzhong">
+                  --
+                </div>
+              </div>
             </div>
          </div>
         </div>

src/views/kpi/assessment/performance/components/table copy.vue

@@ -3,7 +3,7 @@
         <div v-if="obj.recortModelDtos.length !== 0"  class="table-list commonFont">
           <div class="table-header">
             <div class="table-left name">维度</div>
-            <div class="table-header-flex name">名称</div>
+            <div class="table-header-flex names ">名称</div>
             <div class="table-header-flex kaohe">考核标准</div>
             <div class="table-header-flex jieguo" v-if="tableInfo.result || tableAuth.showResult">结果值</div>
             <div class="table-header-flex quanzhomng" style="flex:none;">权重({{obj.weight*100}}%)</div>
@@ -20,7 +20,7 @@
             </div>
             <div   class="table-content-right">
               <div v-for="(child) in item.detailDtos" :key="child.id" class="table-content-right-item">
-                 <div class="name">
+                 <div class="names">
                    <span> {{child.target || ''}}</span>
                 </div>
                  <div class="kaohe">
@@ -58,7 +58,7 @@
 
               </div>
               <div v-if="item.detailDtos.length ===0 && item.name !=='总分'" class="table-content-right-item">
-                 <div class="name">
+                 <div class="names">
                 </div>
                  <div class="kaohe">
                 </div>
@@ -76,7 +76,7 @@
                 </div>
               </div>
               <div v-if="item.name==='总分'" class="table-content-right-item">
-                 <div class="name">
+                 <div class="names">
                 </div>
                  <div class="kaohe">
                 </div>
@@ -155,9 +155,9 @@ export default {
   },
   computed: {
     score () {
-      const result = this.obj.recortModelDtos.reduce((result, i) => {
+      const result = this.obj.recortModelDtos && this.obj.recortModelDtos.reduce((result, i) => {
-        i.detailDtos.map(j => {
+        i.detailDtos && i.detailDtos.map(j => {
-          j.scoreDtos.map(k => {
+          j.scoreDtos && j.scoreDtos.map(k => {
             const str = j.calculate.replace(/{\w+}/g, (i) => {
               i = i.replace(/{|}/g, '')
               return k[i]
@@ -229,6 +229,10 @@ export default {
 }
 </script>
 <style lang='less' scoped>
+.names{
+  width: 300px !important;
+  flex: none !important;
+}
 .jieguo{
   width: 300px !important;
   flex: none !important;

src/views/kpi/assessment/stepList/index.vue

@@ -237,7 +237,7 @@ export default {
         'currPage': 1,
         'evaluationIds': '',
         'flowProcess': null,
-        'pageSize': 5,
+        'pageSize': 10,
         'staffIds': '',
         'staffName': '',
         'startId': 10

src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue

@@ -263,6 +263,7 @@ export default {
           if (n.optType === 0) n.optType = 1
           n.name = this.options.filter(i => i.id === n.optType)[0].name
         } else {
+          n.optType = 0
           // n.name
           if (n.list) {
             n.name = this.handleTitle(n.list)