Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev

zhang_12370

5 天以前 6a9d1d79399c445f818120703783e4bdf28ca121

 src/views/warehouseManagement/index.vue

@@ -455,7 +455,8 @@
}
// 合并库存数据方法
const mergeRows = (type,row) => {
  coalFieldListOption();
  getDropdownData()
  coalPlanListOptions()
  mergeVisible.value = true;
  operationType.value = type;
  if (type === 'edit') {