ERP_override.git

			@@ -264,5 +264,11 @@
			color: black;
			}

			@page {
			size: auto; /* auto is the initial value */
			margin: 8mm 16mm 16mm 16mm /* this affects the margin in the printer settings */

			}


			</style>

			@@ -144,13 +144,13 @@
			otherMoney:{}
			})
			onMounted(()=>{
			if(Object.keys(prop.otherMoney).length === 0 \|\| prop.otherMoney===null){
			if(Object.keys(prop.otherMoney).length === 0){
			return
			}
			xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))
			})
			watch(prop,(newVal)=>{
			if(Object.keys(prop.otherMoney).length === 0 \|\| prop.otherMoney===null){
			if(Object.keys(prop.otherMoney).length === 0){
			return
			}
			xGrid.value.reloadData(prop.otherMoney.filter(item => item.column.indexOf('M')>-1))

	north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史