李志伟 3 years ago
parent
commit
6ec6be6eaf

+ 1
- 1
src/pages/ContentManagementSystem/InformationList/edit.jsx View File

98
             </FormItem>
98
             </FormItem>
99
             {id && (
99
             {id && (
100
               <FormItem label="详细信息" colon={false}>
100
               <FormItem label="详细信息" colon={false}>
101
-                <ExtendContent targetType="info" targetId={id} onCancel={() => history.goBack()} />
101
+                <ExtendContent targetType="news" targetId={id} onCancel={() => history.goBack()} />
102
               </FormItem>
102
               </FormItem>
103
             )}
103
             )}
104
             <FormItem label=" " colon={false}>
104
             <FormItem label=" " colon={false}>

+ 8
- 2
src/pages/Machinery/Machinery/edit.jsx View File

2
 import { Form, Input, Card, DatePicker, Select, InputNumber, message, Button } from 'antd';
2
 import { Form, Input, Card, DatePicker, Select, InputNumber, message, Button } from 'antd';
3
 import { history } from 'umi';
3
 import { history } from 'umi';
4
 import ProCard from '@ant-design/pro-card';
4
 import ProCard from '@ant-design/pro-card';
5
+import ExtendContent from '@/components/ExtendContent';
5
 import { UploadImage, UploadImageList } from '@/components/Upload';
6
 import { UploadImage, UploadImageList } from '@/components/Upload';
6
 import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
7
 import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
7
 import { getMachineryTypeList } from '@/services/machineryType';
8
 import { getMachineryTypeList } from '@/services/machineryType';
121
             <FormItem label="主图" name="thumb" rules={[{ required: true, message: '请选择主图' }]}>
122
             <FormItem label="主图" name="thumb" rules={[{ required: true, message: '请选择主图' }]}>
122
               <UploadImage />
123
               <UploadImage />
123
             </FormItem>
124
             </FormItem>
124
-            <FormItem label="农机图集" name="images">
125
+            <FormItem label="农机banner图集" name="images">
125
               <UploadImageList
126
               <UploadImageList
126
                 value={imageList}
127
                 value={imageList}
127
                 onChange={setImageList}
128
                 onChange={setImageList}
181
                 <Option value={0}>未发布</Option>
182
                 <Option value={0}>未发布</Option>
182
               </Select>
183
               </Select>
183
             </FormItem>
184
             </FormItem>
185
+            {id && (
186
+              <FormItem label="详细信息" colon={false}>
187
+                <ExtendContent targetType="machinery" targetId={id} onCancel={goBack} />
188
+              </FormItem>
189
+            )}
184
             <FormItem label=" " colon={false}>
190
             <FormItem label=" " colon={false}>
185
-              <Button type="default" onClick={() => goBack()}>
191
+              <Button type="default" onClick={goBack}>
186
                 返回
192
                 返回
187
               </Button>
193
               </Button>
188
               <Button
194
               <Button