Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

canteen/pages/purchase/detail.vue

@@ -124,7 +124,7 @@
 						label: '含税价'
 					},{
 						key: 'total_tax_amount',
-						label: '含税合计'
+						label: '含税价合计'
 					},{
 						key: 'after_tax_price',
 						label: '不含税价'
@@ -209,8 +209,8 @@
 							quality_level: item?.material?.quality_level,
 							m_sn: item?.material?.m_sn,
 							supplier_name: order?.supplier?.supplier_name,
-							pre_tax_price: item.total_tax_amount,
-							after_tax_price: item.total_non_tax_amount,
+							pre_tax_price: item.tax_price,
+							after_tax_price: item.non_tax_price,
 							purchase_limit: item?.p_order_item.purchase_limit,
 							purchase_number: item.purchase_number,
 							unit: item?.material?.unit?.unit_name || '',