Merge branch 'attendence' into 'master'

fix(attendence): 优化排班设置添加 (特殊)排班确认功能并对接接口 See merge request !701

Merge branch 'attendence' into 'master'
fix(attendence): 优化排班设置添加 (特殊)排班确认功能并对接接口 See merge request !701
张志伟
2 parents 02045120 f007db38
Showing 3 changed files with 137 additions and 51 deletions
src/pages/attendance/Attend/subpages/Roster/api.ts
src/pages/attendance/Attend/subpages/Roster/components/Settings/index.tsx
src/pages/attendance/Attend/subpages/Roster/components/SpecialSettings/index.tsx
@@ -18,6 +18,21 @@ export interface SettingItem {
   posts: Post[];
   month: string[];
   effectMonth: string;
+  confirmType?: number; // 确认类型(-1:待办未推送, 0:未确认, 1:主动确认, 2:到期系统自动确认)
+}
+
+export enum ConfirmType {
+  待办未推送 = -1,
+  未确认 = 0,
+  主动确认 = 1,
+  到期系统自动确认 = 2,
+}
+
+export enum ConfirmTypeColor {
+  '#999' = -1,
+  '#FF921C' = 0,
+  '#4189FD' = 1,
+  '#F4333C' = 2,
 }
  
 export interface Shop {
@@ -61,6 +76,7 @@ export interface SepcialSettingsItem {
   shops?: Shop[];
   posts?: Post[];
   restMode?: number[];
+  confirmType?: number; // 确认类型(-1:待办未推送, 0:未确认, 1:主动确认, 2:到期系统自动确认)
 }
  
 export enum RestMode {
@@ -102,3 +118,21 @@ export function deleteSpecialItemApi(id: number): http.PromiseResp&lt;string&gt; {
 export function deleteSettingItemApi(id: number): http.PromiseResp<string> {
   return request.get(`${ATTENDANCE_HOST}/erp/schedule/setting/del`, { params: { id } });
 }
+
+/**
+ * @description: 确认排班配置
+ * @param {number} id
+ * @return {http.PromiseResp<string>}
+ */
+export function confirmSettingItemApi(id: number): http.PromiseResp<string> {
+  return request.get(`${ATTENDANCE_HOST}/erp/schedule/setting/confirmConfig`, { params: { id } });
+}
+
+/**
+ * @description: 确认特殊排班配置
+ * @param {number} id
+ * @return {http.PromiseResp<string>}
+ */
+export function confirmSpecialSettingItemApi(id: number): http.PromiseResp<string> {
+  return request.get(`${ATTENDANCE_HOST}/erp/schedule/special/setting/confirmConfig`, { params: { id } });
+}
@@ -2,7 +2,7 @@ import usePagination from &#39;@/hooks/usePagination&#39;;
 import moment from 'moment';
 import React, { useState } from 'react';
 import * as API from '../../api';
-import { Button, Popconfirm, Select, Table, message } from 'antd';
+import { Badge, Button, Divider, Popconfirm, Select, Table, message } from 'antd';
 import SaveModal from './SaveModal';
 import DetailModal from './DetailModal';
 import TableArrayColumnFormat from '@/pages/ehr/components/TableArrayColumnFormat';
@@ -37,6 +37,20 @@ export default function Settings() {
       });
   }
  
+  function confirmItem(id: number) {
+    const hide = message.loading('确认中，请稍后...', 0);
+    API.confirmSettingItemApi(id)
+      .then((res) => {
+        hide();
+        message.success(res.result);
+        setLoading(true);
+      })
+      .catch((error) => {
+        hide();
+        message.error(error.message ?? '确认失败');
+      });
+  }
+
   return (
     <>
       <div
@@ -71,72 +85,81 @@ export default function Settings() {
         </Button>
       </div>
       <Table loading={loading} dataSource={list} pagination={paginationConfig} rowKey="id">
-        <Column
-          title="适用门店"
-          dataIndex="shops"
-          render={(shops?: API.Shop[]) => <TableArrayColumnFormat data={shops ?? []} key="shopId" showKey="shopName" unit="个门店" />}
-        />
-        <Column
-          title="适用岗位"
-          dataIndex="posts"
-          render={(posts?: API.Post[]) => <TableArrayColumnFormat data={posts ?? []} key="postId" showKey="postName" unit="个岗位" />}
-        />
-        <Column title="月休息天数" dataIndex="monthRestCnt" width="10%" align="center" render={(text, row: any) => <div>{row.monthRestCnt}天</div>} />
-        <Column
-          title="最大连续休息天数"
-          dataIndex="restContinuousCnt"
-          width="10%"
-          align="center"
-          render={(text, row: any) => (
-            <div>
-              {row.restContinuousCnt
-                ? row.continuousType === 0
-                  ? `${row.restContinuousCnt}天`
-                  : `${Math.floor((row.restContinuousCnt * row.monthRestCnt) / 100)}天(百分比计算)`
-                : '--'}
-            </div>
+        <Table.Column
+          title="适用范围"
+          render={(record: API.SettingItem) => (
+            <span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>适用门店：</span>
+                <TableArrayColumnFormat data={record.shops ?? []} key="shopId" showKey="shopName" unit="个门店" />
+              </span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>适用岗位：</span>
+                <TableArrayColumnFormat data={record.posts ?? []} key="postId" showKey="postName" unit="个岗位" />
+              </span>
+            </span>
           )}
         />
-        <Column
-          title={`排班表设置时间（${moment(date).subtract(1, 'M').format('YYYY年MM月')}倒数后多少天)`}
-          dataIndex="scheduleDays"
-          width="16%"
-          align="center"
-          render={(text, row: any) => <div>{row.scheduleDays}天</div>}
+        <Table.Column
+          title="配置"
+          render={(record: API.SettingItem) => (
+            <span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>月休息天数：</span>
+                <span style={{ color: '#333' }}>{record.monthRestCnt || '-'}天</span>
+              </span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>最大连续休息天数：</span>
+                <span style={{ color: '#333' }}>
+                  {record.restContinuousCnt
+                    ? record.continuousType === 0
+                      ? `${record.restContinuousCnt}天`
+                      : `${Math.floor((record.restContinuousCnt * record.monthRestCnt) / 100)}天(百分比计算)`
+                    : '--'}
+                </span>
+              </span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>{`排班表设置时间（${moment(date).subtract(1, 'M').format('YYYY年MM月')}倒数后多少天)`}：</span>
+                <span style={{ color: '#333' }}>{record.scheduleDays || '-'}天</span>
+              </span>
+              <span className="span_limit_1">
+                <span style={{ color: '#999' }}>每月可主动调休次数：</span>
+                <span style={{ color: '#333' }}>{record.changeRestCnt || '-'}次</span>
+              </span>
+            </span>
+          )}
         />
         <Column
-          title="每月可主动调休次数"
-          dataIndex="changeRestCnt"
-          width="16%"
-          align="center"
-          render={(text, row: any) => <div>{row.changeRestCnt ? `${row.changeRestCnt}次` : '--'}</div>}
+          title="状态"
+          dataIndex="confirmType"
+          render={(confirmType: number) =>
+            Number.isFinite(confirmType) ? <Badge color={API.ConfirmTypeColor[confirmType]} text={API.ConfirmType[confirmType]} /> : '-'
+          }
         />
-        {/* <Column
-          title="最大连续上班天数(可跨月)"
-          dataIndex="restFrequency"
-          width="16%"
-          align="center"
-          render={(text, row: any) => <div>{row.restFrequency ? `${row.restFrequency}天/次` : '--'}</div>}
-        /> */}
         <Column
-          width="10%"
           title="操作"
           align="center"
           render={(text, record: API.SettingItem) => (
             <>
-              <Button
-                type="link"
+              {record.confirmType === API.ConfirmType.未确认 ? (
+                <>
+                  <Popconfirm placement="top" title="确定确认？" onConfirm={() => confirmItem(record.id)}>
+                    <a>确认</a>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                </>
+              ) : null}
+              <a
                 onClick={() => {
                   setItem(record);
                   setVisible(true);
                 }}
               >
                 编辑
-              </Button>
+              </a>
+              <Divider type="vertical" />
               <Popconfirm placement="top" title="确认删除？" onConfirm={() => deleteItem(record.id)}>
-                <Button type="link" danger>
-                  删除
-                </Button>
+                <a style={{ color: 'red' }}>删除</a>
               </Popconfirm>
             </>
           )}
 import React, { useEffect, useState } from 'react';
 import * as API from '../../api';
 import usePagination from '@/hooks/usePagination';
-import { Button, Divider, Form, Modal, Popconfirm, Popover, Select, Spin, Table, message } from 'antd';
+import { Badge, Button, Divider, Form, Modal, Popconfirm, Popover, Select, Spin, Table, message } from 'antd';
 import { formatObjText } from '@/utils/utils';
 import ShopSelectNew from '@/components/ShopSelectNew';
 import PostSelectNew from '@/components/PostSelectNew';
@@ -46,6 +46,20 @@ export default function SpecialSettings() {
       });
   }
  
+  function confirmItem(id: number) {
+    const hide = message.loading('确认中，请稍后...', 0);
+    API.confirmSpecialSettingItemApi(id)
+      .then((res) => {
+        hide();
+        message.success(res.result);
+        pagination.setLoading(true);
+      })
+      .catch((error) => {
+        hide();
+        message.error(error.message ?? '确认失败');
+      });
+  }
+
   function closeModal() {
     setOpen(false);
     setCurrent(undefined);
@@ -106,9 +120,24 @@ export default function SpecialSettings() {
           render={(restMode: number[]) => (restMode?.length ? restMode.map((mode) => API.RestMode[mode]).join(' + ') : '-')}
         />
         <Table.Column
+          title="状态"
+          dataIndex="confirmType"
+          render={(confirmType: number) =>
+            Number.isFinite(confirmType) ? <Badge color={API.ConfirmTypeColor[confirmType]} text={API.ConfirmType[confirmType]} /> : '-'
+          }
+        />
+        <Table.Column
           title="操作"
           render={(record: API.SepcialSettingsItem) => (
             <>
+              {record.confirmType === API.ConfirmType.未确认 ? (
+                <>
+                  <Popconfirm placement="top" title="确定确认？" onConfirm={() => confirmItem(record.id ?? -1)}>
+                    <a>确认</a>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                </>
+              ) : null}
               <a onClick={() => openModal(record)}>编辑</a>
               <Divider type="vertical" />
               <Popconfirm title="确定删除该配置？" onConfirm={() => deleteItem(record.id ?? -1)}>