Merge branch 'main' of https://gitea.lihaink.cn/mkm/engineering_admin

src/components/export-data/index.vue

@@ -1,14 +1,7 @@
 <template>
     <div class="export-data">
-        <popup
-            ref="popupRef"
-            title="导出设置"
-            width="500px"
-            confirm-button-text="确认导出"
-            @confirm="handleConfirm"
-            :async="true"
-            @open="getData"
-        >
+        <popup ref="popupRef" title="导出设置" width="500px" confirm-button-text="确认导出" @confirm="handleConfirm" :async="true"
+            @open="getData">
             <template #trigger>
                 <el-button>导出</el-button>
             </template>
@@ -33,27 +26,17 @@
                     <el-form-item label="分页范围：" v-if="formData.page_type == 1">
                         <div class="flex">
                             <el-form-item prop="page_start">
-                                <el-input
-                                    style="width: 140px"
-                                    v-model.number="formData.page_start"
-                                    placeholder=""
-                                ></el-input>
+                                <el-input style="width: 140px" v-model.number="formData.page_start"
+                                    placeholder=""></el-input>
                             </el-form-item>
                             <span class="flex-none ml-2 mr-2">页，至</span>
                             <el-form-item prop="page_end">
-                                <el-input
-                                    style="width: 140px"
-                                    v-model.number="formData.page_end"
-                                    placeholder=""
-                                ></el-input>
+                                <el-input style="width: 140px" v-model.number="formData.page_end" placeholder=""></el-input>
                             </el-form-item>
                         </div>
                     </el-form-item>
                     <el-form-item label="导出文件名称：" prop="file_name">
-                        <el-input
-                            v-model="formData.file_name"
-                            placeholder="请输入导出文件名称"
-                        ></el-input>
+                        <el-input v-model="formData.file_name" placeholder="请输入导出文件名称"></el-input>
                     </el-form-item>
                 </el-form>
             </div>
@@ -145,5 +128,5 @@ const handleConfirm = async () => {
         feedback.closeLoading()
     }
 }
-getData()
+// getData()
 </script>

src/views/bid_bidding_decision/index.vue

@@ -27,6 +27,8 @@
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
+                    <export-data class="ml-2.5" :fetch-fun="apiBidBiddingDecisionLists" :params="queryParams"
+                        :page-size="pager.size" />
                 </el-form-item>
             </el-form>
         </el-card>