Skip to content

J
jinfa-platform
Commit d6e21304 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

parents 566d28cd 7a514ef1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 114 deletions
src/components/AddressSelect/index.tsx
View file @ d6e21304
This diff is collapsed.
src/components/AddressSelect/schema.ts
View file @ d6e21304
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-05 14:02:46
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 16:58:04
* @LastEditTime: 2021-08-11 18:07:18
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -192,12 +192,16 @@ export const createSchema = (addressType = 2): ISchema => {
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
columns: 3,
full: true,
},
properties: {
areaCode: {
type: 'string',
enum: [],
'x-mega-props': {
span: 1,
},
'x-component-props': {
placeholder: '请选择',
},
......@@ -207,7 +211,7 @@ export const createSchema = (addressType = 2): ISchema => {
type: 'string',
required: true,
'x-mega-props': {
span: 3,
span: 2,
},
'x-component-props': {
placeholder: '请输入你的手机号码',
......
src/global/styles/reset.less
View file @ d6e21304
......@@ -314,3 +314,8 @@
padding-bottom: 6px;
}
}
// 隐藏表格头 td 的 竖线
.ant-table-thead > tr > th::before {
display: none;
}
\ No newline at end of file
src/pages/contract/coordination/details/components/PurchaseList.tsx
View file @ d6e21304
......@@ -113,10 +113,10 @@ const purchaseList: React.FC<Iprops> = ({
</div>
<div className={style.text}>
<p>商品ID：{record.associatedDataId}</p>
<p className={style.nowrap}>商品名称：{record.associatedGoods}</p>
<p className={style.nowrap}>商品名称：{record.associatedMaterielName}</p>
</div>
<div className={style.text}>
<p>规格型号：{record.associatedType}</p>
<p>规格型号：{record.associatedGoods}</p>
<p>品类：{record.associatedCategory}</p>
</div>
<div className={style.text}>
......
src/pages/contract/manage/add/components/FormList.tsx
View file @ d6e21304
......@@ -121,7 +121,7 @@ const FormList = (props: any) => {
name: _filter(sourceType, item, ['', 'name', 'name', 'name']),//物料名称
type: _filter(sourceType, item, ['', 'model', 'type', 'model']),//物料规格
customerCategory: { // 品类
name: _filter(sourceType, item, ['', 'category', 'brandName', '']),
name: _filter(sourceType, item, ['', 'category', 'categoryName', '']),
category: _filter(sourceType, item, ['', 'category', '', '']),
id: _filterArr(sourceType, item, ['', 'goodsId', 'categoryId', 'ids']),
},
......@@ -238,7 +238,7 @@ const FormList = (props: any) => {
render: (text: any, record: any, index: number) =>
<Form.Item
name={`price${index}`}
initialValue={text}
initialValue={Number(text).toFixed(2)}
rules={[{ required: true, message: '请输入' }]}
>
<Input
......@@ -247,7 +247,7 @@ const FormList = (props: any) => {
}}
onChange={(e) => setInput(e, 'price', index)}
addonBefore="¥"
defaultValue={text}
defaultValue={Number(text).toFixed(2)}
disabled={Object.keys(Row).length != 0 ? true : false}
/>
</Form.Item>
......@@ -320,8 +320,8 @@ const FormList = (props: any) => {
isHasTax: item.isHasTax,
taxRate: item.taxRate,
purchaseCount: item.purchaseCount,
price: Number(item.price),
bidCount: item.bidCount,
price: Number(item.price).toFixed(2),
bidCount: Number(item.bidCount).toFixed(2),
bidAmount: item.bidCount && item.price ? (Number(item.bidCount) * Number(item.price)).toFixed(2) : '',
associatedMaterielName: Object.keys(Row).length === 0 ? '' : item.associatedMaterielName,
associatedGoods: Object.keys(Row).length === 0 ? '' : item.associatedGoods,
......
src/pages/contract/manage/schema/index.ts
View file @ d6e21304
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants/order';
/**
* 除了订单必填字段, 默认
*/
......@@ -42,30 +41,24 @@ export const tableListSchema: ISchema = {
"x-component-props": {
placeholder: '请选择订单类型'
},
enum: Object.keys(OrderTypeMap).map(item => ({
label: OrderTypeMap[item],
value: item,
}))
enum: []
},
"externalState": {
type: 'string',
"x-component-props": {
placeholder: '请选择外部状态'
},
enum: Object.keys(PurchaseOrderOutWorkStateTexts).map(item => ({
label: PurchaseOrderOutWorkStateTexts[item],
value: item,
}))
enum: []
},
"interiorState": {
type: 'string',
"x-component-props": {
placeholder: '请选择内部状态'
},
enum: Object.keys(PurchaseOrderInsideWorkStateTexts).map(item => ({
label: PurchaseOrderInsideWorkStateTexts[item],
value: item,
}))
enum: []
},
"[startCreateTime,endCreateTime]": {
type: 'array',
......
src/pages/member/memberFlowRule/components/FlowRuleForm/schema.ts
View file @ d6e21304
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-05-27 16:13:26
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-06-01 17:58:12
* @LastEditTime: 2021-08-12 09:36:50
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -155,7 +155,7 @@ const formSchema: ISchema = {
type: 'object',
'x-component': 'TabPane',
'x-component-props': {
tab: '会员表更流程',
tab: '会员变更流程',
},
properties: {
MEGA_LAYOUT1: {
......
src/pages/transaction/purchaserEvaluation/unevaluated/schema/index.tsx
View file @ d6e21304
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 19:55:25
* @Description:
*/
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import {
ORDER_TYPE2_INQUIRY,
ORDER_TYPE2_DEMAND,
ORDER_TYPE2_SPOT,
ORDER_TYPE2_CENTRALIZED,
ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_DIRECT,
ORDER_TYPE2_CHANNEL_SPOT,
ORDER_TYPE2_CHANNEL_POINTS,
ORDER_TYPE2,
} from '@/constants/order';
import { GlobalConfig } from '@/global/config';
const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
label: item.platformWayName,
value: item.id,
}));
export const listSearchSchema: ISchema = {
type: 'object',
......@@ -65,40 +67,7 @@ export const listSearchSchema: ISchema = {
orderType: {
type: 'string',
default: undefined,
enum: [
{
label: ORDER_TYPE2[ORDER_TYPE2_INQUIRY],
value: ORDER_TYPE2_INQUIRY,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_DEMAND],
value: ORDER_TYPE2_DEMAND,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_SPOT],
value: ORDER_TYPE2_SPOT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CENTRALIZED],
value: ORDER_TYPE2_CENTRALIZED,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_POINTS],
value: ORDER_TYPE2_POINTS,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_DIRECT],
value: ORDER_TYPE2_CHANNEL_DIRECT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_SPOT],
value: ORDER_TYPE2_CHANNEL_SPOT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_POINTS],
value: ORDER_TYPE2_CHANNEL_POINTS,
},
],
enum: orderTypeArr,
'x-component-props': {
placeholder: '订单类型',
allowClear: true,
......
src/pages/transaction/supplierEvaluation/unevaluated/schema/index.tsx
View file @ d6e21304
/*
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:35
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 19:55:18
* @Description:
*/
import { ISchema } from '@formily/antd';
import { FORM_FILTER_PATH } from '@/formSchema/const';
import {
ORDER_TYPE2_INQUIRY,
ORDER_TYPE2_DEMAND,
ORDER_TYPE2_SPOT,
ORDER_TYPE2_CENTRALIZED,
ORDER_TYPE2_POINTS,
ORDER_TYPE2_CHANNEL_DIRECT,
ORDER_TYPE2_CHANNEL_SPOT,
ORDER_TYPE2_CHANNEL_POINTS,
ORDER_TYPE2,
} from '@/constants/order';
import { GlobalConfig } from '@/global/config';
const orderTypeArr = GlobalConfig.web.orderType.map((item) => ({
label: item.platformWayName,
value: item.id,
}));
export const listSearchSchema: ISchema = {
type: 'object',
......@@ -65,40 +67,7 @@ export const listSearchSchema: ISchema = {
type: {
type: 'string',
default: undefined,
enum: [
{
label: ORDER_TYPE2[ORDER_TYPE2_INQUIRY],
value: ORDER_TYPE2_INQUIRY,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_DEMAND],
value: ORDER_TYPE2_DEMAND,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_SPOT],
value: ORDER_TYPE2_SPOT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CENTRALIZED],
value: ORDER_TYPE2_CENTRALIZED,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_POINTS],
value: ORDER_TYPE2_POINTS,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_DIRECT],
value: ORDER_TYPE2_CHANNEL_DIRECT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_SPOT],
value: ORDER_TYPE2_CHANNEL_SPOT,
},
{
label: ORDER_TYPE2[ORDER_TYPE2_CHANNEL_POINTS],
value: ORDER_TYPE2_CHANNEL_POINTS,
},
],
enum: orderTypeArr,
'x-component-props': {
placeholder: '订单类型',
allowClear: true,
......
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