Commit 51956048 by linjinhong

fix:修改普货按钮问题

parent 926f36ff
...@@ -1017,15 +1017,14 @@ const printNormal = async () => { ...@@ -1017,15 +1017,14 @@ const printNormal = async () => {
;(podBoxList.value || []).forEach((item: PodMakeOrderData) => { ;(podBoxList.value || []).forEach((item: PodMakeOrderData) => {
if (item.data) { if (item.data) {
if (item.data.productList && item.data.productList.length > 0) { if (item.data.productList && item.data.productList.length > 0) {
const flag = item.data.productList.some((item1) => { item.data.productList.forEach((item1) => {
return ( if (
item1.productMark == 'normal' || item1.productMark == 'normal' ||
item1.productMark == 'custom_normal' item1.productMark == 'custom_normal'
) ) {
arr?.push(item1?.id)
}
}) })
if (flag) {
arr?.push(item.data?.id)
}
} }
} }
}) })
......
...@@ -1390,7 +1390,10 @@ ...@@ -1390,7 +1390,10 @@
</template> </template>
</ElDropdown> --> </ElDropdown> -->
<div <div
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'" v-if="
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style=" style="
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -1410,7 +1413,10 @@ ...@@ -1410,7 +1413,10 @@
<!-- f --> <!-- f -->
</div> </div>
<div <div
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'" v-if="
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style="display: flex; justify-content: space-between" style="display: flex; justify-content: space-between"
> >
<el-button <el-button
...@@ -1432,7 +1438,10 @@ ...@@ -1432,7 +1438,10 @@
</el-button> </el-button>
</div> </div>
<div <div
v-if="status === 'WAIT_SHIPMENT' && item.productMark !== 'custom_normal'" v-if="
status === 'WAIT_SHIPMENT' &&
item.productMark !== 'custom_normal'
"
style=" style="
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -3903,7 +3912,7 @@ watch( ...@@ -3903,7 +3912,7 @@ watch(
if (product.productMark === 'custom_normal') { if (product.productMark === 'custom_normal') {
product.previewImgs = [] product.previewImgs = []
} else { } else {
product.previewImgs = product.previewImgs =
JSON.parse(product.imageAry)?.filter( JSON.parse(product.imageAry)?.filter(
(el: { title: string }) => el.title, (el: { title: string }) => el.title,
) || [] ) || []
...@@ -6334,12 +6343,12 @@ const printNormal = async () => { ...@@ -6334,12 +6343,12 @@ const printNormal = async () => {
console.log(3660, selection.value) console.log(3660, selection.value)
selection.value.forEach((s) => { selection.value.forEach((s) => {
const f = s.productList &&
s.productList && s.productList.forEach((p) => {
s.productList.find( if (p.productMark === 'normal' || p.productMark === 'custom_normal') {
(p) => p.productMark === 'normal' || p.productMark === 'custom_normal', arr.push(p.id)
) }
if (f) arr.push(f.id) })
}) })
console.log(3661, arr) console.log(3661, arr)
......
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