From 3fa9009164ee10b2db8b378b0952c53230e5a9c1 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 31 Mar 2024 23:01:29 +0800
Subject: [PATCH] update code

---
 src/pages/components/JobWorkerDialog.vue | 12 +++++++++---
 src/pages/index.vue                      |  6 ++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/pages/components/JobWorkerDialog.vue b/src/pages/components/JobWorkerDialog.vue
index 4547dd9..ec72198 100644
--- a/src/pages/components/JobWorkerDialog.vue
+++ b/src/pages/components/JobWorkerDialog.vue
@@ -9,6 +9,9 @@
                 <el-table-column label="劳务人数" align="center" prop="data101" />
                 <el-table-column label="监理人数" align="center" prop="data102" />
                 <el-table-column label="总包人数" align="center" prop="data103" />
+                <el-table-column label="合计" align="center" prop="total">
+                    <template slot-scope="{row}"><span style="font-size:16px;font-weight: bold;color:#87e3fa;">{{row.total }}</span></template>
+                </el-table-column>
             </el-table>
 
         </template>
@@ -93,7 +96,7 @@ export default {
             this.index = 1;
             this.loadData();
         },
-        showDialog(data) {debugger
+        showDialog(data) {
             const getData = id => {
                 var tmps = data.datas.filter(d => d.text == id);
                 return tmps.length > 0 ? tmps[0].cnt : 0;
@@ -146,7 +149,8 @@ export default {
                             dptName: it.dptName,
                             data101: 0,
                             data102: 0,
-                            data103: 0
+                            data103: 0,
+                            total:0,
                         };
                         obj[k] = o;
                     } else {
@@ -157,7 +161,9 @@ export default {
                 });
                 this.tableData = [];
                 for (let k in obj) {
-                    this.tableData.push(obj[k]);
+                    let o=obj[k];
+                    o.total=o.data101+o.data102+o.data103;
+                    this.tableData.push(o);
                 }
                 this.total = sum;
             })
diff --git a/src/pages/index.vue b/src/pages/index.vue
index a7b8e90..fcbd39a 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -219,8 +219,7 @@
         <index-dlg2 ref="dlg2"></index-dlg2>
         <index-dlg3 ref="dlg3"></index-dlg3>
         <journalismDlg ref="journalismDlg"></journalismDlg>
-        <AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>
-        <AttendanceWorkerDialog ref="workerDlg"></AttendanceWorkerDialog>
+        <AttendanceDetailDialog ref="attDetailDlg"></AttendanceDetailDialog>        
         <JobWorkerDialog ref="jobWorkerdlg"></JobWorkerDialog>
     </div>
 </template>
@@ -235,7 +234,6 @@ import MonitAndWarning from './components/MonitAndWarning.vue'
 import journalismDlg from './dlg/journalismDlg.vue'
 import debounce from 'lodash.debounce'
 import AttendanceDetailDialog from './components/AttendanceDetailDialog.vue'
-import AttendanceWorkerDialog from './components/AttendanceWorkerDialog.vue'
 import mapIndex from './index/mapIndex.vue'
 import JobWorkerDialog from './components/JobWorkerDialog.vue'
 export default {
@@ -246,7 +244,7 @@ export default {
         indexDlg3,
         MonitAndWarning,
         journalismDlg,
-        AttendanceDetailDialog,mapIndex,JobWorkerDialog,AttendanceWorkerDialog
+        AttendanceDetailDialog,mapIndex,JobWorkerDialog
     },
     data() {
         return {