Merge branch 'master' of https://gitlab.guxuan.icu/Leo_Ding/zhonghai_admin

src/views/banner/components/EditDialog.vue

@@ -11,7 +11,7 @@
                     </a-col>
                     <a-col :span="24">
                         <a-form-item :label="'所属区域'" name="areaId">
-                            <a-select ref="select" v-model:value="formData.areaId" :placeholder="$t('pages.system.announcement.form.content.placeholder')">
+                            <a-select ref="select" v-model:value="formData.areaId" :placeholder="'请输入所属区域'">
                                 <a-select-option 
                                     v-for="item in areaEnum.getAll()" 
                                     :value="item.value">{{item.name }}</a-select-option>
@@ -65,6 +65,7 @@ const img = ref('')
 formRules.value = {
     name: { required: true, message: '请输入名称' },
     status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+    areaId: [{ required: true, message: '请选择所属区域', trigger: 'change' }],
     sequence: [{ required: true, message: '请选择顺序', trigger: 'change' }],
     img: [{ required: true, message: '请上传图片', trigger: 'change' }],
     areaId: [{ required: true, message: '请选择区域', trigger: 'change' }],

src/views/prizeDraw/lotteryOrders/index.vue

@@ -44,10 +44,11 @@
             </a-card>
         </a-col>
     </a-row>
-
+  <div class="exportExcel"><a-button type="primary" @click="exportExcel">导出Excel</a-button></div>
 </template>
 
 <script setup>
+import * as XLSX from "xlsx"; // 推荐用 xlsx 库导出 Excel
 import { message, Modal } from 'ant-design-vue'
 import { ref } from 'vue'
 import apis from '@/apis'
@@ -158,6 +159,23 @@ async function onOk() {
     await getPageList()
 }
 
+function exportExcel() {
+    // 1. 创建一个工作簿
+    const wb = XLSX.utils.book_new();
+    // 2. 创建一个工作表
+    const ws = XLSX.utils.json_to_sheet(listData.value);
+    // 3. 将工作表添加到工作簿
+    XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
+    // 4. 导出 Excel 文件
+    XLSX.writeFile(wb, "lotteryOrders.xlsx");
+}
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.exportExcel {
+    display: flex;
+    flex-direction: row;
+    justify-content: right;
+    margin: 10px;
+}
+</style>