zls

src/pages/qrcode/qrcodelist/add.jsx

@@ -40,7 +40,6 @@ const header = props => {
         e.preventDefault();
         props.form.validateFields((err, values) => {
             if (!err) {
-                console.log(values)
                 if (targetType === 'project') {
                     values.targetId = values.buildingId
                     values.targetName = targetName
@@ -48,6 +47,7 @@ const header = props => {
                     values.targetId = values.targetName.id
                     values.targetName = values.targetName.name
                 }
+                console.log(values)
                 addQrcode(values)
             }
         },
@@ -82,8 +82,8 @@ const header = props => {
     }
 
     // BuildingChange
-    function onTargetName(value, data) {
-        console.log(`onTargetName to ${value}`, data);
+    function onTargetName(values) {
+        console.log(`onTargetName to ${values}`);
 
     }
 
@@ -102,17 +102,17 @@ const header = props => {
                 </Form.Item>
                 {visible && <Form.Item label="关联项目">
                     {getFieldDecorator('buildingId', {
-                        rules: [{ required: true, message: '' }],
+                        rules: [{ required: true, message: '请选择关联项目' }],
                     })(<BuildSelect onChange={onBuildingChange} />)}
                 </Form.Item>}
                 <Form.Item label="二维码内容类型">
                     {getFieldDecorator('targetType', {
-                        rules: [{ required: true, message: '' }],
+                        rules: [{ required: true, message: '请选择二维码内容类型' }],
                     })(<QrcodeType visible={visible} onChange={onTtypeChange}></QrcodeType>)}
                 </Form.Item>
                 {targetType !== 'project' && <Form.Item label="二维码内容">
                     {getFieldDecorator('targetName', {
-                        rules: [{ required: true, message: '' }],
+                        rules: [{ required: true, message: '请选择二维码内容' }],
                     })(<QrText targetType={targetType} buildingId={buildingId} onChange={onTargetName} />)}
                 </Form.Item>}
                 {targetType === 'project' && <div>

src/pages/qrcode/qrcodelist/components/qrText.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { Button, Form, Modal, Pagination, Table, Input } from 'antd';
 import Navigate from '@/components/Navigate';
 import EditIcon from '@/components/EditIcon';
+import withActions from '@/components/ActionList';
 import { apis, fetch } from '../../../../utils/request';
 
 const getH5List = fetch(apis.h5Activity.EffectiveList)
@@ -202,7 +203,12 @@ const qrText = props => {
     useEffect(() => {
         console.log(value, '23423333333334')
         // eslint-disable-next-line default-case
-        setInfo({ name: value })
+        if (value) {
+            setInfo({ name: value.name })
+        } else {
+            setInfo({ name: value })
+        }
+        // setInfo({ name: value.name })
     }, [value])
 
     // getNewsList
@@ -244,7 +250,7 @@ const qrText = props => {
         console.log(e)
         setInfo(e)
         setVisible(false)
-        props.onChange(e.name, e)
+        onChange(e)
     }
 
     const columns = [
@@ -261,7 +267,9 @@ const qrText = props => {
             dataIndex: '',
             key: '2',
             align: 'center',
-            render: (text, record) => (<EditIcon type="start" text="选择" onClick={() => onChoice(record)}></EditIcon>),
+            render: withActions((text, record) => [
+                <EditIcon type="start" text="选择" onClick={() => onChoice(record)}></EditIcon>,
+            ]),
         },
     ];