Commit fbb7e9fb authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理新增仓位不指定会员也能提交,处理新增采购订单开具发票个人和企业表单联动问题

parent a8260a1d
......@@ -124,6 +124,11 @@
}
}
// 去除sogou浏览器自动加的密码软盘图标
input::-webkit-input-safebox-button{
display: none;
}
// 设置formitem的*号到字段label前
.ant-form-item-label>label.ant-form-item-required::before {
order: 10;
......
......@@ -46,7 +46,11 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
onRef(logisticsFormRef)
if(history.location.query?.id){
setDeliveryType(productInfoByEdit.logistics?.deliveryType)
const { deliveryType, carriageType, useTemplate } = productInfoByEdit.logistics
setDeliveryType(deliveryType)
setCarriageType(carriageType)
setIsTemplate(useTemplate)
setTemplate(useTemplate)
logisticsForm.setFieldsValue(productInfoByEdit.logistics)
}else{
logisticsForm.setFieldsValue({deliveryType:1, carriageType:1})
......
......@@ -33,7 +33,11 @@ const AccountDetail: React.FC<{}> = () => {
setDetails(data)
if(code === 1000) {
let bankRes = await PublicApi.getSettleAccountsCorporateAccountConfig({memberId: data.memberId + ''})
setBankDetail(bankRes.data)
if(bankRes.code === 1000) {
setBankDetail(bankRes.data)
} else {
message.error(bankRes.message)
}
}
}
......
import React, {useState, useRef, useEffect} from 'react'
import { history } from 'umi'
import { Button, Form, Card, Modal, Select, Table, Checkbox, Row, Col, Tooltip, Slider, InputNumber, Avatar } from 'antd'
import { Button, Form, Card, Modal, Select, Table, Checkbox, Row, Col, Tooltip, Slider, InputNumber, Avatar, message } from 'antd'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import {
PlusOutlined,
......@@ -38,10 +38,14 @@ const AddRepository:React.FC<{}> = (props) => {
if (params['applyMember']) {
params['applyMember'] = params['applyMember']
}
await PublicApi.postWarehouseFreightSpaceAdd(params)
setTimeout(() => {
history.goBack(-1)
}, 1000)
if(!params['isAllMemberShare'] && !params['applyMember']?.length) {
message.error('请选择指定会员')
} else {
await PublicApi.postWarehouseFreightSpaceAdd(params)
setTimeout(() => {
history.goBack(-1)
}, 1000)
}
}
return (
......
......@@ -96,6 +96,9 @@
border: none!important;
box-shadow: 0 0 0 0 #fff;
}
&::-webkit-input-safebox-button{
display: none;
}
}
}
......
......@@ -330,7 +330,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = ({editable}) => {
render: () => '是'
},
{
title: '金额',
title: creditsCommodity ? '所需积分小计' : '金额',
dataIndex: 'money',
align: 'center',
key: 'money',
......
......@@ -431,7 +431,7 @@ const SaleOrderProductTable:React.FC<OrderProductTableProps> = (props) => {
render: () => '是'
},
{
title: '金额',
title: creditsCommodity ? '所需积分小计' : '金额',
dataIndex: 'money',
align: 'center',
key: 'money',
......
......@@ -33,6 +33,13 @@ const addressSchema: ISchema = {
{
required: true,
message: '请选择开具类型'
},
],
"x-linkages": [
{
type: 'value:visible',
target: 'taxNo',
condition: "{{$value === 1}}"
}
]
},
......
......@@ -63,6 +63,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', props => {
}, [sum, freePrice])
useEffect(() => {
// 存在商品 并且有选择收货地址,则开始计算运费
console.log(data,'ddd')
if (data && data.length > 0 && receiverAddressId) {
// 筛选配送方式为物流的商品并且使用了运费模板
const logsiticsDataMaps = data.filter(v => v.logistics && v.logistics.useTemplate && v.logistics.deliveryType === 1)
......
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