Skip to content

J
jinfa-platform
Commit 28503bbc authored by 卢均锐's avatar 卢均锐
Browse files
Options

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

* 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform: chore: 修改页面报错的问题 feat: 采购能力翻译文件 chore: 修复新值没有覆盖旧值的问题 chore: 删除多余的操作按钮 fix: 对接采购订单详情申请开票，销售订单详情修改商品单价和运费功能，原有待审核订单修改单价和运费添加修改原因，供应商收到的评价添加显示隐藏评价操作
parents 2fe2b566 a02a7950
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 15 deletions
src/locales/zh-CN/purchase.ts 0 → 100644
View file @ 28503bbc
This diff is collapsed.
src/pages/transaction/logisticsAbility/logisticsAdminister/component/addressForm/index.tsx
View file @ 28503bbc
...@@ -9,7 +9,7 @@ import { SaveOutlined } from '@ant-design/icons'; ...@@ -9,7 +9,7 @@ import { SaveOutlined } from '@ant-design/icons';
import { useLinkEnumEffect } from '@/components/NiceForm/linkages/linkEnum'; import { useLinkEnumEffect } from '@/components/NiceForm/linkages/linkEnum';
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'; import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import styles from './index.less'; import styles from './index.less';
import { getManageAreaAll, getManageCountryAreaGetTelCode } from '@/services/ManageV2Api'; import { getManageAreaAll, getManageAreaByPcode, getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
const formActions = createFormActions(); const formActions = createFormActions();
const { const {
...@@ -161,7 +161,7 @@ const AddressForm: React.FC<AddressFormProps> = (props: any) => { ...@@ -161,7 +161,7 @@ const AddressForm: React.FC<AddressFormProps> = (props: any) => {
}} }}
effects={($, { setFieldState, setFieldValue }) => { effects={($, { setFieldState, setFieldValue }) => {
$('onFormMount').subscribe(async () => { $('onFormMount').subscribe(async () => {
await getManageAreaAll().then(res => { await getManageAreaByPcode({pcode: ''}).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
const { data } = res; const { data } = res;
addressData.current = data addressData.current = data
......
src/pages/transaction/logisticsAbility/logisticsAdminister/component/schema/index.tsx
View file @ 28503bbc
...@@ -362,3 +362,167 @@ export const receiverAddress: ISchema = { ...@@ -362,3 +362,167 @@ export const receiverAddress: ISchema = {
} }
} }
} }
export const SHIPPER_ADDRESS__ISCHEMA: ISchema = {
type: 'object',
properties: {
MEGA_LAYOUT: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
labelCol: 6,
wrapperCol: 16,
labelAlign: 'left',
},
properties: {
'shipperName': {
type: 'string',
title: '发货人',
'x-rules': [
{
required: true,
message: '请输入发货人',
},
{
limitByte: true, // 自定义校验规则
maxByte: 20,
}
]
},
MEGA_LAYOUT1: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
label: '{{AddressLabel}}',
wrapperCol: 24,
},
properties: {
MEGA_LAYOUT1_1: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
full: true,
columns: 4
},
properties: {
'provinceCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-省份/直辖市-',
},
},
'cityCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-市-',
},
},
'districtCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-区-',
},
},
'streetCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-街道-',
},
}
// provinceCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-省份/直辖市-',
// },
// 'x-linkages': [
// {
// type: 'value:linkage',
// condition: '{{!!$self.value}}',
// origin: 'provinceCode',
// target: 'cityCode',
// },
// ],
// required: true,
// },
// cityCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-市-',
// },
// 'x-linkages': [
// {
// type: 'value:linkage',
// condition: '{{!!$self.value}}',
// origin: 'cityCode',
// target: 'districtCode',
// },
// ],
// required: true,
// },
// districtCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-区-',
// },
// required: true,
// },
}
},
}
},
'address': {
type: 'string',
title: '详细地址',
'x-component': 'TextArea',
'x-rules': [
{
required: true,
message: '请输入详细地址',
},
{
limitByte: true, // 自定义校验规则
maxByte: 60,
}
]
},
'postalCode': {
type: 'string',
title: '邮编',
'x-component-props': {},
'x-rules': [
{
limitByte: true, // 自定义校验规则
maxByte: 20,
}
]
},
'tel': {
type: 'string',
title: '电话号码',
'x-component-props': {
placeholder: '请输入你的电话号码',
},
'x-rules': [
{
pattern: PATTERN_MAPS.tel,
message: '请输入正确格式的电话号码',
},
],
},
'isDefault': {
title: '是否默认',
'x-component': 'Switch'
}
}
}
}
}
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponAnalysis/index.tsx
View file @ 28503bbc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-06-22 11:10:57 * @Date: 2021-06-22 11:10:57
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-02 16:49:39 * @LastEditTime: 2021-11-26 18:25:44
* @Description: 商家优惠劵执行 * @Description: 商家优惠劵执行
*/ */
import React, { useRef } from 'react'; import React, { useRef } from 'react';
...@@ -134,15 +134,7 @@ const MerchantCouponAnalysis: React.FC = () => { ...@@ -134,15 +134,7 @@ const MerchantCouponAnalysis: React.FC = () => {
return {}; return {};
}; };
const ControllerBtns = () => ( const ControllerBtns = () => null;
<Space size={16}>
<Button
onClick={() => {}}
>
批量审核通过
</Button>
</Space>
);
return ( return (
<Card> <Card>
......
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/components/ActionModal/index.tsx
View file @ 28503bbc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-07-02 15:30:48 * @Date: 2021-07-02 15:30:48
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-09-30 17:02:09 * @LastEditTime: 2021-11-26 18:15:44
* @Description: 操作 Modal * @Description: 操作 Modal
*/ */
import React, { useRef } from 'react'; import React, { useRef } from 'react';
...@@ -67,11 +67,11 @@ const ActionModal: React.FC<IProps> = (props) => { ...@@ -67,11 +67,11 @@ const ActionModal: React.FC<IProps> = (props) => {
const formRef = useRef<ReasonFormRefHandle | EditFormRefHandle | null>(null); const formRef = useRef<ReasonFormRefHandle | EditFormRefHandle | null>(null);
const handleReasonSubmit = (values: ReasonValueType) => { const handleReasonSubmit = (values: ReasonValueType) => {
onConfirm({ reason: values.reason, ...value }, modalName); onConfirm({ ...value, reason: values.reason }, modalName);
}; };
const handleEditSubmit = (values: EditSubmitValueType) => { const handleEditSubmit = (values: EditSubmitValueType) => {
onConfirm({ ...values, ...value }, modalName); onConfirm({ ...value, ...values }, modalName);
}; };
const handleConfirm = () => { const handleConfirm = () => {
......
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