Skip to content

J
jinfa-platform
Commit 04c87542 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

修改物流单详情显示问题

parent 1a794459
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 151 deletions
src/components/ModalTable/schema/index.ts
View file @ 04c87542
......@@ -660,13 +660,12 @@ export const logisticsDeliverySearchSchema: ISchema = {
}
}
},
invoicesType: {
invoicesTypeId: {
type: 'string',
// fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
// "x-component": 'SearchSelect',
"x-component": 'SearchSelect',
'x-component-props': {
placeholder: '单据类型',
fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
style: {
width: 160
}
......
src/pages/logistics/addLogistics/constants.ts 0 → 100644
View file @ 04c87542
This diff is collapsed.
src/pages/logistics/addLogistics/index.tsx
View file @ 04c87542
......@@ -12,6 +12,11 @@ import { SelectGoodsColumns, ExternalListColumns, AfterSalesSelectGoodsColumns }
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import moment from 'moment';
import ModalTableOrder from './components/ModalTableOrder';
import StatusTag from '@/components/StatusTag';
import {
EXCHANGE_OUTER_STATUS_TAG_MAP,
EXCHANGE_INNER_STATUS_BADGE_MAP,
} from './constants';
const { TabPane } = Tabs;
const { Search } = Input;
const { Option } = Select;
......@@ -341,7 +346,7 @@ const AddLogistics: React.FC<{}> = () => {
obj.companyId = option.value
obj.companyName = option.children
setmemberInfo({ memberId: option.memberid, roleId: option.roleid })
}else {
} else {
obj.companyId = ''
obj.companyName = ''
}
......@@ -748,14 +753,21 @@ const AddLogistics: React.FC<{}> = () => {
</Select>
</Form.Item>
<Form.Item label="单据时间" name='voucherTime'><span>{query.voucherTime && moment(query.voucherTime).format('YYYY-MM-DD HH:mm:ss')} </span></Form.Item>
{createType !== 1 &&
{(createType === 2 || createType === 3 ) ?
<Form.Item label="外部状态" name='externalState'>
{query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
{
query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
query.externalState === 2 ? <Badge status="processing" text='待确认' /> :
query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> :
query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : ''
query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> :
query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : ''
}
</Form.Item>
:
(createType === 4 || createType === 5 || createType === 6) ?
<Form.Item label="外部状态" name='externalState'>
{/* <StatusTag type={EXCHANGE_OUTER_STATUS_TAG_MAP[record.outerStatus]} title={text} /> */}
</Form.Item>
: <></>
}
</Form>
</TabPane>
......
src/pages/logistics/components/index.less
View file @ 04c87542
@import "../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
\ No newline at end of file
@import "../../member/components/index.less";
.count{
font-size: 24px;
color: #303133;
font-weight: 500;
}
.add-btn{
margin-bottom: 24px;
padding: 6px 0;
text-align: center;
background: #FAFBFC;
}
.alignCenter{
text-align: center;
}
.alignLeft{
text-align: left;
}
.hidden{
display: none;
}
.block{
display: block;
}
.selectBtn {
margin: 0 16px;
}
.filter-btn{
width : 112px;
margin: 0 0 0 16px;
}
.select {
width : 160px;
&:nth-last-of-type(1) {
margin-right: 0;
}
}
.mainCol {
background-color: #fff;
margin-bottom : 24px;
padding : 0 24px;
box-sizing : border-box;
border-radius: 8px;
&-title {
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #303133;
padding : 20px 0;
}
&:nth-last-of-type(1) {
margin: 0;
}
&-row {
display : flex;
flex-wrap : wrap;
padding-bottom: 16px;
&-col {
display: flex;
width : calc(100% / 3);
padding: 16px 0;
&-option {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
&-rows {
display : flex;
padding-bottom: 16px;
&-cols {
flex: 1;
.cols-main {
display: flex;
padding: 16px 0;
&:nth-last-of-type(1) {
padding-bottom: 0;
}
&-options {
flex : 1;
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #303133;
}
}
}
}
}
}
src/pages/logistics/components/orderSearchDetail.tsx
View file @ 04c87542
......@@ -346,7 +346,7 @@ const detailInfo: React.FC<{}> = () => {
{item.title}
</div>
<div className={style['cols-main-options']}>
<a>{item.value}</a>
<div>{item.value}</div>
</div>
</div>
);
......
src/pages/logistics/list/addCompany.tsx
View file @ 04c87542
......@@ -76,6 +76,7 @@ const company: React.FC<parmas> = (props) => {
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
const [excludeList, setExcludeList] = useState<Array<any>>([])
useEffect(() => {
console.log(pageStatus, 1008611)
let _title = pageStatus === PageStatus.PREVIEW ? '查看' : id ? '编辑' : '新建'
setHeaderTitle(`${_title}物流公司`)
if (id) {
......@@ -181,7 +182,7 @@ const company: React.FC<parmas> = (props) => {
const fetchData = (params) => {
if (visible) {
return new Promise(resolve => {
PublicApi.postMemberManageLogisticsPage({ ...params, excludeList }).then(res => {
PublicApi.postMemberManageLogisticsPage({ ...params, excludeList }, {ctlType: 'none'}).then(res => {
resolve(res.data)
})
})
......@@ -279,7 +280,7 @@ const company: React.FC<parmas> = (props) => {
</Form.Item>
</Col>
{
(pageStatus !== PageStatus.PREVIEW) &&
(pageStatus !== 'PREVIEW') &&
<Col span={18}>
<Row>
<Col span={6}></Col>
......
src/pages/payandSettle/paySetting/index.tsx
View file @ 04c87542
......@@ -98,27 +98,43 @@ const PayWaySetTemplate: React.FC<{}> = () => {
const onHnadleSubmit = () => {
let conditions = false;
let wayName = '';
payItem.forEach(item => {
if (item.id === 2 && item.isPitchOn === 1) {
if(item.payParametersAddListRequests.length > 0) {
conditions = true
try {
payItem.forEach(item => {
if (item.id === 2 && item.isPitchOn === 1) {
console.log(1)
if (item.payParametersAddListRequests.length > 0) {
conditions = true
} else {
conditions = false
wayName = `${item.way}缺少支付参数配置`
throw new Error
}
} else if (item.id === 1 && item.isPitchOn === 1) {
if (item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
conditions = true
} else {
conditions = false
wayName = `${item.way}缺少支付参数配置`
throw new Error
}
} else if (item.id === 6 && item.isPitchOn === 1) {
if (item.payParametersAddListRequests.length > 0) {
const data = item.payParametersAddListRequests[0]
if (data.code && data.value && data.describe) {
conditions = true
} else {
conditions = false
wayName = `请配置${item.way}的参数`
throw new Error
}
}
} else {
conditions = false
wayName = item.way
return
}
} else if (item.id === 1 && item.isPitchOn === 1) {
if(item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
conditions = true
} else {
conditions = false
wayName = item.way
return
}
} else {
conditions = true
}
})
})
} catch {
message.error(wayName)
}
if (conditions) {
PublicApi.postPayMemberQueryPlatformUpdate({
platformPayWays: payItem
......@@ -127,8 +143,6 @@ const PayWaySetTemplate: React.FC<{}> = () => {
history.push('/memberCenter/payandSettle/paySetting/payParamsSetting')
}
})
} else {
message.error(`请新增${wayName}的支付参数配置`)
}
}
......
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