111

src/App.vue

@@ -8,7 +8,7 @@
 <script>
   import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
   import enquireScreen from '@/utils/device'
-
+ 
   export default {
     data () {
       return {

src/views/system/schedulingInformation/AttendanceInformation1.vue

@@ -1,4 +1,4 @@
-<template>
+<template xmlns:background-color="http://www.w3.org/1999/xhtml">
   <a-row :gutter="10">
     <a-col :md="4" :sm="12">
       <a-card :bordered="false">
@@ -10,7 +10,8 @@
 
             <!--组织机构-->
             <!-- <a-tree multiple -->
-            <a-directory-tree multiple 
+            <a-directory-tree 
+              multiple 
               :selectedKeys="selectedKeys"
               :checkStrictly="true"
               @select="onSelect"
@@ -55,7 +56,7 @@
   import DeptUserInfo from '../modules/DeptUserInfo'
 
   export default {
-    name: 'DepartUserList',
+    name: 'AttendanceInformation1',
     mixins: [JeecgListMixin],
     components: {
       DeptRoleInfo,
@@ -153,7 +154,9 @@
         this.loading = true
         this.loadTree(viewDate)
       },
-
+      backFlowList() {
+        this.$router.back(-1)
+      },
       onExpand(expandedKeys) {
         // console.log('onExpand', expandedKeys)
         // if not set autoExpandParent to false, if children expanded, parent can not collapse.

src/views/system/schedulingInformation/BdClockinMonthList.vue

@@ -84,6 +84,7 @@
 </template>
 
 <script>
+  import '@/assets/less/TableExpand.less'
   import {
     JeecgListMixin
   } from '@/mixins/JeecgListMixin'
@@ -94,7 +95,7 @@
   import {monthReport} from '@/api/api';
   
   export default {
-    name: 'ViewClockInList',
+    name: 'BdClockinMonthList',
     mixins: [JeecgListMixin],
     components: {
       JDictSelectTag
@@ -166,7 +167,7 @@
           getCloseDate:'/viewClockIn/bdClockinMonth/getCloseDate',
           closeDateUrl:'/viewClockIn/bdClockinMonth/closeDate',
           list: '/viewClockIn/bdClockinMonth/list',
-          syMonthReport: '/viewClockIn/viewClockIn/syMonthReport'
+          syMonthReport: '/viewClockIn/viewClockIn/syMonthReport',
         },
       }
     }, 
@@ -199,7 +200,9 @@
           ids += this.selectedRowKeys[a] + ",";
         }
         if(ids == ""){
-          conText = "是否生成所有员工" + nowDate + "月报？";
+          this.$message.warning('请选择要生成月报的人员');
+          return false;
+          // conText = "是否生成所有员工" + nowDate + "月报？";
         }else{
           conText = "是否生成所选员工" + nowDate + "月报？ 所选数量：" + this.selectedRowKeys.length;
         }