Merge remote-tracking branch 'origin/master'

廖井涛

2025-08-22 eb196866b6b82289fa4fbb90639e23616dcfb82f

 north-glass-erp/northglass-erp/src/components/mm/PrintPackingListLuoyang.vue

@@ -24,6 +24,7 @@
const name2=ref("admin")

const printStyle = ref(null);
const title = ref({})



@@ -43,7 +44,6 @@


data.value.printList = JSON.parse(props.printList)
console.log(data.value.printList)

onMounted(() => {
  clearPrintStyles()
@@ -149,9 +149,9 @@
const orderDetailList = ref([])
const customer = ref({})
const selectPrint =async () => {
  const page = props.printPage==='storageRecordPint'?`/finishedGoodsInventory/getSelectPrints`:'/finishedGoodsInventory/getInventoryPrints'
  const page1 = props.printPage==='storageRecordPint'?`/finishedGoodsInventory/getSelectPrints`:'/finishedGoodsInventory/getInventoryPrints'
  const value = props.printPage==='storageRecordPint'?data.value:data.value.printList
  request.post(page, value).then((res) => {
  request.post(page1, value).then((res) => {
    if (res.code == 200) {
      produceList.value = deepClone(res.data.data)
      customer.value = produceList.value[0].detail[0]
@@ -221,6 +221,7 @@
          type:'sum',
          sum:sum
        })

      })
    } else {
      ElMessage.warning(res.msg)