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

Merge branch 'dev' into test

parents e30c8a0b 10bc76c7
...@@ -2,7 +2,11 @@ import React, { useState, useEffect, useRef } from 'react' ...@@ -2,7 +2,11 @@ import React, { useState, useEffect, useRef } from 'react'
import { history } from 'umi' import { history } from 'umi'
import { Form, Select, Radio, Checkbox, InputNumber } from 'antd' import { Form, Select, Radio, Checkbox, InputNumber } from 'antd'
import { PublicApi } from '@/services/api' import { PublicApi } from '@/services/api'
import { GetLogisticsSelectListCompanyResponse, GetLogisticsSelectListShipperAddressResponse, GetLogisticsSelectListFreightTemplateResponse } from '@/services' import {
GetLogisticsSelectListCompanyResponse,
GetLogisticsSelectListShipperAddressResponse,
GetLogisticsSelectListFreightTemplateResponse
} from '@/services/LogisticsApi'
import { store } from '@/store' import { store } from '@/store'
const { ProductStore } = store const { ProductStore } = store
...@@ -51,7 +55,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => { ...@@ -51,7 +55,7 @@ const LogisticsForm: React.FC<Iprops> = (props) => {
setLogisticsAddressList(res.data) setLogisticsAddressList(res.data)
}) })
PublicApi.getLogisticsSelectListCompany().then(res=>{ PublicApi.getLogisticsSelectListCompany({cooperateType: '2'}).then(res=>{
setLogisticsCompanyLists(res.data) setLogisticsCompanyLists(res.data)
}) })
......
...@@ -87,7 +87,7 @@ const AddRepository:React.FC<{}> = (props) => { ...@@ -87,7 +87,7 @@ const AddRepository:React.FC<{}> = (props) => {
<p><span>调出前库存:</span><span>{record.frontExportInventory}</span></p> <p><span>调出前库存:</span><span>{record.frontExportInventory}</span></p>
</div> </div>
} }, } },
{ dataIndex: 'repositOut', title: '调库存', align: 'center', render: (_, record) => { { dataIndex: 'repositOut', title: '调库存', align: 'center', render: (_, record) => {
return <div> return <div>
<p><span>调入库存:</span><span>{record.foldInventory}</span></p> <p><span>调入库存:</span><span>{record.foldInventory}</span></p>
<p><span>调入后库存:</span><span>{record.foldRearInventory}</span></p> <p><span>调入后库存:</span><span>{record.foldRearInventory}</span></p>
......
...@@ -236,6 +236,7 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => { ...@@ -236,6 +236,7 @@ const PositionSetting:React.FC<PositionSettingProps> = (props) => {
// 设置货品名称 // 设置货品名称
addSchemaAction.setFieldValue('goodsName', data?.name || '') addSchemaAction.setFieldValue('goodsName', data?.name || '')
addSchemaAction.setFieldValue('goodsId', goodsId) addSchemaAction.setFieldValue('goodsId', goodsId)
addSchemaAction.setFieldValue('itemNo', data?.code || '')
} }
} }
......
...@@ -430,6 +430,20 @@ export const repositDetailSchema: ISchema = padRequiredMessage({ ...@@ -430,6 +430,20 @@ export const repositDetailSchema: ISchema = padRequiredMessage({
itemNo: { itemNo: {
type: 'string', type: 'string',
"x-component": 'Text', "x-component": 'Text',
title: '货号',
default: '暂无',
visible: false,
},
goodsId: {
type: 'string',
"x-component": 'Text',
title: '货品ID',
default: '暂无',
visible: false,
},
goodsName: {
type: 'string',
"x-component": 'Text',
title: '对应货品', title: '对应货品',
default: '暂无' default: '暂无'
}, },
...@@ -515,7 +529,7 @@ export const repositDetailSchema: ISchema = padRequiredMessage({ ...@@ -515,7 +529,7 @@ export const repositDetailSchema: ISchema = padRequiredMessage({
{ label: '所有会员共享(默认)', value: 1 }, { label: '所有会员共享(默认)', value: 1 },
{ label: '指定会员', value: 0 }, { label: '指定会员', value: 0 },
], ],
"title": "选择渠道会员", "title": "选择会员",
default: 1, default: 1,
required: true, required: true,
"x-linkages": [ "x-linkages": [
...@@ -630,7 +644,7 @@ export const repositTabOneSchema: ISchema = padRequiredMessage({ ...@@ -630,7 +644,7 @@ export const repositTabOneSchema: ISchema = padRequiredMessage({
editable: false, editable: false,
enum: [] enum: []
}, },
itemNo: { goodsName: {
type: 'string', type: 'string',
"x-component": 'Text', "x-component": 'Text',
title: '对应货品', title: '对应货品',
......
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