From 1a6b33da4aa20e61fe4a264895749378a432faff Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Thu, 6 Jul 2023 14:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/WgyWork.vue | 45 ++++++++++++++++++++++++++++---
 src/components/table/Wgy.vue      |  8 ++++--
 src/components/table/ZfGa.vue     |  2 +-
 src/components/table/Znbm.vue     |  8 +++++-
 4 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/components/common/WgyWork.vue b/src/components/common/WgyWork.vue
index e8d32ec..a0ebdc5 100644
--- a/src/components/common/WgyWork.vue
+++ b/src/components/common/WgyWork.vue
@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import {h} from 'vue';
 import {
     NSpace,
     NDataTable,
@@ -57,7 +58,16 @@ export default {
                                 key: 'isSignin',
                                 width: 60,
                                 render(row, index) {
-                                    return row.isSignin === 0 ? '否' : '是';
+                                    return row.isSignin === 0 ? h('span', {
+                                        style: {
+                                            color: 'red'
+                                        }
+                                    }, '否') : h('span', {
+                                        style: {
+                                            fontWeight: 'bold',
+                                            color: 'green'
+                                        }
+                                    }, '是');
                                 }
                             },
                             {
@@ -66,7 +76,16 @@ export default {
                                 key: 'isSigninLate',
                                 width: 60,
                                 render(row, index) {
-                                    return row.isSigninLate === 0 ? '否' : '是';
+                                    return row.isSigninLate === 0 ? h('span', {
+                                        style: {
+                                            color: 'red'
+                                        }
+                                    }, '否') : h('span', {
+                                        style: {
+                                            fontWeight: 'bold',
+                                            color: 'green'
+                                        }
+                                    }, '是');
                                 }
                             },
                             {
@@ -75,7 +94,16 @@ export default {
                                 key: 'isSignout',
                                 width: 60,
                                 render(row, index) {
-                                    return row.isSignout === 0 ? '否' : '是';
+                                    return row.isSignout === 0 ? h('span', {
+                                        style: {
+                                            color: 'red'
+                                        }
+                                    }, '否') : h('span', {
+                                        style: {
+                                            fontWeight: 'bold',
+                                            color: 'green'
+                                        }
+                                    }, '是');
                                 }
                             },
                             {
@@ -84,7 +112,16 @@ export default {
                                 key: 'isEarly',
                                 width: 60,
                                 render(row, index) {
-                                    return row.isSignoutEarly === 0 ? '否' : '是';
+                                    return row.isSignoutEarly === 0 ? h('span', {
+                                        style: {
+                                            color: 'red'
+                                        }
+                                    }, '否') : h('span', {
+                                        style: {
+                                            fontWeight: 'bold',
+                                            color: 'green'
+                                        }
+                                    }, '是');
                                 }
                             },
                             {
diff --git a/src/components/table/Wgy.vue b/src/components/table/Wgy.vue
index 1b7d22c..22b25fb 100644
--- a/src/components/table/Wgy.vue
+++ b/src/components/table/Wgy.vue
@@ -619,7 +619,11 @@ export default {
                         key: 'AF',
                         keyName: 'shouldPay',
                         fixed: 'right',
-                        width: 100
+                        width: 100,
+                        render(row, index) {
+                            return h('a', {
+                            }, row.AF * row.gridCount)
+                        }
                     },
                     {
                         align: 'center',
@@ -629,7 +633,7 @@ export default {
                         fixed: 'right',
                         width: 100,
                         render(row, index) {
-                            return (vueSelf.computeAE(row) * row.AF / 100).toFixed(2);
+                            return (vueSelf.computeAE(row) * (row.AF * row.gridCount) / 100).toFixed(2);
                         }
                     }
                 ],
diff --git a/src/components/table/ZfGa.vue b/src/components/table/ZfGa.vue
index 5748137..40b06f7 100644
--- a/src/components/table/ZfGa.vue
+++ b/src/components/table/ZfGa.vue
@@ -325,7 +325,7 @@ export default {
                         fixed: 'right',
                         width: 60,
                         render(row, index) {
-                            return (vueSelf.computeM(row) * row.N / 100).toFixed(2);
+                            return (vueSelf.computeM(row) * row.N / 100 + row.F).toFixed(2);
                         }
                     }
                 ],
diff --git a/src/components/table/Znbm.vue b/src/components/table/Znbm.vue
index a310707..25766a3 100644
--- a/src/components/table/Znbm.vue
+++ b/src/components/table/Znbm.vue
@@ -300,7 +300,7 @@ export default {
                         fixed: 'right',
                         width: 60,
                         render(row, index) {
-                            return vueSelf.computeN(row) * row.O / 100;
+                            return vueSelf.computeN(row) * row.O / 100 + row.F;
                         }
                     }
                 ],
@@ -384,6 +384,12 @@ export default {
             this.modal.scoring.userName = row.B;
             this.modal.scoring.title = '督察案件';
         },
+        computeL(row) {
+            return Math.max(row.G - row.H - row.J - row.K + row.L + row.M, 0);
+        },
+        computeM(row) {
+            return Math.max(row.G - row.H - row.J - row.K + row.L + row.M, 0);
+        },
         computeN(row) {
             return Math.max(row.G - row.H - row.J - row.K + row.L + row.M, 0);
         },