f

src/pages/check/Edit.jsx

@@ -24,7 +24,7 @@ export default (props) => {
       getTaCheckById(id).then(setCheckInfo);
 
       // 查询测评调查问卷主表
-      getTaCheckItem({checkId: id, itemType: 'survey'}).then(res => {
+      getTaCheckItem({ checkId: id, itemType: 'survey' }).then(res => {
         if (res.records && res.records[0]) {
           setSurvey(res.records[0])
         }
@@ -32,6 +32,7 @@ export default (props) => {
     }
   }, [id]);
 
+  console.log('-----survey----->', survey);
   return (
     <Page back>
       <CheckForm
@@ -39,13 +40,13 @@ export default (props) => {
         onChange={setCheckInfo}
         onTabChange={setTab}
       />
-      <div style={{marginTop: '24px'}}>
-      {
-        tab == '1' && <LocTable checkId={checkInfo?.checkId} />
-      }
-      {
-        tab == '2' && <QuList itemId={survey?.itemId} itemType="survey" />
-      }
+      <div style={{ marginTop: '24px' }}>
+        {
+          tab == '1' && <LocTable checkId={checkInfo?.checkId} />
+        }
+        {
+          tab == '2' && <QuList itemId={survey?.itemId} itemType="survey" />
+        }
       </div>
       {/* <Row gutter={24} style={{marginTop: '24px'}}>
         <Col span={12}>

src/pages/check/components/LocForm.jsx

@@ -1,15 +1,21 @@
 import React from 'react';
 import { Button, Tabs, Form, Row, Col, InputNumber, message } from 'antd';
+import useBool from '@/utils/hooks/useBool';
 import { ModalForm, ProFormDigit, ProFormDependency } from '@ant-design/pro-components';
-import { postTaCheckItem } from '@/service/tacheckitem';
+import { getTaCheckItemQu } from '@/service/tacheckitemqu';
+import { getTaCheckItem, postTaCheckItem } from '@/service/tacheckitem';
 
 const LocForm = (props) => {
-  const {checkItem, open, onOpenChange, onChange} = props;
+  const { checkItem, open, onOpenChange, onChange, itemId, checkId } = props;
+
+  const [loading, startLoading, stopLoading] = useBool();
+  const [list, setList] = React.useState();
+  // const [listData, setListData] = React.useState();
 
   const [form] = Form.useForm();
 
   const onFinish = async (values) => {
-    const data = { ...(checkItem || {}), ...values, itemType: 'loc'}
+    const data = { ...(checkItem || {}), ...values, itemType: 'loc' }
     const res = await postTaCheckItem(data);
     onChange(res);
     return true;
@@ -28,6 +34,35 @@ const LocForm = (props) => {
     }
   }, [checkItem]);
 
+  React.useEffect(() => {
+    if (itemId) {
+      startLoading();
+      getTaCheckItemQu({ pageSize: 500, itemId }).then((res) => {
+        stopLoading();
+        setList(...res.records);
+      }).catch(() => {
+        stopLoading();
+      });
+    }
+  }, [itemId]);
+
+  // React.useEffect(() => {
+  //   if (checkId) {
+  //     startLoading();
+  //     getTaCheckItem({ pageSize: 500, checkId, itemType: "loc" }).then(res => {
+  //       setListData(...res.records || []);
+  //       stopLoading();
+  //     }).catch(() => {
+  //       stopLoading();
+  //     });
+  //   }
+  // }, [checkId]);
+
+
+
+  // console.log('list?.maxScore', list?.maxScore);
+  // console.log('checkItem?.answerNum', checkItem?.answerNum);
+  // console.log('list?.maxScore / checkItem?.answerNum', list?.maxScore / checkItem?.answerNum);
   return (
     <ModalForm
       title={`${checkItem?.name} 维护`}
@@ -37,12 +72,12 @@ const LocForm = (props) => {
       onFinish={onFinish}
       onOpenChange={onOpenChange}
     >
-      <ProFormDigit label="计分" name="fullScore" min={0.00} fieldProps={{precision: 2}} />
-      <ProFormDigit label="数量" name="num" min={1} fieldProps={{precision: 0}} />
-      <ProFormDependency name={['fullScore' , 'num']}>
+      <ProFormDigit readonly label="分值" value={checkItem?.answerNum == 0 ? 0 : list?.maxScore / checkItem?.answerNum} />
+      <ProFormDigit label="数量" name="num" min={1} fieldProps={{ precision: 0 }} />
+      <ProFormDependency name={['fullScore', 'num']}>
         {
-          ({fullScore, num}) => <ProFormDigit readonly label="分值" value={fullScore / num} fieldProps={{precision: 2}} />
-        }        
+          ({ fullScore, num }) => <ProFormDigit readonly label="小计" value={fullScore / num} fieldProps={{ precision: 2 }} />
+        }
       </ProFormDependency>
     </ModalForm>
   )

src/pages/check/components/LocTable.jsx

@@ -16,10 +16,13 @@ export default (props) => {
   const [open, setOpen] = React.useState(false);
 
   const onEdit = (row) => {
+    // console.log('________________________>', row);
     setCurItem(row);
     setOpen(true);
   }
 
+
+
   const columns = [
     {
       title: '点位名称',
@@ -28,8 +31,7 @@ export default (props) => {
     },
     {
       title: '分值',
-      key: 'avgScore',
-      render: (_, row) => row.fullScore ? Number(row.fullScore / (row.num || 1)).toFixed(2) : '-',
+      dataIndex: 'fullScore',
     },
     {
       title: '已收/计划数',
@@ -51,6 +53,7 @@ export default (props) => {
       title: '小计',
       dataIndex: 'fullScore',
       key: 'fullScore',
+      render: (_, row) => row.fullScore ? Number(row.fullScore * (row.num || 1)).toFixed(2) : '-',
     },
     {
       title: '测评得分',
@@ -95,11 +98,27 @@ export default (props) => {
     }
   }, [checkId]);
 
+  // console.log('---------------------------------------------------------->', list?.map((x) => Number(x.fullScore / (x.num || 1)).toFixed(2)))
+
   return (
     <Row gutter={24}>
       <Col span={12}>
         <Card>
           <Table
+            sticky
+            summary={() => (
+              <Table.Summary>
+                <Table.Summary.Row style={{ fontWeight: 'bolder' }}>
+                  <Table.Summary.Cell index={0}>合计</Table.Summary.Cell>
+                  <Table.Summary.Cell index={1}>{list?.map((x) => x.fullScore).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={2}>
+                    {list?.map((x) => x.answerNum).reduce((total, num) => total + num, 0)} / {list?.map((x) => x.num).reduce((total, num) => total + num, 0)}
+                  </Table.Summary.Cell>
+                  <Table.Summary.Cell index={3}>{list?.map((x) => Number(x.fullScore * (x.num || 1))).reduce((total, num) => total + num, 0).toFixed(2)}</Table.Summary.Cell>
+                  <Table.Summary.Cell index={4}>{list?.map((x) => x.score).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
+                </Table.Summary.Row>
+              </Table.Summary>
+            )}
             rowKey="typeId"
             loading={loading}
             columns={columns}
@@ -111,6 +130,8 @@ export default (props) => {
             })}
           />
           <LocForm
+            checkId={checkId}
+            itemId={curItem?.itemId}
             open={open}
             checkItem={curItem}
             onOpenChange={setOpen}

src/pages/check/components/QuForm.jsx

@@ -173,7 +173,7 @@ export default (props) => {
                   <ProFormDigit
                     name="anScore"
                     label="单项计分"
-                    min={0}
+                    min={-100}
                     fieldProps={{ precision: 2 }}
                     rules={[
                       {
@@ -255,8 +255,8 @@ export default (props) => {
                       <ProFormDigit
                         name="score"
                         label="计分"
-                        help="计分"
                         min={0}
+                        help="计分"
                         fieldProps={{ precision: 2 }}
                       />
                     </Col>

src/pages/check/components/QuList.jsx

@@ -117,6 +117,18 @@ export default (props) => {
       }
     >
       <Table
+        // sticky
+        // summary={() => (
+        //   <Table.Summary>
+        //     <Table.Summary.Row style={{ fontWeight: 'bolder' }}>
+        //       <Table.Summary.Cell index={0}>合计</Table.Summary.Cell>
+        //       <Table.Summary.Cell index={1}>1</Table.Summary.Cell>
+        //       <Table.Summary.Cell index={2}>{list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0)}</Table.Summary.Cell>
+        //     </Table.Summary.Row>
+        //   </Table.Summary>
+        // )}
+        title={() => (<div style={{ fontWeight: 'bolder' }}>分值合计:{list?.map((x) => x.maxScore).reduce((total, num) => total + num, 0)}</div>)}
+        bordered
         rowKey="quId"
         loading={loading}
         columns={columns}

src/pages/check/components/style.module.less

@@ -1,4 +1,3 @@
-
 .yz-table-row {
   & > td:first-child {
     border-left: 2px solid transparent;
@@ -10,3 +9,6 @@
     }
   }
 }
+.ant-table-summary {
+  display: table-header-group;
+}

src/service/tacheckiteman.js

@@ -18,7 +18,7 @@ export const getTaCheckItemAnById = (id) => request(`/api/taCheckItemAn/${id}`);
 /*
  * 更新数据
  */
-export const putTaCheckItemAn = (id, data) => request(`/api/taCheckItemAn/${id}`, { data, method: 'put' });
+export const putTaCheckItemAn = (id, data) => request(`An/${id}`, { data, method: 'put' });
 
 /*
  * 通过主键删除数据