修改表格顺序

src/components/Form/index.vue

@@ -4,26 +4,30 @@
       :data="excelList"
       height="85vh"
       style="width: 100%"
-      :header-cell-style="styleBack">
+      :header-cell-style="styleBack"
+    >
       <el-table-column
         prop="workName"
         label="姓名"
         width="100"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="groupOfCheck"
         label="考勤组"
         width="120"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="department"
         label="部门"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column prop="workNum" label="工号" align="center">
       </el-table-column>
@@ -33,84 +37,97 @@
         prop="daysOfAttendanceInHuangjiahu"
         label="黄家湖出勤天数"
         width="130"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="daysOfcardShortageInHuangjiahu"
         label="黄家湖缺卡天数"
         width="180"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="recondOfcardShortageInHuangjiahu"
         label="黄家湖缺卡记录"
         width="180"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="sumAttendanceInHuangjiahu"
         label="黄家湖总出勤天数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="daysOfAttendanceInMoxuanhu"
         label="墨轩湖出勤天数"
         width="130"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="daysOfcardShortageInMoxuanhu"
         label="墨轩湖缺卡天数"
         width="180"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="recondOfcardShortageInMoxuanhu"
         label="墨轩湖缺卡记录"
         width="180"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="sumAttendanceInMoxuanhu"
         label="墨轩湖总出勤天数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="abnormalClockNumber"
         label="异常地点打卡天数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="abnormalClockRecond"
         label="异常地点打卡记录"
         width="150"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="leTwentyLateNumber"
         label="0-20分钟迟到次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="lequalThirtyLateNumber"
         label="20-30分钟迟到次数"
         width="150"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="geThirtyLateNumber"
         label="＞30分钟迟到次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
 
       <el-table-column
@@ -118,45 +135,52 @@
         label="迟到次数记录"
         width="130"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="leTwentyLeaveNumber"
         label="0-20分钟早退次数"
         width="150"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="lequalThirtyLeaveNumber"
         label="20-30分钟早退次数"
         width="150"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="geThirtyLeaveNumber"
         label="＞30分钟早退次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="leaveOfRecond"
         label="早退次数记录"
         width="140"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="attendanceDays"
         label="月总出勤天数"
         width="130"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="userId"
         label="userId"
         width="180"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column prop="attendanceDay" label="出勤天数" align="center">
       </el-table-column>
@@ -167,7 +191,8 @@
         label="工作时长"
         width="130"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column prop="numberOfLate" label="迟到次数" align="center">
       </el-table-column>
@@ -177,19 +202,22 @@
         prop="numberOfSeriousLateness"
         label="严重迟到次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="durationOfSevereLateness"
         label="严重迟到时长"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column
         prop="daysOfAbsenteeismAndLateness"
         label="旷工迟到天数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column prop="leaveEarlyNumber" label="早退次数" align="center">
       </el-table-column>
@@ -198,20 +226,23 @@
         label="早退时长"
         width="150"
         align="center"
-        show-overflow-tooltip>
+        show-overflow-tooltip
+      >
       </el-table-column>
       <el-table-column
         prop="lackOfWorkCardTimes"
         label="上班缺卡次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
 
       <el-table-column
         prop="lackOfMissingWorkCardTimes"
         label="下班缺卡次数"
         width="140"
-        align="center">
+        align="center"
+      >
       </el-table-column>
       <el-table-column prop="absenteeismDay" label="旷工天数" align="center">
       </el-table-column>
@@ -221,42 +252,48 @@
       </el-table-column>
       <el-table-column label="请假">
         <el-table-column
-          prop="bereavementLeave"
-          label="丧假(天)"
-          align="center">
-        </el-table-column>
-        <el-table-column
           prop="privateAffairLeaveDay"
           label="事假(天)"
-          align="center">
+          align="center"
+        >
         </el-table-column>
         <el-table-column
           prop="maternityLeaveDay"
           label="产假(天)"
-          align="center">
+          align="center"
+        >
         </el-table-column>
-        <el-table-column prop="sickLeaveDay" label="病假(天)" align="center">
+        <el-table-column
+          prop="marriageLeaveDay"
+          label="婚假(天)"
+          align="center"
+        >
         </el-table-column>
         <el-table-column
           prop="escortFalse"
           label="陪护假(天)"
           width="90"
-          align="center">
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="sickLeaveDay" label="病假(天)" align="center">
         </el-table-column>
         <el-table-column
-          prop="marriageLeaveDay"
-          label="婚假(天)"
-          align="center">
+          prop="bereavementLeave"
+          label="丧假(天)"
+          align="center"
+        >
         </el-table-column>
       </el-table-column>
 
       <template v-for="(item, index) in TemHeader">
         <el-table-column
+          :key="index"
           :prop="item.column_comment"
           :label="item.column_name"
-          :key="index"
           align="center"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
       </template>
     </el-table>

src/components/Home/index.vue

@@ -25,7 +25,8 @@
             :limit="1"
             accept=".xls,.xlsx"
             :on-change="handleUpload"
-            :on-exceed="handleExceed">
+            :on-exceed="handleExceed"
+          >
             <div class="choose">选择文件</div>
             <div class="message">或拖放文件到这</div>
             <div class="tips">tips:只能上传xls/xlsx文件</div>
@@ -39,7 +40,8 @@
                 type="line"
                 text-inside
                 :stroke-width="26"
-                :percentage="percentage"></el-progress>
+                :percentage="percentage"
+              ></el-progress>
             </div>
             <div class="form_name" v-if="percentage == 100">
               <span>{{ form_name }}</span>
@@ -55,7 +57,8 @@
                 type="line"
                 text-inside
                 :stroke-width="26"
-                :percentage="parsePercentage"></el-progress>
+                :percentage="parsePercentage"
+              ></el-progress>
             </div>
             <div class="form_name">{{ form_name }}</div>
           </div>
@@ -99,7 +102,8 @@
             stretch
             v-model="activeName"
             type="card"
-            @tab-click="handleClick">
+            @tab-click="handleClick"
+          >
             <el-tab-pane label="黄家湖" name="黄家湖"></el-tab-pane>
             <el-tab-pane label="墨轩湖" name="墨轩湖"></el-tab-pane>
           </el-tabs>
@@ -113,14 +117,16 @@
                 class="card"
                 shadow="hover"
                 v-for="item in timeList"
-                :key="item.id">
+                :key="item.id"
+              >
                 <div class="card_title">
                   <span v-if="item.isShow">{{ item.clockName }}</span>
                   <input
                     v-focus
                     v-else
                     v-model="item.clockName"
-                    @blur="handleTitleSave(item)" />
+                    @blur="handleTitleSave(item)"
+                  />
                   <div class="icon" @click="handleTitleEdit(item)"></div>
                 </div>
                 <div class="card_count">
@@ -128,7 +134,8 @@
                   <el-input-number
                     size="mini"
                     v-model="item.count"
-                    :min="1"></el-input-number>
+                    :min="1"
+                  ></el-input-number>
                 </div>
                 <div class="card_time">
                   <el-time-select
@@ -139,7 +146,8 @@
                       start: '00:00',
                       step: '00:05',
                       end: '24:00',
-                    }">
+                    }"
+                  >
                   </el-time-select>
                   <el-time-select
                     placeholder="结束时间"
@@ -149,7 +157,8 @@
                       start: '00:00',
                       step: '00:05',
                       end: '24:00',
-                    }">
+                    }"
+                  >
                   </el-time-select>
                 </div>
                 <div class="card_close" @click="handleCloseCard(item)"></div>
@@ -165,9 +174,8 @@
               <div>早退规则</div>
               <div>
                 下班最多早走<input
-                  v-model="ruleObj.leaveEarlyOfWork" />分钟,早走{{
-                  ruleObj.leaveEarlyOfWork
-                }}分钟以上算早退
+                  v-model="ruleObj.leaveEarlyOfWork"
+                />分钟,早走{{ ruleObj.leaveEarlyOfWork }}分钟以上算早退
               </div>
             </div>
           </div>
@@ -191,18 +199,21 @@
         :data="excelList"
         height="85vh"
         style="width: 100%; display: none"
-        id="table">
+        id="table"
+      >
         <el-table-column
           prop="workName"
           label="姓名"
           width="100"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="groupOfCheck"
           label="考勤组"
           width="120"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column prop="department" label="部门" show-overflow-tooltip>
         </el-table-column>
@@ -212,100 +223,118 @@
         <el-table-column
           prop="daysOfAttendanceInHuangjiahu"
           label="黄家湖出勤天数"
-          width="130">
+          width="130"
+        >
         </el-table-column>
         <el-table-column
           prop="daysOfcardShortageInHuangjiahu"
           label="黄家湖缺卡天数"
           width="180"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="recondOfcardShortageInHuangjiahu"
           label="黄家湖缺卡记录"
           width="180"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="sumAttendanceInHuangjiahu"
           label="黄家湖总出勤天数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="daysOfAttendanceInMoxuanhu"
           label="墨轩湖出勤天数"
-          width="130">
+          width="130"
+        >
         </el-table-column>
         <el-table-column
           prop="daysOfcardShortageInMoxuanhu"
           label="墨轩湖缺卡天数"
           width="180"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="recondOfcardShortageInMoxuanhu"
           label="墨轩湖缺卡记录"
           width="180"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="sumAttendanceInMoxuanhu"
           label="墨轩湖总出勤天数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="abnormalClockNumber"
           label="异常地点打卡天数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="abnormalClockRecond"
           label="异常地点打卡记录"
           width="150"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="leTwentyLateNumber"
           label="0-20分钟迟到次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="lequalThirtyLateNumber"
           label="20-30分钟迟到次数"
-          width="150">
+          width="150"
+        >
         </el-table-column>
         <el-table-column
           prop="geThirtyLateNumber"
           label="＞30分钟迟到次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
 
         <el-table-column
           prop="lateOfRecond"
           label="迟到次数记录"
           width="130"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="leTwentyLeaveNumber"
           label="0-20分钟早退次数"
-          width="150">
+          width="150"
+        >
         </el-table-column>
         <el-table-column
           prop="lequalThirtyLeaveNumber"
           label="20-30分钟早退次数"
-          width="150">
+          width="150"
+        >
         </el-table-column>
         <el-table-column
           prop="geThirtyLeaveNumber"
           label="＞30分钟早退次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="leaveOfRecond"
           label="早退次数记录"
           width="140"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column prop="attendanceDays" label="月总出勤天数">
         </el-table-column>
@@ -313,7 +342,8 @@
           prop="userId"
           label="userId"
           width="180"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column prop="attendanceDay" label="出勤天数">
         </el-table-column>
@@ -322,7 +352,8 @@
           prop="workHours"
           label="工作时长"
           width="130"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column prop="numberOfLate" label="迟到次数">
         </el-table-column>
@@ -331,17 +362,20 @@
         <el-table-column
           prop="numberOfSeriousLateness"
           label="严重迟到次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="durationOfSevereLateness"
           label="严重迟到时长"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column
           prop="daysOfAbsenteeismAndLateness"
           label="旷工迟到天数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column prop="leaveEarlyNumber" label="早退次数">
         </el-table-column>
@@ -349,18 +383,21 @@
           prop="leaveEarlyTimes"
           label="早退时长"
           width="150"
-          show-overflow-tooltip>
+          show-overflow-tooltip
+        >
         </el-table-column>
         <el-table-column
           prop="lackOfWorkCardTimes"
           label="上班缺卡次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
 
         <el-table-column
           prop="lackOfMissingWorkCardTimes"
           label="下班缺卡次数"
-          width="140">
+          width="140"
+        >
         </el-table-column>
         <el-table-column prop="absenteeismDay" label="旷工天数">
         </el-table-column>
@@ -368,29 +405,31 @@
         </el-table-column>
         <el-table-column prop="goOutDay" label="外出"> </el-table-column>
         <el-table-column label="请假">
-          <el-table-column prop="bereavementLeave" label="丧假(天)">
-          </el-table-column>
           <el-table-column prop="privateAffairLeaveDay" label="事假(天)">
           </el-table-column>
           <el-table-column prop="maternityLeaveDay" label="产假(天)">
           </el-table-column>
-          <el-table-column prop="sickLeaveDay" label="病假(天)">
-          </el-table-column>
-          <el-table-column prop="escortFalse" label="陪护假(天)" width="90">
-          </el-table-column>
           <el-table-column
             prop="marriageLeaveDay"
             label="婚假(天)"
-            align="center">
+            align="center"
+          >
+          </el-table-column>
+          <el-table-column prop="escortFalse" label="陪护假(天)" width="90">
+          </el-table-column>
+          <el-table-column prop="sickLeaveDay" label="病假(天)">
+          </el-table-column>
+          <el-table-column prop="bereavementLeave" label="丧假(天)">
           </el-table-column>
         </el-table-column>
 
         <template v-for="(item, index) in TemHeader">
           <el-table-column
+            :key="index"
             :prop="item.column_comment"
             :label="item.column_name"
-            :key="index"
-            show-overflow-tooltip>
+            show-overflow-tooltip
+          >
           </el-table-column>
         </template>
       </el-table>