Skip to content

J
jinfa-platform
Commit 7b21fd1f authored by tjy's avatar tjy
Browse files
Options

merge

parents 070c06c2 d2812e12
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 225 deletions
.gitignore
View file @ 7b21fd1f
......@@ -23,3 +23,5 @@
/.idea
config/base.config.json
/src/services/index.ts
package.json
View file @ 7b21fd1f
......@@ -31,7 +31,7 @@
"@umijs/preset-react": "1.x",
"@umijs/test": "^3.2.0",
"bizcharts": "^4.0.7",
"god": "0.1.15",
"god": "^0.1.17",
"lint-staged": "^10.0.7",
"mobx": "^5.15.4",
"mobx-react": "^6.2.2",
......
src/constants/regExp.ts
View file @ 7b21fd1f
/*
* @Author: LeeJiancong
* @Date: 2020-07-22 09:54:50
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 19:28:23
*/
/**
* 正则表达式集合
*/
......@@ -8,5 +14,6 @@ export const PATTERN_MAPS = {
email: /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/,
phone: /^1[3|4|5|6|7|8|9][0-9]{9}$/,
smsCode: /^\d{6}$/,
money:/^\d*(?:\.\d{0,2})?$/
money:/^\d*(?:\.\d{0,2})?$/,
weight:/^\d*(?:\.\d{0,3})?$/,
}
\ No newline at end of file
src/module/productModule/index.ts
View file @ 7b21fd1f
......@@ -8,4 +8,5 @@ export interface IProductModule {
setProductSelectAttribute(list: any[]):void;
setSelectedGoods(lists: any[]):void;
setTableDataSource(datas: any[]):void;
clearData(data: any[]):void;
}
src/pages/commodity/products/addProducts.tsx
View file @ 7b21fd1f
......@@ -27,11 +27,22 @@ const AddProducts: React.FC<{}> = (props) => {
const onSave = () => {
console.log('点击保存')
console.log(formRefs, 'formrefs')
if(formRefs.length > 0){
try{
let data = formRefs.map(async __ => {
return ( await __.current.validateFields())
})
console.log(data)
// let vaild = data.every(__ => Boolean(__))
// return vaild ? data :vaild
}catch(e){
console.log(e,'error')
}
}
}
const callback = (key: any) => {
console.log(key)
console.log(attributeList)
}
return (<PageHeaderWrapper
......
src/pages/commodity/products/addProductsItem/logisticsForm.tsx
View file @ 7b21fd1f
import React, { useState, useEffect, useRef } from 'react'
import {history} from 'umi'
import { Button, Form, Select, Checkbox, Tooltip, Radio, Input, Table, Modal, Row, Col } from 'antd'
import styles from './index.less'
import { PublicApi } from '@/services/api'
import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface'
import { EyeOutlined, QuestionCircleOutlined, SettingOutlined, PlusOutlined, MinusOutlined } from '@ant-design/icons'
import { GetLogisticsSelectListCompanyResponse, GetLogisticsSelectListShipperAddressResponse } from '@/services'
const layout = {
labelCol: {
......@@ -27,10 +24,22 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
const logisticsFormRef = useRef()
const [logisticsForm] = Form.useForm()
const [logisticsCompanyLists, setLogisticsCompanyLists] = useState<GetLogisticsSelectListCompanyResponse>()
const [logisticsAddressList, setLogisticsAddressList] = useState<GetLogisticsSelectListShipperAddressResponse>()
useEffect(()=>{
//传入ref给父级
onRef(logisticsFormRef)
// 获取发货地址 物流公司
PublicApi.getLogisticsSelectListShipperAddress().then(res=>{
setLogisticsAddressList(res.data)
})
PublicApi.getLogisticsSelectListCompany().then(res=>{
setLogisticsCompanyLists(res.data)
})
}, [])
return (<>
......@@ -42,7 +51,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
ref={logisticsFormRef}
>
<Form.Item
name="transportType"
name="deliveryType"
label="配送方式"
rules={[
{
......@@ -59,7 +68,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
</Radio.Group>
</Form.Item>
<Form.Item
name="chargeType"
name="carriageType"
label="运费方式"
rules={[
{
......@@ -85,9 +94,9 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
]}
>
<Input suffix="KG" placeholder="请输入重量" />
<Checkbox>使用运费模板（只有买家承担运费才能选择）</Checkbox>
{/* <Checkbox>使用运费模板（只有买家承担运费才能选择）</Checkbox> */}
</Form.Item>
<Form.Item
{/* <Form.Item
name="chargeTemplate"
label="运费模板"
>
......@@ -99,31 +108,31 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
<Option value="EMS">EMS模板</Option>
<Option value="COM">一般快递模板</Option>
</Select>
</Form.Item>
</Form.Item> */}
<Form.Item
name="address"
name="sendAddressId"
label="发货地址"
>
<Select
placeholder="请选择发货地址"
allowClear
>
<Option value="1">1</Option>
<Option value="2">2</Option>
<Option value="3">3</Option>
{
logisticsAddressList?.length > 0 && logisticsAddressList.map(_=><Option key={_.id} value={_.id}>{_.fullAddress}</Option>)
}
</Select>
</Form.Item>
<Form.Item
name="express"
name="companyId"
label="物流公司"
>
<Select
placeholder="请选择物流公司"
allowClear
>
<Option value="EMS">EMS</Option>
<Option value="SF">顺丰</Option>
<Option value="CN">菜鸟果果</Option>
{
logisticsCompanyLists?.length > 0 && logisticsCompanyLists.map(_=><Option key={_.id} value={_.id}>{_.name}</Option>)
}
</Select>
</Form.Item>
</Form>
......
src/pages/commodity/products/addProductsItem/otherForm.tsx
View file @ 7b21fd1f
......@@ -42,28 +42,28 @@ const OtherForm: React.FC<Iprops> = (props) => {
ref={otherFormRef}
>
<Form.Item
name="bill"
name="isInvoice"
label="提供发票"
>
<Radio.Group size="small">
<Radio.Button value="1" style={{ width: 100, textAlign: 'center' }}>是</Radio.Button>
<Radio.Button value="0" style={{ width: 100, textAlign: 'center' }}>否</Radio.Button>
<Radio.Button value={true} style={{ width: 100, textAlign: 'center' }}>是</Radio.Button>
<Radio.Button value={false} style={{ width: 100, textAlign: 'center' }}>否</Radio.Button>
</Radio.Group>
</Form.Item>
<Form.Item
name="maitou"
name="marks"
label="唛头"
>
<Input maxLength={25} placeholder="请输入唛头（最长25个字符）" />
</Form.Item>
<Form.Item
name="statement"
name="packing"
label="包装清单"
>
<TextArea maxLength={120} rows={4} placeholder="最长120个字符" />
</Form.Item>
<Form.Item
name="saleService"
name="afterService"
label="售后服务"
>
<TextArea maxLength={300} rows={4} placeholder="最长300个字符" />
......
src/pages/commodity/products/addProductsItem/productAttributeForm.tsx
View file @ 7b21fd1f
......@@ -2,10 +2,6 @@ import React, { useState, useEffect, useRef, useContext } from 'react'
import {history} from 'umi'
import { Button, Form, Select, Checkbox, Tabs, Input } from 'antd'
import styles from './index.less'
import { PublicApi } from '@/services/api'
import { StandardTable } from 'god'
import { ColumnType } from 'antd/lib/table/interface'
import { EyeOutlined } from '@ant-design/icons'
import { inject, observer } from 'mobx-react'
// import { IProductModule } from '@/module/productModule'
......@@ -36,19 +32,20 @@ const { TabPane } = Tabs
const { Option } = Select
const { TextArea } = Input
let paramsArray = [];
const ProductAttributeForm: React.FC<Iprops> = (props) => {
const { attributesData, onRef } = props
const productAttributeFormRef = useRef()
const [attributeForm] = Form.useForm()
const { ProductStore } = store
const [paramsData, setParamsData] = useState<any>()
useEffect(()=>{
//传入ref给父级
onRef(productAttributeFormRef)
}, [])
let paramsArray = [];
const onFinish = (values) => {
console.log(values)
......@@ -93,8 +90,8 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
item[next.customerAttributeId] = next;
return item
},{}))
console.log(resultParams, 'resultParams') // 最终转换数据
ProductStore.setProductSelectAttribute(resultParams) //注入mobx
console.log(resultParams,'result', paramsArray) // 最终传输数据
ProductStore.setProductSelectAttribute(resultParams)
}
const renderTabPanchildren = (attrItem: any) => {
......@@ -136,7 +133,7 @@ const ProductAttributeForm: React.FC<Iprops> = (props) => {
<Checkbox.Group onChange={(v)=>onChange(v, attrItem)}>
{
attrItem?.customerAttributeValueList.length > 0 && attrItem.customerAttributeValueList.map((item: any, index: string) => (
<Checkbox key={item.id + index} value={item.id}>{item.value}</Checkbox>
<Checkbox key={item.id} value={item.id}>{item.value}</Checkbox>
))
}
</Checkbox.Group>
......
src/pages/commodity/products/addProductsItem/productImageForm.tsx
View file @ 7b21fd1f
import React, { useState, useEffect } from 'react'
import {history} from 'umi'
import { Button, Form, Select, Checkbox, Tooltip, Radio, Input, Table, Modal, Row, Col, Alert } from 'antd'
import { Button, Form, Select, Checkbox, Tooltip, Radio, Input, Table, Modal, Row, Col, Alert, Upload } from 'antd'
import styles from '../index.less'
import { PublicApi } from '@/services/api'
import { StandardTable } from 'god'
......@@ -20,30 +20,30 @@ const layoutAdd = {
}
const _fileList = [
{
uid: '-1',
name: 'image.png',
status: 'done',
url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
},
{
uid: '-2',
name: 'image.png',
status: 'done',
url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
},
{
uid: '-3',
name: 'image.png',
status: 'done',
url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
},
{
uid: '-4',
name: 'image.png',
status: 'done',
url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
},
// {
// uid: '-1',
// name: 'image.png',
// status: 'done',
// url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
// },
// {
// uid: '-2',
// name: 'image.png',
// status: 'done',
// url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
// },
// {
// uid: '-3',
// name: 'image.png',
// status: 'done',
// url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png',
// },
// {
// uid: '-4',
// name: 'image.png',
// status: 'done',
// url: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
// },
]
const _panes = [
......@@ -61,13 +61,17 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
const [visibleAddTabs, setVisibleAddTabs] = useState(false)
const [visibleMedias, setVisibleMedias] = useState(false)
const [fileList, setFileList] = useState(_fileList)
const [fileList, setFileList] = useState<any[]>(_fileList)
const [visibleCrop, setVisibleCrop] = useState(false)
const [imgCropUrl, setImgCropUrl] = useState("")
const [imgCropCurrent, setImgCropCurrent] = useState({})
const [imgCropView, setImgCropView] = useState("")
const [previewVisible, setPreviewVisible] = useState(false)
const [previewImage, setPreviewImage] = useState('')
const [previewTitle, setPreviewTitle] = useState('')
useEffect(() => {
let newPane = [...panes]
newPane[0].content = pictureCrads()
......@@ -140,10 +144,38 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
setPanes(paneArray)
}
const uploadButton = (
<div>
<PlusOutlined />
<div className="ant-upload-text">点击上传</div>
</div>
);
const getBase64 = (file) => {
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.readAsDataURL(file);
reader.onload = () => resolve(reader.result);
reader.onerror = error => reject(error);
});
}
const handlePreview = async file => {
if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj);
}
setPreviewImage(file.url || file.preview)
setPreviewVisible(true)
setPreviewTitle(file.name || file.url.substring(file.url.lastIndexOf('/') + 1))
};
const handleChange = ({ fileList }) => setFileList(fileList);
const pictureCrads = () => (
<>
<div className={styles.pictureCardBox}>
{
{/* {
fileList && fileList.length > 0 && fileList.map((item, index) =>
<div className={styles.cardBox} key={item.uid}>
<div className={styles.contentBox}>
......@@ -155,10 +187,24 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
</div>
</div>
)
}
<div className={styles.cardAddBox} onClick={handleUpload}>
} */}
<div className="clearfix">
<Upload
action="/api/file/file/upload"
listType="picture-card"
fileList={fileList}
onPreview={handlePreview}
onChange={handleChange}
data={{fileType: 2}}
>
{fileList.length >= 6 ? null : uploadButton}
</Upload>
</div>
{/* <div className={styles.cardAddBox} onClick={handleUpload}>
<p><PlusOutlined /><br />点击上传</p>
</div>
</div> */}
</div>
<Alert
banner
......@@ -169,10 +215,10 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
closable
style={{ backgroundColor: '#F0F8FF', color: '#1B9AEE' }}
/>
<div>
{/* <div>
<i>图片预览(供调试)</i>
{imgCropView ? <img src={imgCropView} alt="预览" /> : <p>暂空</p>}
</div>
</div> */}
</>
)
......@@ -213,6 +259,8 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
visible={visibleAddTabs}
onOk={handleOkAddTabs}
onCancel={handleCancelAddTabs}
okText="确定"
cancelText="取消"
>
<Form
{...layoutAdd}
......@@ -240,6 +288,15 @@ const ProductImageForm: React.FC<Iprops> = (props) => {
clickOkAddMedias={handleOkAddMedias}
clickCancelAddMedias={handleCancelAddMedias}
/>
<Modal
visible={previewVisible}
title={previewTitle}
footer={null}
onCancel={()=>setPreviewVisible(false)}
>
<img alt="商品图片" style={{ width: '100%' }} src={previewImage} />
</Modal>
</>)
}
......
src/pages/commodity/products/addProductsItem/selectGoodsForm.tsx
View file @ 7b21fd1f
......@@ -84,6 +84,7 @@ const SelectGoodsForm: React.FC<Iprops> = (props) => {
const onSelectGoodsChange = (value: any) => {
setSelectedGoodsRowKeys([])
ProductStore.setSelectedGoods([])
setIsSelectGoods(value.target.checked)
}
......
src/pages/commodity/products/index.less
View file @ 7b21fd1f
......@@ -29,7 +29,7 @@
//图片画廊
.picture-card-box{
margin-bottom: 30px;
display: flex;
// display: flex;
.card-add-box{
width: 196px;
height: 196px;
......
src/pages/logistics/colorTag.ts 0 → 100644
View file @ 7b21fd1f
/*
* @Author: LeeJiancong
* @Date: 2020-07-30 17:23:48
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 17:24:49
*/
export default {
default: {
padding: '2px 5px',
background: 'rgba(244,245,247,1)',
borderRadius: '4px'
},
confirm: {
color: '#3F7ED2',
padding: '2px 5px',
background: 'rgba(240, 248, 255, 1)',
borderRadius: '4px'
},
success: {
color: '#00B37A',
padding: '2px 5px',
background: 'rgba(235,247,242,1)',
borderRadius: '4px'
},
warn: {
color: '#E63F3B',
padding: '2px 5px',
background: 'rgba(255,235,230,1)',
borderRadius: '4px'
}
}
\ No newline at end of file
src/pages/logistics/components/confirmModal.tsx
View file @ 7b21fd1f
......@@ -74,7 +74,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
x-component="Radio"
/>
{props.dontReceive &&
<FormMegaLayout name='remarkOption' label='不接受原因' full required wrapperWidth={570} labelCol={2} labelAlign="top">
<FormMegaLayout name='remarkOption' label='不接受原因' full required labelCol={2} labelAlign="top">
<Field
name="remark"
x-component="TextArea"
......
src/pages/logistics/components/orderSearchList.tsx
View file @ 7b21fd1f
/*
* @Author: LeeJiancong
* @Date: 2020-07-18 15:55:51
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-30 19:14:40
*/
import React, { useState, useEffect, useRef, ReactNode } from 'react';
import { Card, Button, Row, Col, Tooltip, Input, Select, Tag, Space } from 'antd'
import { UpOutlined, DownOutlined, EyeOutlined } from '@ant-design/icons'
......@@ -9,6 +15,7 @@ import { history } from 'umi'
import { hidden } from 'chalk';
import { PublicApi } from '@/services/api';
import {timeRange} from '@/utils/index'
import statuStyle from '../colorTag'
let { Option } = Select
export interface listProps {
title?: ReactNode,
......@@ -23,32 +30,6 @@ const data = [
status: 0
}
]
const statuStyle = {
default: {
padding: '2px 5px',
background: 'rgba(244,245,247,1)',
borderRadius: '4px'
},
confirm: {
color: '#3F7ED2',
padding: '2px 5px',
background: 'rgba(240, 248, 255, 1)',
borderRadius: '4px'
},
success: {
color: '#00B37A',
padding: '2px 5px',
background: 'rgba(235,247,242,1)',
borderRadius: '4px'
},
warn: {
color: '#E63F3B',
padding: '2px 5px',
background: 'rgba(255,235,230,1)',
borderRadius: '4px'
}
}
// 定义列的格式
interface Item {
oredrNo: string
......@@ -313,9 +294,15 @@ const orderSearchList: React.FC<listProps> = (props) => {
* @param {type}
* @return:
*/
const handleChange = (key:any,val) => {
const handleChange = (key:any,val:any) => {
let obj = {}
switch(key){
case 'logisticsOrderNo':
obj = { ...searchForm, logisticsOrderNo: val }
break;
case 'invoicesNo':
obj = { ...searchForm, invoicesNo: val }
break;
case 'companyId':
obj = { ...searchForm, companyId: val }
break;
......@@ -355,6 +342,7 @@ const orderSearchList: React.FC<listProps> = (props) => {
<PageHeaderWrapper title='快递单查询'>
<Card>
<StandardTable
tableProps={{rowKey:'id'}}
columns={columns}
currentRef={ref}
formAlign='left'
......@@ -372,7 +360,7 @@ const orderSearchList: React.FC<listProps> = (props) => {
value={searchForm.logisticsOrderNo}
placeholder='搜索'
onChange={(e) => setSearchForm({ ...searchForm, logisticsOrderNo: e.target.value })}
onSearch={(val) => handleSearch(val)}
onSearch={(val) => handleChange('logisticsOrderNo',val)}
/>
</Tooltip>
<Button className={style['filter-btn']} onClick={() => setIsSearch(isSearch = !isSearch)}>
......@@ -386,8 +374,17 @@ const orderSearchList: React.FC<listProps> = (props) => {
isSearch &&
<Col>
<Space size={16}>
{
props.type === '1' ?
<>
<Input.Search
style={{ width: '232px' }}
value={searchForm.invoicesNo}
placeholder='输入对应单号进行搜索'
onChange={(e) => setSearchForm({ ...searchForm, invoicesNo: e.target.value })}
onSearch={(val) => handleChange('invoicesNo',val)}
/>
<Select
className={style.select}
showSearch
......@@ -406,6 +403,7 @@ const orderSearchList: React.FC<listProps> = (props) => {
})
}
</Select>
</>
:
<Select
className={style.select}
......@@ -419,8 +417,8 @@ const orderSearchList: React.FC<listProps> = (props) => {
>
<Option value=''>发货方(全部)</Option>
{
shipperAddressList.map((item) => {
return <Option value={item.value}>{item.label}</Option>
shipperAddressList.map((item,index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
......@@ -432,8 +430,8 @@ const orderSearchList: React.FC<listProps> = (props) => {
onChange={(val) => handleChangeTime(val)}
>
{
TimeList.map((item) => {
return <Option value={item.value}>{item.label}</Option>
TimeList.map((item,index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
......@@ -443,8 +441,8 @@ const orderSearchList: React.FC<listProps> = (props) => {
onChange={(val) => handleChange('status',val)}
>
{
outSideStatusList.map((item) => {
return <Option value={item.value}>{item.label}</Option>
outSideStatusList.map((item,index) => {
return <Option key={index} value={item.value}>{item.label}</Option>
})
}
</Select>
......
src/pages/logistics/list/components/templateForm.tsx
View file @ 7b21fd1f
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-15 10:31:55
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-28 14:01:19
* @LastEditTime: 2020-07-30 19:37:57
*/
import React, { Component, useState, useEffect } from 'react';
import ReactDOM from 'react-dom'
......@@ -31,6 +31,7 @@ import {
import {PublicApi} from '@/services/api'
import styles from './templateForm.less';
import ReutrnEle from '@/components/ReturnEle'
import {PATTERN_MAPS} from '@/constants/regExp'
import ChinaImg from '../../../../../mockStatic/china.png'
import gou from '../../../../../mockStatic/gou.png'
import japenImg from '../../../../../mockStatic/japen.png'
......@@ -232,7 +233,6 @@ const diaLogForm: React.FC<ListProps> = (props) => {
}}
x-component="Input"
x-component-props={{
placeholder: '',
addonAfter: "KG"
}}
......@@ -240,6 +240,10 @@ const diaLogForm: React.FC<ListProps> = (props) => {
addonBefore: ' ',
addonAfter: '内,'
}}
x-rules={{
pattern: PATTERN_MAPS.weight,
message:'数字类型，可保留3位小数'
}}
/>
<Field
name="price"
......@@ -255,6 +259,10 @@ const diaLogForm: React.FC<ListProps> = (props) => {
placeholder: '',
addonAfter: "元"
}}
x-rules={{
pattern: PATTERN_MAPS.money,
message:'数字类型，可保留2位小数'
}}
/>
</FormMegaLayout>
<FormMegaLayout inline>
......@@ -276,6 +284,10 @@ const diaLogForm: React.FC<ListProps> = (props) => {
addonBefore: '每增加',
addonAfter: '增加运费'
}}
x-rules={{
pattern: PATTERN_MAPS.weight,
message:'数字类型，可保留3位小数'
}}
/>
<Field
name="incrementPrice"
......@@ -291,6 +303,10 @@ const diaLogForm: React.FC<ListProps> = (props) => {
addonAfter: "元"
}}
x-rules={{
pattern: PATTERN_MAPS.money,
message:'数字类型，可保留2位小数'
}}
/>
</FormMegaLayout>
</FormMegaLayout>
......@@ -354,21 +370,42 @@ const diaLogForm: React.FC<ListProps> = (props) => {
console.log(e.target.value)
// actions.validate()
},
// validate: (value:any) => {
// return new Promise(resolve => {
// setTimeout(() => {
// resolve(value !== '57350' ? '验证码验证失败' : '123')
// }, 1000)
// })
// }
}}
x-rules={{
pattern: PATTERN_MAPS.weight,
message:'数字类型，可保留3位小数'
}}
/>
<Field
name="price"
x-component="Input"
type="number"
title="首费(元)"
x-rules={{
pattern: PATTERN_MAPS.money,
message:'数字类型，可保留2位小数'
}}
/>
<Field
name="incrementWeight"
x-component="Input"
type="number"
title="续件(件/KG)"
x-rules={{
pattern: PATTERN_MAPS.weight,
message:'数字类型，可保留3位小数'
}}
/>
<Field
name="incrementPrice"
x-component="Input"
type="number"
title="续费(元)"
x-rules={{
pattern: PATTERN_MAPS.money,
message:'数字类型，可保留2位小数'
}}
/>
<Field name="price" x-component="Input" type="number" title="首费(元)" />
<Field name="incrementWeight" x-component="Input" type="number" title="续件(件/KG)" />
<Field name="incrementPrice" x-component="Input" type="number" title="续费(元)" />
</Field>
</Field>
</Col>
......
src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx
View file @ 7b21fd1f
......@@ -2,7 +2,7 @@
* @Author: LeeJiancong
* @Date: 2020-07-28 11:25:30
* @LastEditors: LeeJiancong
* @LastEditTime: 2020-07-29 17:08:32
* @LastEditTime: 2020-07-30 17:37:44
*/
import React, { Component, useEffect, useRef, useState } from 'react'
import { Card, Row, Col, Tabs, Button, Input as SelectInput, Badge } from 'antd'
......@@ -233,7 +233,7 @@ const Deatail: React.FC<{}> = () => {
*/
useEffect(() => {
PublicApi.postLogisticsCompanyList().then(res => {
PublicApi.getLogisticsSelectListCompany().then(res => {
let list = []
res.data.forEach(item => {
list.push({value:item.id,label:item.name})
......@@ -241,7 +241,7 @@ const Deatail: React.FC<{}> = () => {
setCompanyList(list)
})
PublicApi.postLogisticsShipperAddressList().then(res => {
PublicApi.getLogisticsSelectListShipperAddress().then(res => {
let list = []
res.data.forEach(item => {
list.push({value:item.id,label:item.fullAddress})
......
src/services/index.ts deleted 100644 → 0
View file @ 070c06c2
This source diff could not be displayed because it is too large. You can view the blob instead.
src/store/product/index.ts
View file @ 7b21fd1f
......@@ -29,6 +29,11 @@ class ProductStore implements IProductModule {
console.log(datas, 'innerBox')
this.tableDataSource = datas;
}
@action.bound
public clearData(data: any[]) {
this.tableDataSource = data;
}
}
......
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