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

src/components/projectlibraryModel/projectlibraryModel.vue

@@ -7,7 +7,7 @@
     :minHeight="30"
     okText="导入"
     @ok="handleSubmit"
-    @visible-change="handleVisibleChange"
+    @cancel="handleVisibleChange"
   >
     <BasicTable @register="registerTable">
       <template #bodyCell="{ column, text, record, index }">
@@ -27,7 +27,7 @@
   import { columns, searchFormSchema } from '@/components/projectlibraryModel/data';
   import { useMessage } from '@/hooks/web/useMessage';
 
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
     api: getListByPage,
     title: '123',
     columns,
@@ -60,13 +60,16 @@
 
   const emit = defineEmits(['close']);
 
-  function handleVisibleChange(v) {}
+  function handleVisibleChange(v) {
+    clearSelectedRowKeys();
+  }
   const [register, { closeModal }] = useModalInner((data) => {
     data;
   });
 
   function handleSubmit() {
     getSelectRowList();
+    clearSelectedRowKeys();
     closeModal();
   }
 </script>

src/views/biddingManagement/biddingManagementEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-<!--      <a-button type="primary" danger> 删除 </a-button>-->
+      <!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
@@ -72,11 +72,11 @@
       formData.value.tenderYear = route.query.year;
       formData.value.tenderPlanPro = [];
       isUpdate.value = false;
-      console.log(formData);
       getTitle.value = '新增招标管理';
     } else {
       isUpdate.value = true;
       tenderId.value = id;
+      formData.value.tenderld = id;
       disabled.value = route.query.disabled == '0' ? false : true;
       if (disabled.value) {
         getTitle.value = '查看招标管理';
@@ -160,20 +160,23 @@
     });
   }
   async function deleteItem(index: any) {
-    loadingRef.value = true;
-    const id = formData.value.tenderPlanPro[index].id;
-    if (id) {
-      await Itemdelete({
-        id,
-      });
-      formData.value.tenderPlanPro.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    } else {
-      formData.value.tenderPlanPro.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    }
+    // loadingRef.value = true;
+    // const id = formData.value.tenderPlanPro[index].id;
+    // if (id) {
+    //   await Itemdelete({
+    //     id,
+    //   });
+    //   formData.value.tenderPlanPro.splice(index, 1);
+    //   tabsFormSchema.splice(index, 1);
+    //   loadingRef.value = false;
+    // } else {
+    console.log(tabsFormSchema);
+    console.log(index);
+    formData.value.tenderPlanPro.splice(index, 1);
+    tabsFormSchema.splice(index, 1);
+    console.log(tabsFormSchema);
+    // loadingRef.value = false;
+    // }
   }
 
   async function handleAdd() {
@@ -198,9 +201,8 @@
       }
       formData.value.proNumber = formData.value.tenderPlanPro.Length;
 
-      let res = isUpdate.value
-        ? await updateItem(unref(formData.value.tenderPlanPro))
-        : await addItem(unref(formData));
+      let res = isUpdate.value ? await updateItem(unref(formData)) : await addItem(unref(formData));
+
       loadingRef.value = false;
       console.log(res);
       createMessage.success('提交成功!');

src/views/biddingPlan/biddingPlanEdit.vue

@@ -7,7 +7,7 @@
     headerSticky
   >
     <template #extra>
-<!--      <a-button type="primary" danger> 删除 </a-button>-->
+      <!--      <a-button type="primary" danger> 删除 </a-button>-->
       <a-button type="primary" v-if="!disabled" @click="handleSubmit"> 提交 </a-button>
       <a-button type="default" @click="router.back()"> 返回 </a-button>
     </template>
@@ -48,6 +48,7 @@
   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();
@@ -72,6 +73,7 @@
     } else {
       isUpdate.value = true;
       tenderId.value = id;
+      formData.value.tenderld = id;
       disabled.value = route.query.disabled == '0' ? false : true;
       if (disabled.value) {
         getTitle.value = '查看招标计划';
@@ -154,20 +156,25 @@
     });
   }
   async function deleteItem(index: any) {
-    loadingRef.value = true;
-    const id = formData.value.tenderPlanPro[index].id;
-    if (id) {
-      await Itemdelete({
-        id,
-      });
-      formData.value.tenderPlanPro.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    } else {
-      formData.value.tenderPlanPro.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    }
+    // loadingRef.value = true;
+    // const id = formData.value.tenderPlanPro[index].id;
+    // if (id) {
+    //   await Itemdelete({
+    //     id,
+    //   });
+    //   formData.value.tenderPlanPro.splice(index, 1);
+    //   tabsFormSchema.splice(index, 1);
+    //   loadingRef.value = false;
+    // } else {
+    console.log(index);
+
+    formData.value.tenderPlanPro.splice(index, 1);
+
+    tabsFormSchema.splice(index, 1);
+    console.log(tabsFormSchema);
+    console.log(formData.value.tenderPlanPro);
+    // loadingRef.value = false;
+    // }
   }
 
   async function handleAdd() {
@@ -187,8 +194,13 @@
         const { validate, getFieldsValue } = item.Form[1];
         await validate();
         let res = getFieldsValue();
-        res.biddingPeriod = res.biddingPeriod.join(',');
-        res.plannedPeriod = res.plannedPeriod.join(',');
+        res.biddingPeriod = isArray(res.biddingPeriod)
+          ? res.biddingPeriod.join(',')
+          : res.biddingPeriod;
+        res.plannedPeriod = isArray(res.plannedPeriod)
+          ? res.plannedPeriod.join(',')
+          : res.plannedPeriod;
+        // res.plannedPeriod = res.plannedPeriod.join(',');
         formData.value.tenderPlanPro[i] = deepMerge(formData.value.tenderPlanPro[i], res);
         console.log(formData.value.tenderPlanPro);
       }

src/views/monthlyPlan/monthlyPlanEdit/monthlyPlanEdit.vue

@@ -197,6 +197,7 @@
         contrcatName: info.contrcatName,
         collectingUnit: info.collectingUnit,
         contractAmount: info.contractAmount,
+        investmentAmount: info.investmentAmount,
       });
       console.log(formData.value.engineerConList);
     } else {
@@ -228,6 +229,7 @@
         contrcatName: info.contrcatName,
         collectingUnit: info.collectingUnit,
         contractAmount: info.contractAmount,
+        investmentAmount: info.investmentAmount,
       });
     }
   }
@@ -243,20 +245,20 @@
     });
   }
   async function deleteItem(index: any) {
-    loadingRef.value = true;
-    const id = formData.value.engineerConList[index].id;
-    if (id) {
-      await Itemdelete({
-        id,
-      });
-      formData.value.engineerConList.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    } else {
-      formData.value.engineerConList.splice(index, 1);
-      tabsFormSchema.splice(index, 1);
-      loadingRef.value = false;
-    }
+    // loadingRef.value = true;
+    // const id = formData.value.engineerConList[index].id;
+    // if (id) {
+    //   await Itemdelete({
+    //     id,
+    //   });
+    //   formData.value.engineerConList.splice(index, 1);
+    //   tabsFormSchema.splice(index, 1);
+    //   loadingRef.value = false;
+    // } else {
+    formData.value.engineerConList.splice(index, 1);
+    tabsFormSchema.splice(index, 1);
+    loadingRef.value = false;
+    // }
   }
   async function getFormData(form: any) {
     const { validate, getFieldsValue } = form;

src/views/monthlyPlan/monthlyPlanEdit/tableData.tsx

@@ -50,7 +50,7 @@ export const formSchema: FormSchema[] = [
   {
     field: 'fundGap',
     label: '资金缺口',
-    required: true,
+    // required: true,
     component: 'Input',
 
     componentProps: {
@@ -68,6 +68,9 @@ export const formSchema: FormSchema[] = [
       maxlength: 100,
       showCount: true,
     },
+    dynamicRules: ({ values }) => {
+      return values.fundGap ? [{ required: true, message: '备注必填' }] : [];
+    },
     colProps: { span: 7, offset: 1 },
   },
 ];
@@ -105,6 +108,17 @@ export const subFormSchema: FormSchema[] = [
     },
     colProps: { span: 7, offset: 1 },
   },
+  {
+    field: 'investmentAmount',
+    label: '结算金额',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      readonly: true,
+      style: { border: 'none' },
+    },
+    colProps: { span: 7, offset: 1 },
+  },
   {
     field: 'paymentLevel',
     label: '支付等级',