|
|
@@ -433,6 +433,7 @@ export default function DesignPic() {
|
|
|
let table_obj: { [key: string]: any } = {},
|
|
|
img_values: imgValuesProps = {}, fetch_url = "";
|
|
|
tableData.forEach(item => {
|
|
|
+ // 定制图
|
|
|
if (item.design_pic && !img_values[item.design_pic]) {
|
|
|
img_values[item.design_pic] = {
|
|
|
design_pic: item.design_pic,
|
|
|
@@ -442,6 +443,18 @@ export default function DesignPic() {
|
|
|
height: ''
|
|
|
}
|
|
|
}
|
|
|
+ if (isPreImg == 1) {
|
|
|
+ // 预览图
|
|
|
+ if (item.pre_info && item.pre_info.pre_pic && !img_values[item.pre_info.pre_pic]) {
|
|
|
+ img_values[item.pre_info.pre_pic] = {
|
|
|
+ design_pic: item.pre_info.pre_pic,
|
|
|
+ design_sku: item.design_sku,
|
|
|
+ url: '',
|
|
|
+ width: '',
|
|
|
+ height: ''
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
if (!table_obj[item.design_sku]) {
|
|
|
table_obj[item.design_sku] = ""
|
|
|
}
|
|
|
@@ -460,17 +473,33 @@ export default function DesignPic() {
|
|
|
data_params,
|
|
|
}
|
|
|
} else {
|
|
|
- table_obj[item.design_sku] = {
|
|
|
- order_no: item.order_no,
|
|
|
- design_sku: item.design_sku,
|
|
|
- data_params: [{
|
|
|
- design_pic: item.design_pic,
|
|
|
- file: item.file || '',
|
|
|
- region: item.region,
|
|
|
- text: item.text,
|
|
|
- width: item.width,
|
|
|
- height: item.height,
|
|
|
- }]
|
|
|
+ if (isPreImg == 1) {
|
|
|
+ table_obj[item.design_sku] = {
|
|
|
+ order_no: item.order_no,
|
|
|
+ design_sku: item.design_sku,
|
|
|
+ pre_info: item.pre_info,
|
|
|
+ data_params: [{
|
|
|
+ design_pic: item.design_pic,
|
|
|
+ file: item.file || '',
|
|
|
+ region: item.region,
|
|
|
+ text: item.text,
|
|
|
+ width: item.width,
|
|
|
+ height: item.height,
|
|
|
+ }]
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ table_obj[item.design_sku] = {
|
|
|
+ order_no: item.order_no,
|
|
|
+ design_sku: item.design_sku,
|
|
|
+ data_params: [{
|
|
|
+ design_pic: item.design_pic,
|
|
|
+ file: item.file || '',
|
|
|
+ region: item.region,
|
|
|
+ text: item.text,
|
|
|
+ width: item.width,
|
|
|
+ height: item.height,
|
|
|
+ }]
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
@@ -547,6 +576,7 @@ export default function DesignPic() {
|
|
|
|
|
|
for (let key in table_obj) {
|
|
|
if (imgall_values[key]) {
|
|
|
+ // 定制图
|
|
|
if (table_obj[key].data_params && Array.isArray(table_obj[key].data_params) && table_obj[key].data_params.length) {
|
|
|
const design_pic = table_obj[key].data_params.find((item: any) => item.design_pic)
|
|
|
if (design_pic) {
|
|
|
@@ -557,15 +587,28 @@ export default function DesignPic() {
|
|
|
item['height'] = height
|
|
|
item['file'] = url
|
|
|
item['type'] = type
|
|
|
- console.log(item)
|
|
|
+ // console.log(item)
|
|
|
}
|
|
|
return item
|
|
|
})
|
|
|
}
|
|
|
}
|
|
|
+ // 预览图
|
|
|
+ if (isPreImg == 1) {
|
|
|
+ if (table_obj[key].pre_info && table_obj[key].pre_info.pre_pic && imgall_values[key][table_obj[key].pre_info.pre_pic]) {
|
|
|
+ const { width, height, url, type } = imgall_values[key][table_obj[key].pre_info.pre_pic]
|
|
|
+ table_obj[key].pre_info = {
|
|
|
+ ...table_obj[key].pre_info,
|
|
|
+ width,
|
|
|
+ height,
|
|
|
+ file: url,
|
|
|
+ type,
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- console.log(imgall_values, '-imgall_values', table_obj)
|
|
|
+ // console.log(imgall_values, '-imgall_values', table_obj)
|
|
|
imgFetchFun(table_obj)
|
|
|
}
|
|
|
}
|
|
|
@@ -598,7 +641,7 @@ export default function DesignPic() {
|
|
|
// tableData循环出备货单相同的数据,修改表格操作数据 is_upload
|
|
|
let tableData1 = tableData.map(item => {
|
|
|
if (item.order_no == params.order_no) {
|
|
|
- console.log(item.order_no, "item.order_no", params)
|
|
|
+ // console.log(item.order_no, "item.order_no", params)
|
|
|
item.is_upload = true
|
|
|
}
|
|
|
return item
|
|
|
@@ -670,13 +713,13 @@ export default function DesignPic() {
|
|
|
</div>
|
|
|
<Table dataSource={dataSourceWithIndex}>
|
|
|
<Table.Column title="序号" cell={order_render} align="center" />
|
|
|
+ <Table.Column title="备货单" cell={name_render} align="center" />
|
|
|
{
|
|
|
- isPreImg == 1 && <Table.Column title="定制区域图" cell={design_render} align="center" />
|
|
|
+ isPreImg == 1 && <Table.Column title="合成预览图" cell={design_render} align="center" />
|
|
|
}
|
|
|
- <Table.Column title="图片" cell={pic_render} align="center" />
|
|
|
- <Table.Column title="备货单" cell={name_render} align="center" />
|
|
|
<Table.Column title="定制区域" cell={label_render} align="center" />
|
|
|
<Table.Column title="文字" cell={text_render} align="center" />
|
|
|
+ <Table.Column title="图片" cell={pic_render} align="center" />
|
|
|
<Table.Column title="操作" cell={option_render} align="center" />
|
|
|
</Table>
|
|
|
<p className='text-red-500'>ps:若获取不到数据,可能是插件未连接成功,请刷新页面</p>
|
liqiuying