Commit 76fba132 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

修改物流单选择商品传错id的问题

parent 9ebed4c5
...@@ -186,7 +186,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -186,7 +186,7 @@ const AddLogistics: React.FC<{}> = () => {
relevanceOrderCode: res.data.orderNo, relevanceOrderCode: res.data.orderNo,
voucherTime: res.data.transactionTime, voucherTime: res.data.transactionTime,
externalState: res.data.state, externalState: res.data.state,
shipmentOrderId: res.data.invoicesTypeId, shipmentOrderId: res.data.id,
relevanceOrderId: res.data.relevanceInvoicesId, relevanceOrderId: res.data.relevanceInvoicesId,
} }
form.setFieldsValue(obj); form.setFieldsValue(obj);
...@@ -332,7 +332,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -332,7 +332,7 @@ const AddLogistics: React.FC<{}> = () => {
case 1: case 1:
case 2: case 2:
case 3: case 3:
PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: id }).then((res: any) => { PublicApi.getWarehouseInvoicesProductList({ ...params, invoicesId: query.shipmentOrderId }).then((res: any) => {
if (res.code === 1000) { if (res.code === 1000) {
res.data.data.forEach(item => { res.data.data.forEach(item => {
item.category = item.categoryName item.category = item.categoryName
...@@ -344,21 +344,21 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -344,21 +344,21 @@ const AddLogistics: React.FC<{}> = () => {
}) })
break; break;
case 4: case 4:
PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: id }).then(res => { PublicApi.getAsReplaceGoodsPageReturnCommodityByLogistics({ ...params, dataId: query.relevanceOrderId }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
resolve(res.data) resolve(res.data)
} }
}) })
break; break;
case 5: case 5:
PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: id }).then(res => { PublicApi.getAsReplaceGoodsPageReplaceCommodityByLogistics({ ...params, dataId: query.relevanceOrderId}).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
resolve(res.data) resolve(res.data)
} }
}) })
break; break;
case 6: case 6:
PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: id }).then(res => { PublicApi.getAsReturnGoodsPageCommodityByLogistics({ ...params, dataId: query.relevanceOrderId }).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
resolve(res.data) resolve(res.data)
} }
......
...@@ -32,6 +32,9 @@ const comfirmDialog: React.FC<Params> = (props) => { ...@@ -32,6 +32,9 @@ const comfirmDialog: React.FC<Params> = (props) => {
if (res.code === 1000) { if (res.code === 1000) {
props.onOK() props.onOK()
} }
}).catch(error => {
console.log(error)
props.onOK()
}) })
} }
......
...@@ -180,6 +180,7 @@ const company: React.FC<parmas> = (props) => { ...@@ -180,6 +180,7 @@ const company: React.FC<parmas> = (props) => {
let { memberId, roleId, name } = selectRow let { memberId, roleId, name } = selectRow
menuForm.setFieldsValue({ menuForm.setFieldsValue({
companyMemberId: memberId, companyMemberId: memberId,
companyRoleId: roleId,
name: name name: name
}) })
setsVisible(false) setsVisible(false)
......
...@@ -173,7 +173,7 @@ export const enquierySearchSchema: ISchema = { ...@@ -173,7 +173,7 @@ export const enquierySearchSchema: ISchema = {
inline: true inline: true
}, },
properties:{ properties:{
inquiryListMemberName:{ memberName:{
type:'string', type:'string',
"x-component-props":{ "x-component-props":{
placeholder:'询价会员' placeholder:'询价会员'
...@@ -458,7 +458,7 @@ export const quoteFormSearch: ISchema = { ...@@ -458,7 +458,7 @@ export const quoteFormSearch: ISchema = {
placeholder:'询价单号' placeholder:'询价单号'
} }
}, },
inquiryListMemberName:{ memberName:{
type:'string', type:'string',
"x-component-props":{ "x-component-props":{
placeholder:'询价会员' placeholder:'询价会员'
......
...@@ -164,7 +164,7 @@ export const inquiryQuoteSchema: ISchema = { ...@@ -164,7 +164,7 @@ export const inquiryQuoteSchema: ISchema = {
placeholder: '报价单摘要' placeholder: '报价单摘要'
} }
}, },
inquiryListMemberName: { memberName: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '询价会员' placeholder: '询价会员'
......
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