[update] 修改bug80413

src/views/enterpriseStandardLibrary/reviewMeeting/modules/ScoreDetail.vue

@@ -148,6 +148,10 @@ const fixDataSourse = [
     id: 18,
     score: '优秀',
     scoreRange: '7~10'
+  },
+  {
+    id: 19,
+    project: '总分：0'
   }
 ]
 const initData = {
@@ -257,15 +261,17 @@ export default {
           dataIndex: 'project',
           customRender: (text, row, index) => {
             const obj = {
-              children: text || this.global.emptyLine,
               attrs: {}
             }
             if (index % 3 === 0) {
+              obj.children = text || this.global.emptyLine
               obj.attrs.rowSpan = 3
-            } else if (index % 3 !== 0 && index !== 19) {
+            } else if (index % 3 !== 0 && index !== 18) {
+              obj.children = text || this.global.emptyLine
               obj.attrs.rowSpan = 0
             }
-            if (index === 19) {
+            if (index === 18) {
+              obj.children = <p class="all-score">总分: {this.allScore}</p>
               obj.attrs.colSpan = 6
             }
             return obj
@@ -283,10 +289,10 @@ export default {
             }
             if (index % 3 === 0) {
               obj.attrs.rowSpan = 3
-            } else if (index % 3 !== 0 && index !== 19) {
+            } else if (index % 3 !== 0 && index !== 18) {
               obj.attrs.rowSpan = 0
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             return obj
@@ -303,7 +309,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             return obj
@@ -314,7 +320,17 @@ export default {
           align: 'center',
           width: 100,
           dataIndex: 'scoreRange',
-          colSpan: 0
+          colSpan: 0,
+          customRender: (text, row, index) => {
+            const obj = {
+              children: text || this.global.emptyLine,
+              attrs: {}
+            }
+            if (index === 18) {
+              obj.attrs.colSpan = 0
+            }
+            return obj
+          }
         },
         {
           title: this.$t('enterpriseStandardLibrary.reviewMeeting.grade'),
@@ -326,7 +342,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             if (index % 3 === 0) {
@@ -347,7 +363,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             if (index % 3 === 0) {
@@ -385,6 +401,17 @@ export default {
       }
     }
   },
+  computed: {
+    // 总分
+    allScore () {
+      const arr = [0, 3, 6, 9, 12, 15]
+      let score = 0
+      for (const item of arr) {
+        score += Number(this.dataSource[item].evaluateScore) || 0
+      }
+      return score
+    }
+  },
   methods: {
     open (id) {
       this.visible = true
@@ -440,4 +467,5 @@ export default {
     width: 80%;
   }
 }
+
 </style>

src/views/enterpriseStandardLibrary/standard/detail/module/EnterpriseStandardEvaluateModal.vue

@@ -147,6 +147,10 @@ const fixDataSourse = [
     id: 18,
     score: '优秀',
     scoreRange: '7~10'
+  },
+  {
+    id: 19,
+    project: '总分：0'
   }
 ]
 
@@ -168,15 +172,17 @@ export default {
           dataIndex: 'project',
           customRender: (text, row, index) => {
             const obj = {
-              children: text || this.global.emptyLine,
               attrs: {}
             }
             if (index % 3 === 0) {
+              obj.children = text || this.global.emptyLine
               obj.attrs.rowSpan = 3
-            } else if (index % 3 !== 0 && index !== 19) {
+            } else if (index % 3 !== 0 && index !== 18) {
+              obj.children = text || this.global.emptyLine
               obj.attrs.rowSpan = 0
             }
-            if (index === 19) {
+            if (index === 18) {
+              obj.children = <p class="all-score">总分: {this.allScore}</p>
               obj.attrs.colSpan = 6
             }
             return obj
@@ -194,10 +200,10 @@ export default {
             }
             if (index % 3 === 0) {
               obj.attrs.rowSpan = 3
-            } else if (index % 3 !== 0 && index !== 19) {
+            } else if (index % 3 !== 0 && index !== 18) {
               obj.attrs.rowSpan = 0
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             return obj
@@ -214,7 +220,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             return obj
@@ -225,7 +231,17 @@ export default {
           align: 'center',
           width: 100,
           dataIndex: 'scoreRange',
-          colSpan: 0
+          colSpan: 0,
+          customRender: (text, row, index) => {
+            const obj = {
+              children: text || this.global.emptyLine,
+              attrs: {}
+            }
+            if (index === 18) {
+              obj.attrs.colSpan = 0
+            }
+            return obj
+          }
         },
         {
           title: this.$t('enterpriseStandardLibrary.reviewMeeting.grade'),
@@ -237,7 +253,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             if (index % 3 === 0) {
@@ -258,7 +274,7 @@ export default {
               children: text || this.global.emptyLine,
               attrs: {}
             }
-            if (index === 19) {
+            if (index === 18) {
               obj.attrs.colSpan = 0
             }
             if (index % 3 === 0) {
@@ -296,6 +312,17 @@ export default {
       }
     }
   },
+  computed: {
+    // 总分
+    allScore () {
+      const arr = [0, 3, 6, 9, 12, 15]
+      let score = 0
+      for (const item of arr) {
+        score += Number(this.dataSource[item].evaluateScore) || 0
+      }
+      return score
+    }
+  },
   methods: {
     open (standardId) {
       this.visible = true
@@ -351,4 +378,5 @@ export default {
     width: 80%;
   }
 }
+
 </style>