From d7a52156c1e3d1eb2d85d582ab26133ae2895fa8 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 09 七月 2024 15:45:28 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 1d332b5..2a943f7 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -343,7 +343,7 @@
return
}
if($grid.getTableData().tableData.length!=$grid.getTableData().fullData.length){
- ElMessage.error("璇峰厛鍙栨秷绛涢��")
+ ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
return
}
//xGrid.value.clearSort()
@@ -489,6 +489,7 @@
}
})
}
+ computedMoney()
break
}
case 'copyChecked' :{
@@ -523,6 +524,7 @@
})
}
}
+ computedMoney()
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
@@ -550,15 +552,18 @@
}
})
}else{
+ console.log(dataList)
const val = getNestedProperty(dataList[result.start],result.cell)
dataList.forEach((item,index) =>{
if(index>=result.start ){
setNestedValue(item,result.cell,val)
}
+
})
}
}
+ computedMoney()
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
@@ -572,6 +577,7 @@
}
})
}
+ computedMoney()
gridOptions.menuConfig.body.options[0][5].disabled=false
break
}
--
Gitblit v1.8.0