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

fix: 处理订单详情修改单价翻译问题,处理导入上游商品弹框在接口报错情况下重置

parent 7e375f15
......@@ -326,4 +326,7 @@ export default {
'transaction_components.fukuanqianqingbuyaoguanbi': 'Please do not close this window until payment is completed. After completing the payment, please click the button below according to your situation.',
'transaction_components.jianhangzhifuqueren': 'CCB payment confirmation',
'transaction_components.jianhangzhifu': 'CCB',
'transaction_components.xiugaiyuanyin': 'Modify the reason',
'transaction_components.qingshuruxiugaiyuanyin': 'Please enter the reason for the change',
'transaction_components.shouhuodanhao': 'Receipt no',
}
......@@ -326,4 +326,6 @@ export default {
'transaction_components.fukuanqianqingbuyaoguanbi': '결제가 완료되기 전에는이 창을 닫지 마십시오. 결제 완료 후 귀하의 상황에 맞게 아래 단추를 클릭해 주십시오. ',
'transaction_components.jianhangzhifuqueren': '건설은행의 지불 확인',
'transaction_components.jianhangzhifu': '건설 은행',
'transaction_components.xiugaiyuanyin': '이유 수정',
'transaction_components.qingshuruxiugaiyuanyin': '수정한 이유를 입력하십시오',
}
......@@ -40,15 +40,15 @@ const UpperProductModalTable: React.FC<UpperProductModalTableProps> = (props) =>
const items = rowSelectionCtl.selectRow
if (items.length) {
setConfirmLoading(true)
postProductCommoditySaveUpperCommodity({ idList: items.map(item => item.id) }).then(res => {
const { data, code } = res
if (code === 1000) {
postProductCommoditySaveUpperCommodity({ idList: items.map(item => item.id) }).then(() => {
// const { data, code } = res
// if (code === 1000) {
rowSelectionCtl.setSelectedRowKeys([])
setVisible(false)
setTimeout(() => {
tableRef && tableRef.current && tableRef.current.reload()
}, 800)
}
// }
}).finally(() => setConfirmLoading(false))
}
}
......
......@@ -12,12 +12,13 @@ import {
OrderKindType,
} from '@/constants/order'
import { AddressPop } from '../addressPop'
import { postOrderVendorPageFreightUpdate, postOrderVendorPageUnitPriceUpdate, postOrderVendorValidateSubmitFreightUpdate } from '@/services/OrderNewV2Api'
import { postOrderVendorValidateSubmitFreightUpdate } from '@/services/OrderNewV2Api'
import { postLogisticsFreightTemplateCalFreightPrice } from '@/services/LogisticsV2Api'
import { getProductPositionDeductionRecordList } from '@/services/ProductV2Api'
import { usePageStatus } from '@/hooks/usePageStatus'
import { useHttpRequest } from '@/hooks/useHttpRequest'
import { getIntl } from 'umi'
const intl = getIntl();
export interface OrderProductTableProps { }
......
......@@ -98,7 +98,7 @@ const StatusColors: React.FC<StatusColorsProps> = (props) => {
} else {
_text = text
}
console.log(_text)
const css: CSSProperties = _text.length >= 16 ? {
width: 100,
whiteSpace: 'nowrap',
......
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