2022.3.15liebiao

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -911,20 +911,22 @@
             highlight-current-row
             style="width: 100%"
           >
-            <el-table-column width="60" type="index" fixed="left" label="部门">
-              <template slot-scope="scope">
+            <el-table-column width="300" fixed="left" label="部门" prop="department">
+              <!-- <template slot-scope="scope">
                 {{ scope.$index + 1 }}
-              </template>
+              </template> -->
             </el-table-column>
 
-            <el-table-column width="100" prop="name" fixed="left" label="姓名">
+            <el-table-column width="300" prop="name" fixed="left" label="姓名" >
             </el-table-column>
             <el-table-column
               width="300"
               label="未填日期"
               align="center"
+              prop="createDate"
             >
-              <template slot-scope="scope">
+
+              <!-- <template slot-scope="scope">
                 <div
                   style="color: red"
                   v-if="
@@ -1024,7 +1026,7 @@
                 >
                   0
                 </div>
-              </template>
+              </template> -->
             </el-table-column>
           </el-table>
           <!-- <div slot="title" class="dialog-title">
@@ -1780,7 +1782,7 @@
     exportMembNotWorkHours() {
       
       this.http.post(
-        "/report/getNoReportUserList",
+        "/report/exportNoReportUserList",
         {
           // month: this.date,
           startDate: this.WorktimeDatepickValue2[0],
@@ -1863,7 +1865,7 @@
         },
         (res) => {
           if (res.code == "ok") {
-            this.monthNotWorkDate = res.data.list;
+            this.monthNotWorkDate = res.data;
             this.$forceUpdate();
             console.log("monthNotWorkDate", this.monthNotWorkDate);
           }