feats

src/components/Money/float.js

@@ -1,4 +0,0 @@
-const epsilonN = N => num => Math.round( num * N + Number.EPSILON ) / N;
-const epsilon2 = epsilonN(1e2);
-
-export default epsilon2;

src/components/Money/index.jsx

@@ -1,6 +1,8 @@
 import { InputNumber } from "antd"
 import { useEffect, useState } from "react"
-import epsilon2 from './float'
+
+const epsilonN = N => num => Math.round( num * N + Number.EPSILON ) / N;
+const epsilon2 = epsilonN(1e2);
 
 export default (props) => {
 

src/components/Page/index.jsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import { Typography } from 'antd';
+import { useNavigate } from 'react-router-dom';
 import useRoute from '@/utils/hooks/useRoute';
+import { ArrowLeftOutlined } from '@ant-design/icons';
 
 const pageStyle = {
   // margin: '24px 24px 0 24px',
@@ -14,24 +16,47 @@ const titleStyle = {
   paddingBottom: '12px',
 }
 
+const backStyle = {
+  color: '#333',
+  marginRight: '0.5em',
+}
+
 const Title = (props) => {
+  const { extra, back } = props;
+  const navigate = useNavigate();
+
+  const goBack = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    navigate(-1);
+  }
 
   return (
     <div style={titleStyle}>
-      <Typography.Title level={3} style={{fontWeight: 400, flex: 'none'}}>{props.children}</Typography.Title>
-      <div style={{flex: 'none'}}>{props.extra}</div>
+      <Typography.Title level={3} style={{fontWeight: 400, flex: 'none'}}>
+        {
+          back && (
+            <span onClick={goBack}><ArrowLeftOutlined style={backStyle} /></span>
+          )
+        }
+        {props.children}
+      </Typography.Title>
+      <div style={{flex: 'none'}}>{extra}</div>
     </div>
   )
 }
 
 export default (props) => {
+  const { extra, back } = props;
+
   const { meta = {} } = useRoute() || {};
   const style = meta.noLayout ? { height: '100%' } : pageStyle;
   const title = props.title || meta.title;
 
   return (
     <div style={style}>
-      { title && !meta.noLayout && <Title extra={props.extra}>{ title }</Title> }
+      { title && !meta.noLayout && <Title extra={extra} back={back}>{ title }</Title> }
       {props.children}
     </div>
   )

src/components/Percent/index.jsx

@@ -0,0 +1,32 @@
+import { InputNumber } from "antd"
+import { useEffect, useState } from "react"
+
+const epsilonN = N => num => Math.round( num * N + Number.EPSILON ) / N;
+const epsilon2 = epsilonN(1e2);
+
+export default (props) => {
+
+  const { value, onChange, ...leftProps } = props
+
+  const [percent, setPercent] = useState(0)
+
+  useEffect(() => {
+    setPercent(epsilon2(value * 100))
+  }, [value])
+
+  const handleChange = (val) => {
+    onChange(epsilon2(val / 100))
+  }
+
+  return (
+    <InputNumber
+      min='0'
+      {...leftProps}
+      value={percent}
+      onChange={handleChange}
+      precision={2}
+      formatter={value => `${value} %`}
+      parser={value => value.replace(/\s?%/g, '')}
+    />
+  )
+}

src/pages/check/Edit.jsx

@@ -33,7 +33,7 @@ export default (props) => {
   }, [id]);
 
   return (
-    <Page>
+    <Page back>
       <CheckForm
         checkInfo={checkInfo}
         onChange={setCheckInfo}

src/pages/check/components/CheckForm.jsx

@@ -1,10 +1,12 @@
 import React from 'react';
 import dayjs from 'dayjs';
 import { EditOutlined } from '@ant-design/icons';
-import { Card, Tabs, Button, Form, Input, DatePicker } from 'antd';
+import { Row, Col, Card, Tabs, Button, Form, Input, DatePicker } from 'antd';
 import { ModalForm } from '@ant-design/pro-components';
 import { postTaCheck, putTaCheck } from '@/service/tacheck';
 import { useNavigate } from "react-router-dom";
+import Percent from '@/components/Percent';
+import SurverForm from './SurveyForm'
 
 export default (props) => {
   const navigate = useNavigate();
@@ -49,13 +51,15 @@ export default (props) => {
   }, [checkInfo]);
 
   return (
-    <Card bodyStyle={{ padding: 0 }}>
-      <div style={{ display: 'flex', padding: '1em', alignItems: 'center' }}>
-        <div style={{ flex: 'none' }}><Button type="link" onClick={onEdit} icon={<EditOutlined />} /></div>
-        <div style={{ flex: 'none', margin: '0 1em' }}>{dateStr}</div>
-        <div style={{ flex: '1', fontSize: '1.6em' }}>{title}</div>
-        <div style={{ flex: 'none', fontSize: '1.6em' }}><Button type="primary" onClick={() => navigate(-1)}>返回</Button></div>
-      </div>
+    <Card bodyStyle={{ padding: 0 }}
+      title={(
+        <div style={{ fontWeight: 'normal' }}>
+          <span style={{ display: 'inline-block', fontSize: '1.6em' }}>{title}</span>
+          <span style={{ display: 'inline-block', margin: '0 1em' }}>{dateStr}</span>
+        </div>
+      )}
+      extra={<Button type="link"  icon={<EditOutlined />} onClick={onEdit}>编辑</Button>}
+    >
       <Tabs
         defaultActiveKey='1'
         onChange={onTabChange}
@@ -66,7 +70,12 @@ export default (props) => {
             key: '1',
           },
           {
-            label: '问卷调查',
+            label: (
+              <div>
+                <span>调查问卷</span>
+                <SurverForm checkId={checkInfo?.checkId} />
+              </div>
+            ),
             key: '2',
           }
         ]}
@@ -81,6 +90,18 @@ export default (props) => {
         <Form.Item name="endDate" label="结束时间" required>
           <DatePicker placeholder="请选择" style={{ width: '100%' }} />
         </Form.Item>
+        <Row gutter={24}>
+          <Col span={12}>
+            <Form.Item name="locScorePercent" label="实地占比 (%)" required>
+              <Percent placeholder="请设置" style={{ width: '100%' }} />
+            </Form.Item>
+          </Col>
+          <Col span={12}>
+            <Form.Item name="surveyScorePercent" label="问卷占比 (%)" required>
+              <Percent placeholder="请设置" style={{ width: '100%' }} />
+            </Form.Item>
+          </Col>
+        </Row>
       </ModalForm>
     </Card>
   )

src/pages/check/components/QuForm.jsx

@@ -253,7 +253,7 @@ export default (props) => {
                 }
                 return (
                   <Row gutter={24} style={{ width: '730px' }}>
-                    <Col span={6}>
+                    <Col span={8}>
                       <ProFormText
                         name="answerCode"
                         label="选项"
@@ -261,7 +261,7 @@ export default (props) => {
                         initialValue={'A'}
                       />
                     </Col>
-                    <Col span={6}>
+                    <Col span={8}>
                       <ProFormDigit
                         name="score"
                         label="计分"
@@ -270,7 +270,7 @@ export default (props) => {
                         fieldProps={{ precision: 2 }}
                       />
                     </Col>
-                    <Col span={6}>
+                    {/* <Col span={6}>
                       <ProFormSelect
                         name="reportIssue"
                         label="上报问题"
@@ -281,8 +281,8 @@ export default (props) => {
                           1: '上报',
                         }}
                       />
-                    </Col>
-                    <Col span={6}>
+                    </Col> */}
+                    <Col span={8}>
                       <ProFormText
                         name="answer"
                         label="答案"

src/pages/check/components/SurveyForm.jsx

@@ -0,0 +1,83 @@
+import React from 'react';
+import { Button, Tabs, Form, Row, Col, InputNumber, message } from 'antd';
+import { EditOutlined } from '@ant-design/icons';
+import { ModalForm, ProFormDigit, ProFormDependency } from '@ant-design/pro-components';
+import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
+
+const itemType = 'survey';
+
+const SurveyForm = (props) => {
+  const { checkId } = props;
+
+  const [show, setShow] = React.useState(false);
+  const [loading, setLoading] = React.useState(false);
+  const [checkItem, setCheckItem] = React.useState();
+  const [form] = Form.useForm();
+  
+  const onClick = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setShow(true);
+  }
+
+  const onFinish = async (values) => {
+    const data = { ...(checkItem || {}), ...values, itemType }
+    const res = await postTaCheckItem(data);
+    setCheckItem(res);
+    form.setFieldsValue(res);
+    return true;
+  }
+
+  const reset = () => {
+    form.resetFields();
+    form.setFieldsValue({ num: 1 });
+  }
+
+  React.useEffect(() => {
+    if (checkItem) {
+      form.setFieldsValue(checkItem);
+    } else {
+      reset();
+    }
+  }, [checkItem]);
+
+  
+  React.useEffect(() => {
+    if (checkId) {
+      setLoading(true);
+      getTaCheckItem({ checkId, itemType }).then(res => {
+        const item = (res.records || [])[0]
+        if (item) {
+          setCheckItem(item);
+          form.setFieldsValue(item);
+        }
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [checkId]);
+
+  return (
+    <ModalForm
+      title={`问卷调查维护`}
+      width={600}
+      open={show}
+      form={form}
+      onFinish={onFinish}
+      onOpenChange={setShow}
+      trigger={(
+        <>
+          <span style={{ display: 'inline-block', marginLeft: '1em' }}>{`预收 ${checkItem?.num || 0} 份`}</span>
+          <Button type="link" size="middle" loading={loading} onClick={onClick}>
+            <EditOutlined />
+          </Button>
+        </>
+      )}
+    >
+      <ProFormDigit label="预收数量" name="num" min={1} fieldProps={{precision: 0}} />
+    </ModalForm>
+  )
+}
+
+export default SurveyForm;

src/pages/check/index.jsx

@@ -69,11 +69,13 @@ export default (props) => {
       title: "实地测评得分",
       dataIndex: "locScore",
       hideInSearch: true,
+      render: (_, row) => (row.locScore || 0) * (row.locScorePercent || 0),
     },
     {
       title: "调查问卷得分",
       dataIndex: "surveyScore",
       hideInSearch: true,
+      render: (_, row) => (row.surveyScore || 0) * (row.surveyScorePercent || 0),
     },
     {
       title: "状态",