Merge remote-tracking branch 'origin/develop' into develop

src/views/annualPlan/annualPlanEdit/annualPlanEdit.vue

@@ -21,6 +21,11 @@
           <div style="width: 500px; height: 400px">
             <BasicTable
                 @register="item.table"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmit(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);
@@ -31,6 +36,11 @@
           <div style="width: 800px; height: 400px">
             <BasicTable
                 @register="item.tableTwo"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmitTwo(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmitTwo(item, index);
@@ -552,6 +562,7 @@
       loading.value = true;
       // console.log(res);
       createMessage.success('提交成功!');
+      router.back();
     } catch (e) {
       // 验证失败或出错，切换到对应标签页
       // console.log(e);

src/views/completed/completedEdit/completedEdit.vue

@@ -25,6 +25,11 @@
             </div>
             <BasicTable
                 @register="item.table"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmit(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);
@@ -39,6 +44,11 @@
             </div>
             <BasicTable
                 @register="item.tableTwo"
+                @edit-change="
+                  (e) => {
+                    beforeEditSubmitTwo(item, index);
+                  }
+                "
                 :beforeEditSubmit="
               (e) => {
                 beforeEditSubmitTwo(item, index);

src/views/engineeringProject/constructionEdit/constructionEdit.vue

@@ -21,6 +21,11 @@
         <div style="width: 500px">
           <BasicTable
               @register="item.table"
+              @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
               :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);

src/views/engineeringProject/engineeringEdit/engineeringEdit.vue

@@ -20,6 +20,11 @@
         <div style="width: 500px">
           <BasicTable
             @register="item.table"
+            @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
             :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);

src/views/engineeringProject/reserveEdit/reserveEdit.vue

@@ -20,6 +20,11 @@
         <div style="width: 500px">
           <BasicTable
               @register="item.table"
+              @edit-change="
+              (e) => {
+                beforeEditSubmit(item, index);
+              }
+            "
               :beforeEditSubmit="
               (e) => {
                 beforeEditSubmit(item, index);