Merge branch 'master' of http://gogs.langye.net:3000/langye/cz-hjjc-oa

src/views/attendance/WorkOvertime.vue

@@ -77,30 +77,31 @@
         <vxe-column
           min-width="180"
           header-align="center"
-          field="title"
+          field="jiabanleixing"
-          title="工作名称"
+          title="加班类型"
         ></vxe-column>
         <vxe-column width="190" align="center" title="开始时间" field="kaishiriqi" />
         <vxe-column width="190" align="center" title="结束时间" field="jieshushijian" />
-        <vxe-column
+        <vxe-column min-width="140" align="center" title="原因说明" field="yuanyinshuoming" />
-          width="80"
+<!--        <vxe-column-->
-          align="center"
+<!--          width="80"-->
-          field="status"
+<!--          align="center"-->
-          title="当前状态"
+<!--          field="status"-->
-          :formatter="({ cellValue }) => myStatus.get(cellValue)"
+<!--          title="当前状态"-->
-          :export-method="
+<!--          :formatter="({ cellValue }) => myStatus.get(cellValue)"-->
-                ({ row, column, options }) => myStatus.get(row['status'])
+<!--          :export-method="-->
-              "
+<!--                ({ row, column, options }) => myStatus.get(row['status'])-->
-        >
+<!--              "-->
-          <template #default="{ row }">
+<!--        >-->
-            <el-tag
+<!--          <template #default="{ row }">-->
-              size="mini"
+<!--            <el-tag-->
-              :type="statusColor.get(row.status)"
+<!--              size="mini"-->
-              effect="dark"
+<!--              :type="statusColor.get(row.status)"-->
-            >{{ myStatus.get(row.status) }}</el-tag
+<!--              effect="dark"-->
-            >
+<!--            >{{ myStatus.get(row.status) }}</el-tag-->
-          </template>
+<!--            >-->
-        </vxe-column>
+<!--          </template>-->
+<!--        </vxe-column>-->
         <vxe-column
           width="200"
           align="center"