feat(投资完成): 选择计划报错

src/views/performance/addPlanModel.vue

@@ -26,9 +26,10 @@
   import { modelColumns2 } from './data';
   import { useMessage } from '@/hooks/web/useMessage';
   import { ref } from 'vue';
+  import { isArray } from 'lodash-es';
 
   let detailId = ref();
-  const [registerTable, { getSelectRows, clearSelectedRowKeys }] = useTable({
+  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
     api: getProject,
     title: '',
     columns: modelColumns2,
@@ -60,12 +61,12 @@
     clearSelectedRowKeys();
   }
   const [register, { closeModal }] = useModalInner((data) => {
-
-    if(data.data.isArray){
-      detailId.value = data.data.join(",");
-    }else {
-      detailId.value = data.data
+    if (isArray(data.data)) {
+      detailId.value = data.data.join(',');
+    } else {
+      detailId.value = data.data;
     }
+    reload();
   });
 
   function handleSubmit() {

src/views/performance/data.tsx

@@ -72,6 +72,7 @@ export const searchModelFormSchema: FormSchema[] = [
   {
     field: 'filingCycle',
     label: '',
+    ifShow: false,
     component: 'DatePicker',
     componentProps: {
       placeholder: '年度',
@@ -87,6 +88,7 @@ export const searchModelFormSchema: FormSchema[] = [
   {
     field: 'planType',
     label: '',
+    ifShow: false,
     component: 'Select',
     componentProps: {
       placeholder: '类型',
@@ -103,10 +105,6 @@ export const searchModelFormSchema: FormSchema[] = [
           label: '承建',
           value: '承建',
         },
-        {
-          label: '储备',
-          value: '储备',
-        },
       ],
     },
     colProps: { span: 4 },

src/views/performance/index.vue

@@ -245,9 +245,10 @@
     reload();
   }
 
-  function handleCreate(planType) {
+  function handleCreate() {
     openModal(true, {
       data: ['year'],
+      planType:planType.value,
     });
   }
   function handleNew(e) {

src/views/performance/performanceModel.vue

@@ -36,16 +36,9 @@
   import { useMessage } from '@/hooks/web/useMessage';
   import { Tag } from 'ant-design-vue';
   import { BasicForm, useForm } from '@/components/Form';
+  import { ref } from 'vue';
 
-  const [
-    registerForm,
-    {
-      getFieldsValue,
-      validate,
-      //   // setFieldsValue,
-      //   // setProps
-    },
-  ] = useForm({
+  const [registerForm, { getFieldsValue, validate }] = useForm({
     labelWidth: 120,
     schemas: [
       {
@@ -64,28 +57,14 @@
         },
         colProps: { span: 7 },
       },
-      {
-        field: 'planType',
-        label: '请选择类型',
-        required: true,
-        component: 'Select',
-        componentProps: {
-          options: [
-            { label: '自投', value: '自投' },
-            { label: '承建', value: '承建' },
-            { label: '代建', value: '代建' },
-          ],
-          placeholder: '类型',
-        },
-        colProps: { span: 7 },
-      },
     ],
     showActionButtonGroup: false,
     actionColOptions: {
       span: 24,
     },
   });
-  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
+  const planType = ref();
+  const [registerTable, { reload, getSelectRows, clearSelectedRowKeys, getForm }] = useTable({
     api: getEngineeringList,
     title: '123',
     columns: modelColumns,
@@ -93,37 +72,19 @@
       labelWidth: 120,
       schemas: searchModelFormSchema,
     },
-
-    useSearchForm: true,
+    searchInfo: {
+      planType: planType,
+    },
+    useSearchForm: false,
     showTableSetting: false,
     bordered: true,
     showIndexColumn: false,
     rowSelection: {
       type: 'checkbox',
     },
-    // actionColumn: {
-    //   width: 80,
-    //   title: '操作',
-    //   dataIndex: 'action',
-    //   // slots: { customRender: 'action' },
-    //   fixed: undefined,
-    // },
   });
 
   const { createMessage } = useMessage();
-  function getSelectRowList() {
-    const ids = getSelectRows().map((i) => {
-      return i.id;
-    });
-    selectCycle.value.ids = ids;
-    if (ids.length > 0) {
-      emit('close', selectCycle.value);
-      clearSelectedRowKeys();
-      closeModal();
-    } else {
-      createMessage.warn('请至少选择一项投资计划!');
-    }
-  }
 
   const emit = defineEmits(['close']);
 
@@ -132,7 +93,8 @@
   }
 
   const [register, { closeModal }] = useModalInner((data) => {
-    data;
+    planType.value = data.planType;
+    reload();
   });
 
   async function handleSubmit() {
@@ -140,7 +102,7 @@
       let res = getFieldsValue();
       let selectCycle = {
         filingCycle: res.year,
-        planType: res.planType,
+        planType: planType.value,
         ids: [],
       };
       const ids = getSelectRows().map((i) => {