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

src/views/biddingManagement/biddingManagementEdit.vue

@@ -38,7 +38,7 @@
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { unref, onMounted, ref, reactive } from 'vue';
+  import { unref, onMounted, ref, reactive, nextTick } from 'vue';
   import projectlibraryModel from '@/components/projectlibraryModel/projectlibraryModel.vue';
   import { PageWrapper } from '@/components/Page';
   import PageCard from '@/components/Page/src/PageCard.vue';
@@ -48,13 +48,14 @@
   import { deepMerge } from '@/utils';
   import { useMessage } from '@/hooks/web/useMessage';
   import { useDrawer } from '@/components/Drawer';
-  import { addItem, updateItem, getItem, Itemdelete } from '@/api/project/biddingManagement';
+  import { addItem, updateItem, getItem } from '@/api/project/biddingManagement';
   import { editModel } from '@/api/project/model/biddingManagementModel';
-  import { nextTick } from 'vue';
-  const [registerDrawer, { openDrawer }] = useDrawer();
   import { useModal } from '@/components/Modal';
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
+
+  const [registerDrawer, { openDrawer }] = useDrawer();
+
   const [register, { openModal: openModal }] = useModal();
   const { createMessage } = useMessage();
   const loadingRef = ref(false);
@@ -165,6 +166,7 @@
     });
   }
   async function deleteItem(index: any) {
+    formData.value.tenderPlanPro.splice(index, 1);
     // loadingRef.value = true;
     // const id = formData.value.tenderPlanPro[index].id;
     // if (id) {
@@ -175,7 +177,8 @@
     //   tabsFormSchema.splice(index, 1);
     //   loadingRef.value = false;
 
-    tabsFormSchema[index].show = false;
+    // tabsFormSchema[index].show = false;
+    tabsFormSchema.splice(index, 1);
     // loadingRef.value = false;
     // }
   }

src/views/biddingPlan/biddingPlanEdit.vue

@@ -36,7 +36,7 @@
   </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { unref, computed, onMounted, ref, reactive, nextTick } from 'vue';
+  import { unref, onMounted, ref, reactive, nextTick } from 'vue';
   import projectlibraryModel from '@/components/projectlibraryModel/projectlibraryModel.vue';
   import { PageWrapper } from '@/components/Page';
   import PageCard from '@/components/Page/src/PageCard.vue';
@@ -46,12 +46,13 @@
   import { deepMerge } from '@/utils';
   import { useMessage } from '@/hooks/web/useMessage';
   import { useDrawer } from '@/components/Drawer';
-  import { addItem, updateItem, getItem, Itemdelete } from '@/api/project/biddingPlan';
+  import { addItem, updateItem, getItem } from '@/api/project/biddingPlan';
   import { editModel } from '@/api/project/model/biddingPlanModel';
   import { useModal } from '@/components/Modal';
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
   import { isArray } from 'lodash-es';
+
   const loadingRef = ref(false);
   const [registerDrawer, { openDrawer }] = useDrawer();
   const [register, { openModal: openModal }] = useModal();
@@ -162,22 +163,16 @@
     });
   }
   async function deleteItem(index: any) {
+    formData.value.tenderPlanPro.splice(index, 1);
     // loadingRef.value = true;
     // const id = formData.value.tenderPlanPro[index].id;
+    // formData.value.tenderPlanPro.filter((item) => item.id != id);
     // if (id) {
     //   await Itemdelete({
     //     id,
     //   });
-
-    //   tabsFormSchema.splice(index, 1);
-    //   loadingRef.value = false;
-    // } else {
-    tabsFormSchema[index].show = false;
-
-    // console.log(tabsFormSchema);
-    // console.log(formData.value.tenderPlanPro);
-    // loadingRef.value = false;
-    // }
+    // tabsFormSchema[index].show = false;
+    tabsFormSchema.splice(index, 1);
   }
 
   async function handleAdd() {
@@ -207,7 +202,6 @@
           // res.plannedPeriod = res.plannedPeriod.join(',');
           formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
         }
-        console.log(formData.value.tenderPlanPro);
       }
       formData.value.proNumber = formData.value.tenderPlanPro.Length;