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

src/views/attendance/leavechart.vue

@@ -25,38 +25,38 @@
         :merge-cells="mergeCells"
         >
         <!-- :span-method="mergeCells" -->
-        <vxe-column width="240" header-align="center" align="center" field="department_name" title="科室"></vxe-column>
-        <vxe-column width="180" header-align="center" align="center" field="user.name" title="姓名"></vxe-column>
+        <vxe-column minWidth="240" header-align="center" align="center" field="department_name" title="科室"></vxe-column>
+        <vxe-column minWidth="180" header-align="center" align="center" field="user.name" title="姓名"></vxe-column>
 
-        <vxe-column header-align="center" align="center" field="over_off" title="结余调休时间">
+        <vxe-column  width="180" header-align="center" align="center" field="over_off" title="结余调休时间">
           <template #default="{ row }">
             <div>
               {{row.over_off=='0.00'?'0':row.over_off}}
             </div>
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="overtime" title="本月加班时间">
+        <vxe-column width="180" header-align="center" align="center" field="overtime" title="本月加班时间">
           <template #default="{ row }">
             <div>
               {{row.overtime=='0.00'?'0':row.overtime}}
             </div>
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="time_off" title="本月调休时间">
+        <vxe-column width="180" header-align="center" align="center" field="time_off" title="本月调休时间">
           <template #default="{ row }">
             <div>
               {{row.time_off=='0.00'?'0':row.time_off}}
             </div>
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="expire" title="过期时间">
+        <vxe-column width="180" header-align="center" align="center" field="expire" title="过期时间">
           <template #default="{ row }">
             <div>
               {{row.expire=='0.00'?'0':row.expire}}
             </div>
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="has_time_off" title="剩余调休时间">
+        <vxe-column width="180" header-align="center" align="center" field="has_time_off" title="剩余调休时间">
           <template #default="{ row }">
             <div>
               {{row.has_time_off=='0.00'?'0':row.has_time_off}}

src/views/attendance/overtimechart.vue

@@ -28,16 +28,16 @@
             {{row.kaishiriqi?row.kaishiriqi.substring(0,11):''}}
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="yuanyinshuoming" title="加班事由"></vxe-column>
-        <vxe-column :export-method="exportjbMethod" header-align="center" align="center" field="jiabanshijian"
+        <vxe-column minWidth="180" header-align="center" align="center" field="yuanyinshuoming" title="加班事由"></vxe-column>
+        <vxe-column width="180" :export-method="exportjbMethod" header-align="center" align="center" field="jiabanshijian"
           title="加班时间">
           <template #default="{ row }">
             {{row.kaishiriqi?row.kaishiriqi.substring(11,row.kaishiriqi.length):''}}-{{row.kaishiriqi?row.jieshushijian.substring(11,row.jieshushijian.length):''}}
           </template>
         </vxe-column>
-        <vxe-column header-align="center" align="center" field="jiabanshichang" title="加班时长(h)"></vxe-column>
+        <vxe-column width="180" header-align="center" align="center" field="jiabanshichang" title="加班时长(h)"></vxe-column>
         <!-- <vxe-column header-align="center" align="center" field="day" title="day"></vxe-column> -->
-        <vxe-column header-align="center" align="center" field="allDay" title="本月累计(h)"></vxe-column>
+        <vxe-column  width="180" header-align="center" align="center" field="allDay" title="本月累计(h)"></vxe-column>