fix: 修复营销计划复制不现实商品编号
This commit is contained in:
parent
bfb43d57ae
commit
a0d33c3275
|
@ -49,7 +49,7 @@ const tableColumn = [
|
||||||
title: "商品编号",
|
title: "商品编号",
|
||||||
name: "product_id",
|
name: "product_id",
|
||||||
prop: "product_id",
|
prop: "product_id",
|
||||||
type: "normal",
|
type: "slot",
|
||||||
width: "auto",
|
width: "auto",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -372,11 +372,11 @@ const UseCouponAddEdit = forwardRef((props, ref) => {
|
||||||
// 如果是复制 删除id !!!!!!!!
|
// 如果是复制 删除id !!!!!!!!
|
||||||
if (state.KeyPcType === "2") {
|
if (state.KeyPcType === "2") {
|
||||||
delete item.id;
|
delete item.id;
|
||||||
|
delete item.goods_id;
|
||||||
}
|
}
|
||||||
let table_obj = knockGoldFun(item);
|
let table_obj = knockGoldFun(item);
|
||||||
return table_obj;
|
return table_obj;
|
||||||
});
|
});
|
||||||
|
|
||||||
let scope_data = goods_arr.concat(lj_arr);
|
let scope_data = goods_arr.concat(lj_arr);
|
||||||
scope_data = _.map(scope_data, (o) => {
|
scope_data = _.map(scope_data, (o) => {
|
||||||
if (o.type === 2) {
|
if (o.type === 2) {
|
||||||
|
@ -1415,6 +1415,16 @@ const UseCouponAddEdit = forwardRef((props, ref) => {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (com === "product_id") {
|
||||||
|
return (
|
||||||
|
<span>
|
||||||
|
{state.KeyPcType === "2" && rowData.type === 2
|
||||||
|
? "-"
|
||||||
|
: rowData.product_id}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (com === "type") {
|
if (com === "type") {
|
||||||
return <span>{rowData.type === 1 ? "商品" : "立减金"}</span>;
|
return <span>{rowData.type === 1 ? "商品" : "立减金"}</span>;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ export const knockGoldFun = (item) => {
|
||||||
table_obj.upstream = String(item.channel) === "1" ? "支付宝" : "微信"; // 上游平台
|
table_obj.upstream = String(item.channel) === "1" ? "支付宝" : "微信"; // 上游平台
|
||||||
|
|
||||||
table_obj.only = item; // 存储就数据 编辑好用
|
table_obj.only = item; // 存储就数据 编辑好用
|
||||||
table_obj.product_id = item.goods_id; // 商品编号
|
table_obj.product_id = item.goods_id ? item.goods_id : item.batch_goods_name; // 商品编号
|
||||||
table_obj.product_name = item.batch_goods_name; // 商品名
|
table_obj.product_name = item.batch_goods_name; // 商品名
|
||||||
table_obj.official_price = item.reduce_amount; // 官方价
|
table_obj.official_price = item.reduce_amount; // 官方价
|
||||||
table_obj.contract_price = item.price; // 合同价格
|
table_obj.contract_price = item.price; // 合同价格
|
||||||
|
|
Loading…
Reference in New Issue