xujunjie 2 년 전
부모
커밋
d075557d72

+ 21 - 0
src/components/DDComponents/InnerContactField/index.js

@@ -0,0 +1,21 @@
+import React from 'react';
+import { Select } from 'antd';
+import { connect } from 'dva';
+
+const { Option } = Select;
+
+function InnerContactField(props) {
+  const { userList } = props;
+
+  return (
+    <Select>
+      {userList.map(item => (
+        <Option >{item.CName}</Option>
+      ))}
+    </Select>
+  );
+}
+
+export default connect(({ user }) => ({
+  userList: user.userList,
+}))(InnerContactField);

+ 3 - 0
src/components/DDComponents/index.js

@@ -0,0 +1,3 @@
+import InnerContactField from './InnerContactField';
+
+export { InnerContactField };

+ 17 - 5
src/pages/PurchaseAdmin/PurchaseList/Detail/AuditDetailed.js

@@ -1,7 +1,9 @@
 import { Button, Form, Input, InputNumber, Select, DatePicker, Rate, Upload } from 'antd';
+import { InnerContactField } from '@/components/DDComponents';
 import { PlusOutlined } from '@ant-design/icons';
 import React, { useState } from 'react';
 const { Option } = Select;
+const { RangePicker } = DatePicker;
 const layout = {
   labelCol: {
     span: 8,
@@ -76,12 +78,13 @@ const AuditDetailed = ({ items }) => {
     let component;
     switch (item.componentName) {
       case 'TextField': //单行输入
-        component = <Input placeholder={placeholder} />;
+        component = <Input disabled={disabled} placeholder={placeholder} />;
         break;
       case 'TextareaField': //多行输入
-        component = <Input.TextArea placeholder={placeholder} />;
+        component = <Input.TextArea disabled={disabled} placeholder={placeholder} />;
         break;
       case 'NumberField': //数字输入
+        component = <InputNumber disabled={disabled} formatter={value => `${value}${unit}`} />;
         break;
       case 'DDSelectField': //单选框
         component = (
@@ -104,13 +107,16 @@ const AuditDetailed = ({ items }) => {
         );
         break;
       case 'DDDateField': //日期控件
-        component = <DatePicker format={format} onChange={() => {}} />;
+        component = <DatePicker format={format} />;
         break;
       case 'DDDateRangeField': //时间区间控件
+        component = <RangePicker format={format} />;
         break;
       case 'TextNote': //文本说明控件
+        // component = <p style={{textAlign: align}}></p>
         break;
       case 'PhoneField': //电话控件
+        component = <Input type="phone" disabled={disabled} placeholder={placeholder} />;
         break;
       case 'DDPhotoField': //图片控件
         component = (
@@ -125,8 +131,14 @@ const AuditDetailed = ({ items }) => {
       case 'TableField': //明细控件
         break;
       case 'DDAttachment': //附件
+        component = (
+          <Upload>
+            <Button icon={<PlusOutlined />}>添加附件</Button>
+          </Upload>
+        );
         break;
       case 'InnerContactField': //联系人控件
+        component = <InnerContactField></InnerContactField>;
         break;
       case 'DepartmentField': //部门控件
         break;
@@ -162,7 +174,7 @@ const AuditDetailed = ({ items }) => {
       autoComplete="off"
       onFinish={onFinish}
     >
-      <Form.Item
+      {/* <Form.Item
         name={['user', 'name']}
         label="单行输入"
         rules={[
@@ -249,7 +261,7 @@ const AuditDetailed = ({ items }) => {
       </Form.Item>
       <Form.Item name={['user', 'introduction']} label="评分">
         <Rate />
-      </Form.Item>
+      </Form.Item> */}
       {/* <Form.Item wrapperCol={{ ...layout.wrapperCol, offset: 8 }}>
         <Button type="primary" htmlType="submit">
           Submit