Merge branch 'test'

src/views/reportManage/dataCenter/normalDisplay/components/TableDataEntry.vue

@@ -409,7 +409,6 @@ const editEvent = async (row: RowVO) => {
   taskId = row.task;
   currentId = row.id;
   currentRow.value = row;
-  console.log("=>(TableDataEntry.vue:412) currentRow.value", currentRow.value);
   Object.assign(taskDataForm, row);
   await currentSalesTip();
   dayFormVisible.value = true;
@@ -710,7 +709,6 @@ async function updateMonthData(row: RowVO) {
 }
 
 const editRowEvent = async (row: any) => {
-  activeEditRow.value = false;
   const $grid = xGrid.value;
   if ($grid) {
     if (dateType === 'day') {
@@ -726,6 +724,7 @@ const editRowEvent = async (row: any) => {
       if (!validateNumericFields(row, fieldsToValidate)) return; // 验证字段
       await updateMonthData(row);
     }
+    activeEditRow.value = false;
     await $grid.clearEdit();
   }
 };