Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-08 4c368a7d1f0bb452b4cbb063a86701b571a01a95

 north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue

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

const countAmount = (row) => {