Merge branch 'master' into crm_fix

舒述军
2 parents 4cbecaac 67f47de1
Showing 10 changed files with 149 additions and 43 deletions
src/pages/attendance/Attend/subpages/AttendanceGroup/api.ts
src/pages/attendance/Attend/subpages/AttendanceGroup/components/TimeConfig.tsx
src/pages/attendance/Leave/components/Modal.tsx
src/pages/attendance/Leave/index.tsx
src/pages/finance/SpecialAccount/FinancingCompany/components/CreateModal.tsx
src/pages/finance/SpecialAccount/FinancingCompany/components/Filter.tsx
src/pages/finance/SpecialAccount/FinancingCompany/components/List.tsx
src/pages/performance/EvaGroupSetting/EditComfirm/components/CondLaddersTable.tsx
src/pages/performance/KpiGroupSetting/EditComfirm/components/CondLaddersTable.tsx
src/pages/pms/storage/partShop/components/PartShopModal.tsx
-import { http,PromisePageResp } from "@/typing/http";
+import { http, PromisePageResp } from "@/typing/http";
 import request from "@/utils/request";
 import { ATTENDANCE_HOST } from "@/utils/host";
  
@@ -70,10 +70,15 @@ export function saveApi(params?: Item): P&lt;void&gt; {
 }
  
 interface BaseSettingItem {
-  id?: number;
-  noticeTime?: number; //待办提前通知时间（分钟）
-  defectTime?: number; //严重迟到时间判定（分钟）
-  lackTime?: number; //缺卡判定时间
+  id?: number; // 主键
+  groupId?: number; // 集团id
+  defectTime?: number; // 严重迟到时间判定(分钟)
+  onDutyNoticeTime?: number; // 上班待办提前通知时间(分钟)
+  offDutyNoticeTime?: number; // 下班待办延后通知时间(分钟)
+  onDutyLackTime?: number; // 上班缺卡时间判定(分钟)
+  offDutyLackTime?: number; // 下班缺卡时间判定(分钟)
+  outsideRemainingHour?: number; // 外勤结束时间离门店下班时间≤?小时不用打考勤卡
+  travelRemainingHour?: number; // 出差结束时间离门店下班时间≤?小时不用打考勤卡
 }
 /**获取考勤组基础设置
  * /attendance/base/setting/get
-import { Button, Form, InputNumber, message, Popconfirm, Radio, Row, Select } from "antd";
+import { Button, Form, InputNumber, message, Popconfirm, Row } from "antd";
 import React, { useEffect, useState } from "react";
 import useInitial from "@/hooks/useInitail";
-import { fetchBaseSettingApi, saveOrUpdateApi } from "@/pages/attendance/Attend/subpages/AttendanceGroup/api";
+import {
+  fetchBaseSettingApi,
+  saveOrUpdateApi,
+} from "@/pages/attendance/Attend/subpages/AttendanceGroup/api";
  
 const FormItem = Form.Item;
  
@@ -49,7 +52,12 @@ export default function TimeConfig() {
  
   return (
     <div>
-      <Form form={form} onFinish={submit} labelCol={{ span: 6 }} wrapperCol={{ span: 15 }}>
+      <Form
+        form={form}
+        onFinish={submit}
+        labelCol={{ span: 6 }}
+        wrapperCol={{ span: 15 }}
+      >
         <div
           style={{
             display: "flex",
@@ -77,7 +85,8 @@ export default function TimeConfig() {
               />
             </FormItem>
             <span style={{ marginLeft: 5 }}>
-              到应打卡时间 <span style={{ color: "#999999" }}>（除最后一次应打卡）</span>
+              到应打卡时间{" "}
+              <span style={{ color: "#999999" }}>（除最后一次应打卡）</span>
             </span>
           </div>
         </div>
@@ -93,7 +102,10 @@ export default function TimeConfig() {
         >
           <span style={{ color: "#ff4d4f" }}>*</span> 最后一次应打卡时间要求:
           <div>
-            <span style={{ marginRight: 5, marginLeft: 5 }}> 应打卡时间延后</span>
+            <span style={{ marginRight: 5, marginLeft: 5 }}>
+              {" "}
+              应打卡时间延后
+            </span>
             <FormItem
               name="offDutyNoticeTime"
               label="打卡时间要求"
@@ -108,7 +120,9 @@ export default function TimeConfig() {
                 disabled={!edit}
               />
             </FormItem>
-            <span style={{ color: "#999999", marginLeft: 5 }}>(当天仅一次打卡不计此情况)</span>
+            <span style={{ color: "#999999", marginLeft: 5 }}>
+              (当天仅一次打卡不计此情况)
+            </span>
           </div>
         </div>
  
@@ -123,9 +137,17 @@ export default function TimeConfig() {
         >
           <span style={{ color: "#ff4d4f" }}>*</span> 严重迟到判定:
           <div>
-            <span style={{ marginLeft: 5, marginRight: 5 }}>在应打卡时间延后</span>
+            <span style={{ marginLeft: 5, marginRight: 5 }}>
+              在应打卡时间延后
+            </span>
  
-            <FormItem name="defectTime" noStyle rules={[{ required: true, message: "请填写严重迟到时间判定(分钟)" }]}>
+            <FormItem
+              name="defectTime"
+              noStyle
+              rules={[
+                { required: true, message: "请填写严重迟到时间判定(分钟)" },
+              ]}
+            >
               <InputNumber
                 min={0}
                 style={{ width: 200 }}
@@ -147,7 +169,10 @@ export default function TimeConfig() {
         >
           <span style={{ color: "#ff4d4f" }}>*</span> 上班缺卡时间判定:
           <div>
-            <span style={{ marginRight: 5, marginLeft: 5 }}> 应打卡时间延后</span>
+            <span style={{ marginRight: 5, marginLeft: 5 }}>
+              {" "}
+              应打卡时间延后
+            </span>
             <FormItem
               name="onDutyLackTime"
               label="打卡时间要求"
@@ -175,8 +200,14 @@ export default function TimeConfig() {
         >
           <span style={{ color: "#ff4d4f" }}>*</span> 下班缺卡时间判定:
           <div>
-            <span style={{ marginRight: 5, marginLeft: 5 }}>在应打卡时间延后</span>
-            <FormItem name="offDutyLackTime" noStyle rules={[{ required: true, message: "请填写缺卡时间判定(分钟)" }]}>
+            <span style={{ marginRight: 5, marginLeft: 5 }}>
+              在应打卡时间延后
+            </span>
+            <FormItem
+              name="offDutyLackTime"
+              noStyle
+              rules={[{ required: true, message: "请填写缺卡时间判定(分钟)" }]}
+            >
               <InputNumber
                 min={0}
                 style={{ width: 200 }}
@@ -188,6 +219,66 @@ export default function TimeConfig() {
             <span style={{ marginLeft: 5 }}>后不允许打卡</span>
           </div>
         </div>
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "flex-start",
+            alignItems: "center",
+            marginTop: 20,
+            paddingLeft: "20%",
+          }}
+        >
+          <span style={{ color: "#ff4d4f" }}>*</span> 外勤结束时间:
+          <div>
+            <span style={{ marginLeft: 5, marginRight: 5 }}>
+              离门店下班时间提前
+            </span>
+            <FormItem
+              name="outsideRemainingHour"
+              noStyle
+              rules={[{ required: true, message: "请填写打卡时间要求" }]}
+            >
+              <InputNumber
+                min={0}
+                style={{ width: 200 }}
+                formatter={(value) => `${value}小时`}
+                parser={(value: any) => value.replace("小时", "")}
+                disabled={!edit}
+              />
+            </FormItem>
+            <span style={{ marginLeft: 5, marginRight: 5 }}>不用考勤打卡</span>
+          </div>
+        </div>
+        <div
+          style={{
+            display: "flex",
+            justifyContent: "flex-start",
+            alignItems: "center",
+            marginTop: 20,
+            paddingLeft: "20%",
+          }}
+        >
+          <span style={{ color: "#ff4d4f" }}>*</span> 出差结束时间:
+          <div>
+            <span style={{ marginLeft: 5, marginRight: 5 }}>
+              离门店下班时间提前
+            </span>
+            <FormItem
+              name="travelRemainingHour"
+              noStyle
+              rules={[{ required: true, message: "请填写打卡时间要求" }]}
+            >
+              <InputNumber
+                min={0}
+                style={{ width: 200 }}
+                formatter={(value) => `${value}小时`}
+                parser={(value: any) => value.replace("小时", "")}
+                disabled={!edit}
+              />
+            </FormItem>
+            <span style={{ marginLeft: 5, marginRight: 5 }}>不用考勤打卡</span>
+          </div>
+        </div>
       </Form>
       <Row style={{ width: "80%", marginTop: 20 }} justify="center">
         {!edit ? (
@@ -196,7 +287,11 @@ export default function TimeConfig() {
           </Button>
         ) : (
           <div>
-            <Button type="primary" onClick={form.submit} loading={confirmLoading}>
+            <Button
+              type="primary"
+              onClick={form.submit}
+              loading={confirmLoading}
+            >
               确定
             </Button>
             <Popconfirm
@@ -22,8 +22,9 @@ const CreateModal = (props: Props) =&gt; {
   useEffect(() => {
     if (visiable && type === 1) {
       API.fetchDetail(1).then((res: any) => {
-        setYear(res.data);
-        setYearData(res.data.conditions);
+        const data = res.data || {};
+        setYear(data);
+        setYearData(data.conditions);
       });
     }
   }, [visiable]);
@@ -91,7 +92,7 @@ const CreateModal = (props: Props) =&gt; {
           rules={[{ required: !(type === 1 || type === 8 || type === 6) }]}
           hidden={type === 1 || type === 8 || type === 6 || type === 10}
         >
-          <InputNumber min={1} style={{ width: 200 }} />
+          <InputNumber min={1} style={{ width: 200 }} addonAfter="天" />
         </FormItem>
         <FormItem
           name="annualWay"
@@ -110,7 +111,7 @@ const CreateModal = (props: Props) =&gt; {
           rules={[{ required: type === 1 }]}
           hidden={!(type === 1)}
         >
-          <InputNumber min={1} style={{ width: 200 }} />
+          <InputNumber min={1} style={{ width: 200 }} addonAfter="天" />
         </FormItem>
         <FormItem
           name="advanceDays"
@@ -127,7 +128,7 @@ const CreateModal = (props: Props) =&gt; {
           ]}
           hidden={type === 3 || type === 8 || type === 5 || type === 10}
         >
-          <InputNumber min={1} style={{ width: 200 }} />
+          <InputNumber min={1} style={{ width: 200 }} addonAfter="天" />
         </FormItem>
         <FormItem
           name="times"
@@ -135,7 +136,7 @@ const CreateModal = (props: Props) =&gt; {
           rules={[{ required: type === 6 || type === 8 }]}
           hidden={!(type === 6 || type === 8)}
         >
-          <InputNumber min={1} style={{ width: 200 }} />
+          <InputNumber min={1} style={{ width: 200 }} addonAfter="次" />
         </FormItem>
         <FormItem
           name="conditions"
-import React, { useState } from 'react';
+import React, { useState } from "react";
 import { PageHeaderWrapper } from "@ant-design/pro-layout";
-import { Button, Card, Table } from 'antd';
-import * as TYPE from './entity';
-import Modal from './components/Modal';
-import useInitial from '@/hooks/useInitail';
-import * as API from './api';
+import { Button, Card, Table } from "antd";
+import * as TYPE from "./entity";
+import Modal from "./components/Modal";
+import useInitial from "@/hooks/useInitail";
+import * as API from "./api";
  
 const Column = Table.Column;
  
@@ -13,7 +13,7 @@ const Leave = () =&gt; {
   const [type, setType] = useState<number>(0);
   const { data, setParams } = useInitial(API.fetchDetail, {}, type);
  
-  const onEdit = (record:any) => {
+  const onEdit = (record: any) => {
     setParams(record.type, true);
     setType(record.type);
     setVisiable(true);
@@ -40,10 +40,10 @@ const Leave = () =&gt; {
         visiable={visiable}
         setVisiable={setVisiable}
         type={type}
-        data={data}
+        data={data || {}}
       />
     </PageHeaderWrapper>
   );
 };
  
-export default Leave;
 \ No newline at end of file
+export default Leave;
@@ -10,7 +10,8 @@ const FormItem = Form.Item;
 const { Option } = Select;
  
 export default function CreateModal() {
-  const { visible, current, setCurrent, setVisible, fcList, accountList, setLoading, dealerId, brandList } = useStore();
+  const { visible, current, setCurrent, setVisible, fcList, accountList, setLoading, dealerId, brandList, type } =
+    useStore();
   const [form] = Form.useForm();
  
   const [saveLoading, setSaveLoading] = useState<boolean>(false);
@@ -76,6 +77,10 @@ export default function CreateModal() {
   }
  
   function submit(fieldValue: any) {
+    if (fieldValue.depositAccount.value === fieldValue.account.value) {
+      message.error("还款保证金账户、一般账户请勿配置为同一账户", 1.5);
+      return;
+    }
     const param = {
       dealerId,
       ...fieldValue,
@@ -155,7 +160,7 @@ export default function CreateModal() {
           {({ getFieldValue }): any => {
             const category = getFieldValue("compCategory");
             return category ? (
-              <FormItem label="融资公司" name="fcComp" rules={[{ required: true, message: "请选择融资公司" }]}>
+              <FormItem label="往来银行" name="fcComp" rules={[{ required: true, message: "请选择往来银行" }]}>
                 <Select
                   showSearch
                   labelInValue
@@ -185,7 +190,7 @@ export default function CreateModal() {
             <Radio value={2}>每张票支付</Radio>
           </Radio.Group>
         </FormItem>
-        <FormItem name="depositAccount" label="保证金账户">
+        <FormItem name="depositAccount" label="还款保证金账户">
           <Select labelInValue placeholder="请选择账户" showSearch optionFilterProp="children" allowClear>
             {accountList.map((item) => (
               <Option key={item.id} value={item.id}>
@@ -26,7 +26,6 @@ export default function AccountList() {
       }}
     >
       <Row style={{ display: "flex", flex: 1, alignItems: 'center' }}>
-        <div>商家：</div>
         <Col span={6}>
           <Select
             placeholder="请选择商家"
@@ -44,7 +43,6 @@ export default function AccountList() {
             ))}
           </Select>
         </Col>
-        <div style={{ marginLeft: 20 }}>品牌：</div>
         <Col span={6}>
           <Select
             placeholder="请选择品牌"
@@ -39,7 +39,7 @@ export default function SalesFinanceList() {
             }
           >
             <span>
-              保证金&nbsp;&nbsp;
+              还款保证金账户&nbsp;&nbsp;
               <ExclamationCircleFilled style={{ color: "#40a9ff" }} />
             </span>
           </Popover>
@@ -205,10 +205,11 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
       render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
     },
     {
-      title: "标准分",
+      title: "绩效分折算比例",
       dataIndex: "scorePercent",
       width: "15%",
       editable: true,
+      render: (value: number) => value + "%",
     },
     {
       title: "操作",
@@ -202,13 +202,14 @@ const LadderTable = ({ value, onChange, readOnly, visible, type, setladderVisibl
       dataIndex: "upper",
       width: "20%",
       editable: true,
-      render: (value: number) => ((value && value !== 65536) ? (value + "%") : ""),
+      render: (value: number) => (value && value !== 65536 ? value + "%" : ""),
     },
     {
-      title: "标准分",
+      title: "绩效分折算比例",
       dataIndex: "scorePercent",
       width: "15%",
       editable: true,
+      render: (value: number) => value + "%",
     },
     {
       title: "操作",
@@ -29,7 +29,7 @@ export default function PartShopModal() {
       });
     }
   }, [visible]);
-  
+
   useEffect(() => {
     if (isadd) {
       setItem({});
@@ -119,7 +119,7 @@ export default function PartShopModal() {
           <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="总库存数量" disabled={isprice || isadd} />
         </Item>
         <Item label="锁定库存" name="lockStock" rules={[{ required: true, message: "请输入锁定库存" }, { validator: validatorLockStock }]}>
-          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled={isprice || isadd} />
+          <InputNumber style={{ width: "100%" }} min={0} step={1} placeholder="锁定库存" disabled />
         </Item>
         {!!fw && !isprice && !isadd && (
         <Item label="修改人" name="user" rules={[{ required: true, message: "请输入修改人" }]}>