11

src/views/system/schedulingInformation/BdClockinMonthList.vue

@@ -55,7 +55,10 @@
 
     <!-- table区域-begin -->
     <div>
-
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i>已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
       <a-table class="j-table-force-nowrap" ref="table" size="middle" bordered rowKey="userId" :columns="columns"
         :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange" :scroll="{ x: 1200, y: 700 }">
@@ -175,7 +178,7 @@
         let yy = new Date().getFullYear();
         let mm = new Date().getMonth()+1;
         // let dd = new Date().getDate();
-        this.monthTime = yy+"-"+mm;
+        this.queryParam.monthTime = yy+"-"+mm;
     },
     computed: {
       importExcelUrl: function() {
@@ -215,6 +218,8 @@
                if (res.success) {
                  that.$message.success("已成功生成"+nowDate+"考勤月报");
                  // that.$message.success("已成功生成"+nowDate+"考勤月报");
+                 that.selectedRowKeys = [];
+                 that.selectionRows = [];
                  that.loadData();
                } else {
                  that.$message.warning(res.message);
@@ -285,6 +290,8 @@
              putAction(that.url.syMonthReport, {viewDate:nowDate,ids:ids}).then((res) => {
                if (res.success) {
                  that.$message.success("同步成功");
+                 that.selectedRowKeys = [];
+                 that.selectionRows = [];
                  that.loadData();
                }else{
                  that.$message.warning(res.message);

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -63,7 +63,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        @change="handleTableChange" :scroll="{ x: 1700, y: 600 }">
+        @change="handleTableChange">
 
         <span slot="ShiftTime" slot-scope="text, record, index">
            {{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
@@ -79,10 +79,10 @@
           </a-tag>
           <a @click="workInfo(record)" v-else>{{text}}</a> -->
           <span v-if="record.setInfo > 0 ">
-            <a-tag title="点击查看加班详情" @click="workInfo(record)" color="pink" >{{text}}</a-tag> 
+            <a-tag :title="record.multipleInfo" @click="workInfo(record)" color="pink" >{{text}}</a-tag> 
           </span>
           <span v-if="record.setInfo == 0 ">
-            <a-tag title="点击查看加班详情" @click="workInfo(record)" color="#87d068" >{{text}}</a-tag> 
+            <a-tag :title="record.multipleInfo" @click="workInfo(record)" color="#87d068" >{{text}}</a-tag> 
           </span>
         </span>
         
@@ -285,7 +285,7 @@
         modal2Visible: false,//加班信息详情
         visibleShowModal3:false,//薪资倍数选择框
         visibleShowModal4:false,//加班导出弹框
-        multiple:1,//薪资倍数选择框倍数
+        multiple:2,//薪资倍数选择框倍数
         area:'',//点击倍数弹框的区域 top/right/in
         recordPar:'',//弹框参数
         stPar:null,//1付薪，2调休
@@ -380,37 +380,38 @@
             scopedSlots: {
               customRender: 'customTime'
             }
-          },{
-            title: '上班1',
-            align: "center",
-            dataIndex: 'oneTime',
-            scopedSlots: {
-              customRender: 'customTime'
-            }
-          },
-          {
-            title: '下班1',
-            align: "center",
-            dataIndex: 'twoTime',
-            scopedSlots: {
-              customRender: 'customTime'
-            }
-          },{
-            title: '上班2',
-            align: "center",
-            dataIndex: 'threeTime',
-            scopedSlots: {
-              customRender: 'customTime'
-            }
-          },
-          {
-            title: '下班2',
-            align: "center",
-            dataIndex: 'fourTime',
-            scopedSlots: {
-              customRender: 'customTime'
-            }
           },
+          // {
+          //   title: '上班1',
+          //   align: "center",
+          //   dataIndex: 'oneTime',
+          //   scopedSlots: {
+          //     customRender: 'customTime'
+          //   }
+          // },
+          // {
+          //   title: '下班1',
+          //   align: "center",
+          //   dataIndex: 'twoTime',
+          //   scopedSlots: {
+          //     customRender: 'customTime'
+          //   }
+          // },{
+          //   title: '上班2',
+          //   align: "center",
+          //   dataIndex: 'threeTime',
+          //   scopedSlots: {
+          //     customRender: 'customTime'
+          //   }
+          // },
+          // {
+          //   title: '下班2',
+          //   align: "center",
+          //   dataIndex: 'fourTime',
+          //   scopedSlots: {
+          //     customRender: 'customTime'
+          //   }
+          // },
           {
             title: '打卡次数',
             align: "center",
@@ -510,7 +511,7 @@
               that.loadData();
             }
           }).finally(() => {
-            that.multiple = 1;
+            that.multiple = 2;
             that.selectedRowKeys = [];
           })
         },
@@ -610,7 +611,7 @@
           this.visibleShowModal4 = false;
         },
         handleCancel3(e) {
-          this.multiple = 1;
+          this.multiple = 2;
           this.visibleShowModal3 = false;
           
         },
@@ -852,11 +853,11 @@
           let that = this;
           fuXinInfo({multiple:this.multiple,viewDate:record.viewDate,viewDate1:record.beginDate,userId:userId,pkId:record.id,st:st,w:w}).then((res) => {
             if (res.success) {
-               that.multiple = 1;
+               that.multiple = 2;
               that.$message.success("已成功设置");
               that.loadData();
             } else {
-              that.multiple = 1;
+              that.multiple = 2;
               that.$message.warning(res.message);
               that.loadData();
             }