diff --git a/src/components/keysFind/index.jsx b/src/components/keysFind/index.jsx index a9c4ed6d..72eac165 100644 --- a/src/components/keysFind/index.jsx +++ b/src/components/keysFind/index.jsx @@ -2,19 +2,18 @@ * @Author: Wind * @Date: 2022-07-25 10:53:41 * @LastEditors: Wind - * @LastEditTime: 2022-07-25 14:44:27 + * @LastEditTime: 2022-07-25 17:42:32 * @Description: * @FilePath: \frontend\src\components\keysFind\index.jsx */ import './index.less' -import { - Form, - FormDateRangePickerField, - FormStrategy, - FormSelectField, - FormInputField, - Button -} from 'zent' +import { useEffect, useState } from 'react' +import { Button, Notify, Select, DateRangePicker } from 'zent' +import Ipt from '@/components/input/main' +import Form from '@/components/form/main' +import FormItem from '@/components/form-item/main' +import _ from 'lodash' +import { getReSellerOption, handelResponse } from '../../assets/api' const stateList = [ { key: 1, text: '全部' }, @@ -23,61 +22,106 @@ const stateList = [ { key: 4, text: '已完结' }, { key: 5, text: '已作废' } ] +function init() { + return { + date: [], + reseller: '', + plan: '', + state: '', + key: '' + } +} + export default ({ onQuery }) => { - const form = Form.useForm(FormStrategy.View) + const [reseller_option, setReseller_option] = useState([]) + const [models, setModels] = useState(init()) + + useEffect(() => { + getReSellerOption().then((res) => { + handelResponse( + res, + (req, msg) => { + let arr = _.map(req, (o) => { + let obj = {} + obj.key = o.id + obj.text = o.name + obj.direct_reseller_id = o.direct_reseller_id + return obj + }) + setReseller_option(arr) + }, + (err) => { + Notify.error(err) + } + ) + }) + }, []) return ( - <> -
diff --git a/src/components/knockGold/index.less b/src/components/knockGold/index.less index 81cbf06d..0ee2eede 100644 --- a/src/components/knockGold/index.less +++ b/src/components/knockGold/index.less @@ -204,7 +204,46 @@ } } - .boxTime:last-child { + .column_datepicker { + margin-left: 25px; + margin-top: 15px; + } + + .column { + flex-direction: column; + align-items: flex-start; + + .column_label { + margin-bottom: 20px; + } + + + } + + .options_time { + display: flex; + align-items: flex-end; + + .add { + margin-left: 25px; + color: #145bd4; + cursor: pointer; + } + + .move { + margin-left: 25px; + color: #ccc; + cursor: pointer; + } + } + + .notice { + margin-top: 10px; + margin-left: 25px; + color: #e4e4e4; + } + + .boxTime:not(:first-child) { margin-top: 20px; } diff --git a/src/components/knockGold/rules.js b/src/components/knockGold/rules.js index 0966782f..84062736 100644 --- a/src/components/knockGold/rules.js +++ b/src/components/knockGold/rules.js @@ -10,6 +10,15 @@ export default { reg: '^[A-Za-z0-9]+$' } ], + /* 模板编号 */ + templateNumber: [ + { type: 'required', message: '请输入模板编号' }, + { + type: 'regExp', + message: '请输入由数字或英文组成的模板编号', + reg: '^[A-Za-z0-9]+$' + } + ], /* 合同单价 */ price: [ { type: 'required', message: '请输入合同单价' },