Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/pc-admin into dev1.0

src/pages/check/components/CheckForm.jsx

@@ -4,8 +4,10 @@ import { EditOutlined } from '@ant-design/icons';
 import { 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";
 
 export default (props) => {
+  const navigate = useNavigate();
   const { checkInfo, onChange, onTabChange } = props;
 
   const [open, setOpen] = React.useState(false);
@@ -47,16 +49,17 @@ 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>
+    <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>
       <Tabs
         defaultActiveKey='1'
         onChange={onTabChange}
-        tabBarStyle={{margin: '0 2em'}}
+        tabBarStyle={{ margin: '0 2em' }}
         items={[
           {
             label: '实地测评',
@@ -69,15 +72,15 @@ export default (props) => {
         ]}
       />
       <ModalForm title="测评维护" open={open} width={480} form={form} onFinish={onFinish} onOpenChange={setOpen}>
-          <Form.Item name="title" label="测评名称" required>
-            <Input placeholder="请输入测评名称" />
-          </Form.Item>
-          <Form.Item name="startDate" label="开始时间" required>
-            <DatePicker placeholder="请选择" style={{ width: '100%' }} />
-          </Form.Item>
-          <Form.Item name="endDate" label="结束时间" required>
-            <DatePicker placeholder="请选择" style={{ width: '100%' }} />
-          </Form.Item>
+        <Form.Item name="title" label="测评名称" required>
+          <Input placeholder="请输入测评名称" />
+        </Form.Item>
+        <Form.Item name="startDate" label="开始时间" required>
+          <DatePicker placeholder="请选择" style={{ width: '100%' }} />
+        </Form.Item>
+        <Form.Item name="endDate" label="结束时间" required>
+          <DatePicker placeholder="请选择" style={{ width: '100%' }} />
+        </Form.Item>
       </ModalForm>
     </Card>
   )

src/pages/check/components/LocTable.jsx

@@ -31,7 +31,7 @@ export default (props) => {
       render: (_, row) => row.fullScore ? Number(row.fullScore / (row.num || 1)).toFixed(2) : '-',
     },
     {
-      title: '数量',
+      title: '已收/计划数',
       dataIndex: 'num',
       key: 'num',
     },
@@ -74,7 +74,7 @@ export default (props) => {
   React.useEffect(() => {
     if (checkId) {
       startLoading();
-      getTaCheckItem({pageSize: 500, checkId, itemType: "loc"}).then(res => {
+      getTaCheckItem({ pageSize: 500, checkId, itemType: "loc" }).then(res => {
         setList(res.records || []);
         stopLoading();
       }).catch(() => {
@@ -82,7 +82,7 @@ export default (props) => {
       });
     }
   }, [checkId]);
-  
+
   return (
     <Row gutter={24}>
       <Col span={12}>

src/pages/check/components/QuForm.jsx

@@ -16,8 +16,9 @@ import { getTdQuestion } from '@/service/tdquestion';
 const queryQu = transformQuery(getTdQuestion, { searchKey: 'title', labelKey: 'title', valueKey: 'quId' });
 
 export default (props) => {
-  const {open, onOpenChange, quInfo, itemId, itemType, onChange} = props;
+  const { open, onOpenChange, quInfo, itemId, itemType, onChange } = props;
   const [form] = Form.useForm();
+  const [value, setValue] = React.useState();
 
   const onFinish = async (values) => {
     const data = {
@@ -54,6 +55,7 @@ export default (props) => {
     }
   }, [quInfo]);
 
+  // console.log('value', value);
   return (
     <DrawerForm
       title="问题维护"
@@ -66,16 +68,16 @@ export default (props) => {
         destroyOnClose: true,
         extra: (
           <>
-          {
-            itemType == 'survey' && (
-              <SearchSelect
-                placeholder="请输入题干搜索题库"
-                style={{width: '300px'}}
-                request={queryQu}
-                onChange={onTplChange}
-              />
-            )
-          }
+            {
+              itemType == 'survey' && (
+                <SearchSelect
+                  placeholder="请输入题干搜索题库"
+                  style={{ width: '300px' }}
+                  request={queryQu}
+                  onChange={onTplChange}
+                />
+              )
+            }
           </>
         )
       }}
@@ -166,7 +168,7 @@ export default (props) => {
         <Col span={12}>
           <ProFormDependency name={['quType']}>
             {
-              ({quType}) => (
+              ({ quType }) => (
                 quType != 'fill' ? null : (
                   <ProFormDigit
                     name="anScore"
@@ -188,7 +190,7 @@ export default (props) => {
         <Col span={12}>
           <ProFormDependency name={['quType']}>
             {
-              ({quType}) => (
+              ({ quType }) => (
                 quType != 'fill' ? null : (
                   <ProFormText
                     name="fillUnit"
@@ -225,54 +227,74 @@ export default (props) => {
           </Form.Item>
         )
       }
-      
+
       <ProFormDependency name={['quType']}>
         {
-          ({quType}) => (
+          ({ quType }) => (
             quType == 'fill' ? null : (
               <ProFormList
                 name="answerList"
                 label="选项列表"
                 copyIconProps={false}
-              >
-                <Row gutter={24} style={{ width: '730px' }}>
-                  <Col span={6}>
-                    <ProFormText
-                      name="answerCode"
-                      label="选项"
-                      help="类似 A, B, C, D"
-                    />
-                  </Col>
-                  <Col span={6}>
-                    <ProFormDigit
-                      name="score"
-                      label="计分"
-                      help="计分"
-                      min={0}
-                      fieldProps={{ precision: 2 }}
-                    />
-                  </Col>
-                  <Col span={6}>
-                    <ProFormSelect
-                      name="reportIssue"
-                      label="上报问题"
-                      help="上报问题"
-                      placeholder="是否上报问题"
-                      valueEnum={{
-                        0: '不上报',
-                        1: '上报',
-                      }}
-                    />
-                  </Col>
-                  <Col span={6}>
-                    <ProFormText
-                      name="answer"
-                      label="答案"
-                      help="答案"
-                      placeholder="具体选项内容"
-                    />
-                  </Col>
-                </Row>
+                creatorRecord={{ answerCode: value }}
+              >{(f, index) => {
+
+                // console.log('index', index == 0)
+                if (index == 0) {
+                  setValue('B')
+                } else if (index == 1) {
+                  setValue('C')
+                } else if (index == 2) {
+                  setValue('D')
+                } else if (index == 3) {
+                  setValue('E')
+                } else if (index == 4) {
+                  setValue('F')
+                }
+                return (
+                  <Row gutter={24} style={{ width: '730px' }}>
+                    <Col span={6}>
+                      <ProFormText
+                        name="answerCode"
+                        label="选项"
+                        help="类似 A, B, C, D"
+                        initialValue={'A'}
+                      />
+                    </Col>
+                    <Col span={6}>
+                      <ProFormDigit
+                        name="score"
+                        label="计分"
+                        help="计分"
+                        min={0}
+                        fieldProps={{ precision: 2 }}
+                      />
+                    </Col>
+                    <Col span={6}>
+                      <ProFormSelect
+                        name="reportIssue"
+                        label="上报问题"
+                        help="上报问题"
+                        placeholder="是否上报问题"
+                        valueEnum={{
+                          0: '不上报',
+                          1: '上报',
+                        }}
+                      />
+                    </Col>
+                    <Col span={6}>
+                      <ProFormText
+                        name="answer"
+                        label="答案"
+                        help="答案"
+                        placeholder="具体选项内容"
+                      />
+                    </Col>
+                  </Row>
+                )
+              }
+                }
+
               </ProFormList>
             )
           )

src/pages/checkAnswer/loc/index.jsx

@@ -54,7 +54,6 @@ export default (props) => {
     {
       title: "答题人",
       dataIndex: "userName",
-      hideInSearch: true,
     },
     {
       title: "得分",

src/pages/checkAnswer/survey/index.jsx

@@ -53,7 +53,6 @@ export default (props) => {
     {
       title: "答题人",
       dataIndex: "userName",
-      hideInSearch: true,
     },
     {
       title: "受访者性别",
@@ -81,7 +80,7 @@ export default (props) => {
       }
     }
   ]
-  
+
   const beforeSearchSubmit = (params) => {
     paramsRef.current = params;
     return params;