Skip to content

J
jinfa-platform
Commit 2c830092 authored by rainbowmorel@163.com's avatar rainbowmorel@163.com
Browse files
Options

Merge branch 'v2-220418' into 20418order

parents 8f4ce6b0 89608d29
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 20 deletions
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/basic.tsx
View file @ 2c830092
...@@ -21,6 +21,7 @@ import moment from 'moment'; ...@@ -21,6 +21,7 @@ import moment from 'moment';
import { getManageAreaAll, getManageAreaByPcodeAll } from '@/services/ManageV2Api'; import { getManageAreaAll, getManageAreaByPcodeAll } from '@/services/ManageV2Api';
import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseV2Api'; import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseV2Api';
import { getIntl } from 'umi'; import { getIntl } from 'umi';
import { validatorByte } from '@/utils/regExp';
const intl = getIntl(); const intl = getIntl();
const { Option } = Select; const { Option } = Select;
const { Text } = Typography; const { Text } = Typography;
...@@ -290,9 +291,11 @@ const BasicInfo: React.FC<Iprops> = (props: any) => { ...@@ -290,9 +291,11 @@ const BasicInfo: React.FC<Iprops> = (props: any) => {
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'table.purchase.details' })} label={intl.formatMessage({ id: 'table.purchase.details' })}
name='details' name='details'
rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message20' }) }]} rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message20' }) },
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 60) }
]}
> >
<Input maxLength={30} /> <Input placeholder={intl.formatMessage({ id: 'logistics.zuichang60gezi' })} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={ label={
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addInquiry/components/condition.tsx
View file @ 2c830092
...@@ -4,6 +4,7 @@ import moment from 'moment'; ...@@ -4,6 +4,7 @@ import moment from 'moment';
import { getLogisticsSelectListReceiverAddress } from '@/services/LogisticsV2Api'; import { getLogisticsSelectListReceiverAddress } from '@/services/LogisticsV2Api';
import { getIntl } from 'umi'; import { getIntl } from 'umi';
import AddressSelect from '@/components/AddressSelect'; import AddressSelect from '@/components/AddressSelect';
import { validatorByte } from '@/utils/regExp';
const { TextArea } = Input; const { TextArea } = Input;
const { Option } = Select; const { Option } = Select;
...@@ -113,9 +114,9 @@ const Condition: React.FC<Iprops> = (props: any) => { ...@@ -113,9 +114,9 @@ const Condition: React.FC<Iprops> = (props: any) => {
rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message54' }) }]} rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message54' }) }]}
> >
<DatePicker <DatePicker
showTime={{ format: 'HH:mm' }} // showTime={{ format: 'HH:mm' }}
style={{ width: '100%' }} style={{ width: '100%' }}
format={"YYYY-MM-DD HH:mm"} format={"YYYY-MM-DD"}
disabledDate={(current) => current && current < moment().startOf('day')} disabledDate={(current) => current && current < moment().startOf('day')}
onChange={(val) => deliveryTimeChange(val)} onChange={(val) => deliveryTimeChange(val)}
/> />
...@@ -157,38 +158,56 @@ const Condition: React.FC<Iprops> = (props: any) => { ...@@ -157,38 +158,56 @@ const Condition: React.FC<Iprops> = (props: any) => {
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.offerAsk' })} label={intl.formatMessage({ id: 'detail.purchase.offerAsk' })}
name="offer" name="offer"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.paymentType' })} label={intl.formatMessage({ id: 'detail.purchase.paymentType' })}
name="paymentType" name="paymentType"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.taxesAsk' })} label={intl.formatMessage({ id: 'detail.purchase.taxesAsk' })}
name="taxes" name="taxes"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.logisticsAsk' })} label={intl.formatMessage({ id: 'detail.purchase.logisticsAsk' })}
name="logistics" name="logistics"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) }/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.packRequireAsk' })} label={intl.formatMessage({ id: 'detail.purchase.packRequireAsk' })}
name="packRequire" name="packRequire"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.otherRequireAsk' })} label={intl.formatMessage({ id: 'detail.purchase.otherRequireAsk' })}
name="otherRequire" name="otherRequire"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addMallInquiry/components/basic.tsx
View file @ 2c830092
...@@ -21,6 +21,7 @@ import moment from 'moment'; ...@@ -21,6 +21,7 @@ import moment from 'moment';
import { getManageAreaAll, getManageAreaByPcodeAll } from '@/services/ManageV2Api'; import { getManageAreaAll, getManageAreaByPcodeAll } from '@/services/ManageV2Api';
import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseV2Api'; import { GetPurchasePurchaseInquiryDetailsResponse } from '@/services/PurchaseV2Api';
import { getIntl } from 'umi'; import { getIntl } from 'umi';
import { validatorByte } from '@/utils/regExp';
const intl = getIntl(); const intl = getIntl();
const { Option } = Select; const { Option } = Select;
const { Text } = Typography; const { Text } = Typography;
...@@ -287,13 +288,17 @@ const BasicInfo: React.FC<Iprops> = (props: any) => { ...@@ -287,13 +288,17 @@ const BasicInfo: React.FC<Iprops> = (props: any) => {
form={form} form={form}
className={style.form} className={style.form}
> >
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'table.purchase.details' })} label={intl.formatMessage({ id: 'table.purchase.details' })}
name='details' name='details'
rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message20' }) }]} rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message20' }) },
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 60) }
]}
> >
<Input maxLength={30} /> <Input placeholder={intl.formatMessage({ id: 'logistics.zuichang60gezi' })} />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={ label={
<Tooltip placement="right" title={intl.formatMessage({ id: 'detail.purchase.tips' })}> <Tooltip placement="right" title={intl.formatMessage({ id: 'detail.purchase.tips' })}>
......
src/pages/transaction/purchaseAbility/purchaseInquiry/addMallInquiry/components/condition.tsx
View file @ 2c830092
...@@ -4,6 +4,7 @@ import moment from 'moment'; ...@@ -4,6 +4,7 @@ import moment from 'moment';
import { getLogisticsSelectListReceiverAddress } from '@/services/LogisticsV2Api'; import { getLogisticsSelectListReceiverAddress } from '@/services/LogisticsV2Api';
import { getIntl } from 'umi'; import { getIntl } from 'umi';
import AddressSelect from '@/components/AddressSelect'; import AddressSelect from '@/components/AddressSelect';
import { validatorByte } from '@/utils/regExp';
const { TextArea } = Input; const { TextArea } = Input;
const { Option } = Select; const { Option } = Select;
...@@ -113,9 +114,9 @@ const Condition: React.FC<Iprops> = (props: any) => { ...@@ -113,9 +114,9 @@ const Condition: React.FC<Iprops> = (props: any) => {
rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message54' }) }]} rules={[{ required: true, message: intl.formatMessage({ id: 'detail.purchase.message54' }) }]}
> >
<DatePicker <DatePicker
showTime={{ format: 'HH:mm' }} // showTime={{ format: 'HH:mm' }}
style={{ width: '100%' }} style={{ width: '100%' }}
format={"YYYY-MM-DD HH:mm"} format={"YYYY-MM-DD"}
disabledDate={(current) => current && current < moment().startOf('day')} disabledDate={(current) => current && current < moment().startOf('day')}
onChange={(val) => deliveryTimeChange(val)} onChange={(val) => deliveryTimeChange(val)}
/> />
...@@ -157,38 +158,56 @@ const Condition: React.FC<Iprops> = (props: any) => { ...@@ -157,38 +158,56 @@ const Condition: React.FC<Iprops> = (props: any) => {
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.offerAsk' })} label={intl.formatMessage({ id: 'detail.purchase.offerAsk' })}
name="offer" name="offer"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.paymentType' })} label={intl.formatMessage({ id: 'detail.purchase.paymentType' })}
name="paymentType" name="paymentType"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.taxesAsk' })} label={intl.formatMessage({ id: 'detail.purchase.taxesAsk' })}
name="taxes" name="taxes"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.logisticsAsk' })} label={intl.formatMessage({ id: 'detail.purchase.logisticsAsk' })}
name="logistics" name="logistics"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.packRequireAsk' })} label={intl.formatMessage({ id: 'detail.purchase.packRequireAsk' })}
name="packRequire" name="packRequire"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) } />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={intl.formatMessage({ id: 'detail.purchase.otherRequireAsk' })} label={intl.formatMessage({ id: 'detail.purchase.otherRequireAsk' })}
name="otherRequire" name="otherRequire"
rules={[
{ validator: (rule, value, callback) => validatorByte(rule, value, callback, 100) }
]}
> >
<TextArea rows={3} maxLength={50} /> <TextArea rows={3} placeholder={intl.formatMessage({ id: 'logistics.zuichang100gezifu50ge'}) }/>
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment