🦀️ fix: 修复时间bug
This commit is contained in:
parent
4cb4ceb98a
commit
5e03572e51
|
@ -660,6 +660,13 @@ const Combining = forwardRef((props, ref) => {
|
|||
if (com === "type") {
|
||||
return <>立减金</>
|
||||
}
|
||||
if (com == "effectDate") {
|
||||
return (
|
||||
<>
|
||||
{info.date_time[0]} 至 {info.date_time[1]}
|
||||
</>
|
||||
)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</FormItem>
|
||||
|
|
|
@ -36,10 +36,10 @@ export const tableColumn = [
|
|||
},
|
||||
{
|
||||
title: "有效时间段",
|
||||
width: "350px",
|
||||
width: "300px",
|
||||
prop: "effectDate",
|
||||
name: "effectDate",
|
||||
type: "normal"
|
||||
type: "slot"
|
||||
},
|
||||
{
|
||||
title: "总预算",
|
||||
|
|
|
@ -1230,15 +1230,12 @@ export default class combiningAdd extends React.Component {
|
|||
}}
|
||||
ComponentHandler={(com, rowData) => {
|
||||
if (com == "type") {
|
||||
return <>立减金</>
|
||||
}
|
||||
if (com == "effectDate") {
|
||||
return (
|
||||
<>
|
||||
{rowData.type === 2
|
||||
? "立减金"
|
||||
: rowData.type === 3
|
||||
? rowData.origin.cash_amount_type === "2"
|
||||
? "随机红包"
|
||||
: "固额红包"
|
||||
: "商品"}
|
||||
{this.state.codeInfo.date_time[0]} 至 {this.state.codeInfo.date_time[1]}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -75,10 +75,10 @@ export const Column2 = [
|
|||
},
|
||||
{
|
||||
title: "有效时间段",
|
||||
width: "auto",
|
||||
width: "300px",
|
||||
prop: "effectDate",
|
||||
name: "effectDate",
|
||||
type: "normal"
|
||||
type: "slot"
|
||||
},
|
||||
{
|
||||
title: "当前成本价格",
|
||||
|
@ -207,9 +207,6 @@ export function reductionFn(params) {
|
|||
newObj.edit = "edit"
|
||||
newObj.all_budget = params.all_budget
|
||||
newObj.send_num = params.send_num || 1
|
||||
newObj.effectDate =
|
||||
params.effectDate ||
|
||||
params.time_limit?.effect_time.start_time + " 至 " + params.time_limit?.effect_time.end_time //有效时间
|
||||
newObj.contract_price = params.contract_price || params.price //单价
|
||||
newObj.official_price = params.official_price || params.reduce_amount //官方价
|
||||
newObj.quantity = params.quantity || all //总库
|
||||
|
|
Loading…
Reference in New Issue