111

src/views/system/schedulingInformation/BdClockinMonthList.vue

@@ -56,7 +56,7 @@
     <!-- table区域-begin -->
     <div>
 
-      <a-table class="j-table-force-nowrap" ref="table" size="middle" bordered rowKey="username" :columns="columns"
+      <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 }">
 

src/views/system/schedulingInformation/ViewClockUserInfo.vue

@@ -7,13 +7,13 @@
          <a style="margin-left: 24px" @click="onClearSelected">清空</a> -->
        
         <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        姓名: <a style="margin-right: 40px"> {{userName }}</a>
+        姓名: <span style="margin-right: 40px"> {{userName }}</span>
         
         <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        部门: <a style="margin-right: 40px">{{deptName}}</a>
+        部门: <span style="margin-right: 40px">{{deptName}}</span>
         
         <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        员工类型: <a style="margin-right: 40px">{{userType}}</a>
+        员工类型: <span style="margin-right: 40px">{{userType}}</span>
         
         <i class="anticon anticon-info-circle ant-alert-icon"></i>
         月份: 
@@ -63,7 +63,7 @@
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
-        @change="handleTableChange" :scroll="{ x: 1700, y: 550 }">
+        @change="handleTableChange" :scroll="{ x: 1700, y: 600 }">
 
         <span slot="ShiftTime" slot-scope="text, record, index">
            {{record.shiftRealTimeS}} - {{record.shiftRealTimeX}}
@@ -191,7 +191,7 @@
           <a-input placeholder="请填写忽略原因" v-model="errorText"></a-input>
     </a-modal>
     
-    <a-modal style="z-index:999"
+    <a-modal style="z-index:auto"
           title="请选择倍数"
           :visible="visibleShowModal3"
           :confirm-loading="confirmLoading"
@@ -578,6 +578,10 @@
           })
         },
         handleOk3(e) {
+          if(this.multiple == '' || this.multiple == null){
+            this.$message.warning("请选择倍数");
+            return;
+          }
           this.modal2Visible = false;
           this.visibleShowModal3 = false;
           if(this.area == 'top'){