Merge branch 'master' of http://139.196.39.194:9021/yuansh/GEKE_VIEW

src/views/system/AttendanceRuleList.vue

@@ -38,7 +38,7 @@
       <a-button @click="handleAddts()" type="primary" icon="plus" v-has="'UserShift:add'">调整</a-button>
       <a-tabs default-active-key="2" @change="callback">
         <a-tab-pane key="2" tab="按班次上下班">
-          <a-table bordered rowKey="id" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
+          <a-table bordered rowKey="id" :loading="loading" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
             :pagination="ipagination" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
@@ -67,7 +67,7 @@
             </span>
           </a-table>
 
-          <a-table bordered :data-source="dataSources" :columns="columnst" :scroll="{ x:300 }" :pagination="ipaginations" @change="handleTableChanges">
+          <a-table bordered :data-source="dataSources" :loading="loading" :columns="columnst" :scroll="{ x:300 }" :pagination="ipaginations" @change="handleTableChanges">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
               <div style="height: 35px;">
                 <div style="text-align: center;margin-top: -10px;">
@@ -87,7 +87,7 @@
           </a-table>
         </a-tab-pane>
         <a-tab-pane key="1" tab="固定时间上下班">
-          <a-table bordered rowKey="id" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
+          <a-table bordered rowKey="id" :loading="loading" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
             :pagination="ipagination" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
@@ -110,7 +110,7 @@
           </a-table>
         </a-tab-pane>
         <a-tab-pane key="3" tab="自由时间上下班">
-          <a-table bordered rowKey="id" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
+          <a-table bordered rowKey="id"  :loading="loading" :data-source="dataSource" :columns="columns" :scroll="{ x:300 }"
             :pagination="ipagination" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
@@ -133,7 +133,7 @@
           </a-table>
         </a-tab-pane>
         <a-tab-pane key="4" tab="未排班" force-render>
-          <a-table bordered :data-source="dataSource" rowKey="id" :columns="columns" :scroll="{ x:300 }"
+          <a-table bordered :data-source="dataSource" :loading="loading" rowKey="id" :columns="columns" :scroll="{ x:300 }"
             :pagination="ipagination" @change="handleTableChange"
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChanges}">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">

src/views/system/modules/AttendanceRuleModal.vue

@@ -66,7 +66,7 @@
         </div>
 
         <div>
-          <a-table bordered :data-source="dataSource" :columns="columns" :scroll="{ x:300 }" :pagination="ipagination"
+          <a-table bordered :data-source="dataSource" :loading="loading" :columns="columns" :scroll="{ x:300 }" :pagination="ipagination"
             @change="handleTableChange">
             <template v-for='(dayobject,i) in days' :slot="dayobject.day.getDate()" style="color: #ff6b81">
               <div style="height: 35px;">