feats

src/pages/check/Edit.jsx

@@ -5,21 +5,30 @@ import Page from '@/components/Page';
 import CheckForm from './components/CheckForm';
 import { useSearchParams } from 'react-router-dom';
 import { getTaCheckById } from '@/service/tacheck';
-import LocForm from './components/LocForm';
+import { getTaCheckItem } from '@/service/tacheckitem';
 import LocTable from './components/LocTable';
+import QuList from './components/QuList';
 
 export default (props) => {
   const [searchParams] = useSearchParams();
 
   const [checkInfo, setCheckInfo] = React.useState();
+  const [survey, setSurvey] = React.useState();
   const [tab, setTab] = React.useState('1');
-  const locRef = React.useRef();
 
   const id = searchParams.get('id');
 
   React.useEffect(() => {
     if (id) {
+      // 查询测评主表信息
       getTaCheckById(id).then(setCheckInfo);
+
+      // 查询测评调查问卷主表
+      getTaCheckItem({checkId: id, itemType: 'survey'}).then(res => {
+        if (res.records && res.records[0]) {
+          setSurvey(res.records[0])
+        }
+      })
     }
   }, [id]);
 
@@ -34,6 +43,9 @@ export default (props) => {
       {
         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/LocTable.jsx

@@ -52,7 +52,6 @@ export default (props) => {
         return (
           <Space>
             <Button type="link" onClick={() => onEdit(row)}>编辑</Button>
-            <Button type="link" onClick={() => setCurItem(row)}>试题</Button>
           </Space>
         )
       }
@@ -86,6 +85,9 @@ export default (props) => {
             columns={columns}
             dataSource={list}
             pagination={false}
+            onRow={(row) => ({
+              onClick: () => setCurItem(row),
+            })}
           />
           <LocForm
             open={open}

src/pages/check/components/QuList.jsx

@@ -6,7 +6,7 @@ import { deleteTaCheckItemQu } from '@/service/tacheckitemqu';
 import QuForm from './QuForm';
 
 export default (props) => {
-  const { itemId } = props;
+  const { itemId, itemType = 'loc' } = props;
 
   const [open, setOpen] = React.useState(false);
   const [list, setList] = React.useState([]);
@@ -18,7 +18,14 @@ export default (props) => {
       title: '序号',
       dataIndex: 'sortNo',
       key: 'sortNo',
-      width: 100,
+      width: itemType === 'loc' ? 100 : undefined,
+    },
+    itemType !== 'loc' &&
+    {
+      title: '题型',
+      dataIndex: 'quType',
+      key: 'quType',
+      render: t => !t ? '-' : (t == 'radio' ? '选择' : '填空'),
     },
     {
       title: '题干',
@@ -27,14 +34,14 @@ export default (props) => {
     },
     {
       title: '分值',
-      dataIndex: 'anScore',
-      key: 'anScore',
-      width: 100,
+      dataIndex: 'maxScore',
+      key: 'maxScore',
+      width: itemType === 'loc' ? 100 : undefined,
     },
     {
       title: '操作',
       key: 'options',
-      width: 100,
+      width: itemType === 'loc' ? 100 : 200,
       render: (_, row) => {
         return (
           <Space>
@@ -49,7 +56,7 @@ export default (props) => {
         )
       }
     },
-  ]
+  ].filter(Boolean)
 
   const onAdd = () => {
     setCurItem();
@@ -86,7 +93,7 @@ export default (props) => {
       newList.push(res);
     }
 
-    setList(list);
+    setList(newList);
   }
 
   React.useEffect(() => {
@@ -102,7 +109,14 @@ export default (props) => {
   }, [itemId]);
 
   return (
-    <Card title="试题列表" extra={<Button type="link" disabled={!itemId} onClick={onAdd}>新增</Button>}>
+    <Card
+      title="试题列表"
+      extra={
+        itemType == 'loc' ?
+          <Button type="link" disabled={!itemId} onClick={onAdd}>新增</Button> :
+          <Button type="primary" ghost disabled={!itemId} onClick={onAdd}>新增</Button>
+      }
+    >
       <Table
         rowKey="quId"
         loading={loading}