ysh 3 anni fa
parent
commit
cae6278a16

+ 13 - 4
src/views/system/schedulingInformation/BdClockinMonthList.vue

@@ -43,9 +43,9 @@
         :dataSource="dataSource" :pagination="ipagination" :loading="loading" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
-        <span slot="latetimeState" slot-scope="text, record, index">
-          <a-tag color="pink" v-if="record.latetimeX > 0 || record.latetimeS > 0 ">异常</a-tag>
-          <a-tag color="#87d068" v-if="record.latetimeX <= 0 && record.latetimeS <= 0 ">正常</a-tag>
+        <span slot="syU8" slot-scope="text, record, index">
+          <a v-if="record.syU8 == 1 ">是</a>
+          <a v-if="record.syU8 == 0 ">否</a>
         </span>
 
       </a-table>
@@ -117,6 +117,12 @@
             title: '病假时长(天)',
             align: 'center',
             dataIndex: 'holidayTimeBj'
+          },
+          {
+            title: '是否同步U8',
+            align: 'center',scopedSlots: {
+              customRender: 'syU8'
+            }
           }
         ],
         url: {
@@ -161,7 +167,10 @@
            onOk: function () {
              putAction(that.url.syMonthReport, {viewDate:nowDate,ids:ids}).then((res) => {
                if (res.success) {
-                 console.log(res.result);
+                 that.$message.success("同步成功");
+                 that.loadData();
+               }else{
+                 that.$message.warning(res.message);
                }
              }).finally(() => {
                    

+ 1 - 1
src/views/system/schedulingInformation/ViewClockInList.vue

@@ -38,7 +38,7 @@
                   
                   <a-select v-model="queryParam.name" placeholder="请选择班次">
                     <a-select-option value="">请选择</a-select-option>
-                    <a-select-option value="a">休息</a-select-option>
+                    <a-select-option value="休息">休息</a-select-option>
                     <a-select-option v-for="(item,index) in shiftlist" :value="item.name">{{item.name}} ({{item.startDate}}-{{item.endDate}})
                     </a-select-option>
                   </a-select>