diff --git a/src/api/shop/shopGift/model/index.ts b/src/api/shop/shopGift/model/index.ts
index 2f5280d..fcd2de9 100644
--- a/src/api/shop/shopGift/model/index.ts
+++ b/src/api/shop/shopGift/model/index.ts
@@ -52,5 +52,6 @@ export interface ShopGift {
  */
 export interface ShopGiftParam extends PageParam {
   id?: number;
+  code?: string;
   keywords?: string;
 }
diff --git a/src/views/shop/shopDealerApply/components/shopDealerApplyEdit.vue b/src/views/shop/shopDealerApply/components/shopDealerApplyEdit.vue
index 014069e..25da65f 100644
--- a/src/views/shop/shopDealerApply/components/shopDealerApplyEdit.vue
+++ b/src/views/shop/shopDealerApply/components/shopDealerApplyEdit.vue
@@ -28,6 +28,7 @@
             <a-input-number
               :min="1"
               placeholder="请输入用户ID"
+              :disabled="isUpdate"
               v-model:value="form.userId"
               style="width: 100%"
             />
@@ -38,6 +39,7 @@
             <a-input
               placeholder="请输入真实姓名"
               v-model:value="form.realName"
+              :disabled="isUpdate"
             />
           </a-form-item>
         </a-col>
@@ -48,6 +50,7 @@
           <a-form-item label="手机号码" name="mobile">
             <a-input
               placeholder="请输入手机号码"
+              :disabled="isUpdate"
               v-model:value="form.mobile"
             />
           </a-form-item>
@@ -57,6 +60,7 @@
             <a-input-number
               :min="1"
               placeholder="请输入推荐人用户ID"
+              :disabled="isUpdate"
               v-model:value="form.refereeId"
               style="width: 100%"
             />
@@ -64,38 +68,6 @@
         </a-col>
       </a-row>
 
-      <!-- 申请设置 -->
-      <a-divider orientation="left">
-        <span style="color: #1890ff; font-weight: 600;">申请设置</span>
-      </a-divider>
-
-      <a-row :gutter="16">
-        <a-col :span="12">
-          <a-form-item label="申请方式" name="applyType">
-            <a-radio-group v-model:value="form.applyType">
-              <a-radio :value="10">
-                <a-tag color="orange">需要审核</a-tag>
-                <span style="margin-left: 8px;">后台人工审核</span>
-              </a-radio>
-              <a-radio :value="20">
-                <a-tag color="green">免审核</a-tag>
-                <span style="margin-left: 8px;">自动通过</span>
-              </a-radio>
-            </a-radio-group>
-          </a-form-item>
-        </a-col>
-        <a-col :span="12">
-          <a-form-item label="申请时间" name="applyTime">
-            <a-date-picker
-              v-model:value="form.applyTime"
-              show-time
-              placeholder="请选择申请时间"
-              style="width: 100%"
-            />
-          </a-form-item>
-        </a-col>
-      </a-row>
-
       <!-- 审核信息 -->
       <a-divider orientation="left">
         <span style="color: #1890ff; font-weight: 600;">审核信息</span>
@@ -104,7 +76,7 @@
       <a-row :gutter="16">
         <a-col :span="12">
           <a-form-item label="审核状态" name="applyStatus">
-            <a-select v-model:value="form.applyStatus" placeholder="请选择审核状态">
+            <a-select v-model:value="form.applyStatus" placeholder="请选择审核状态" @change="handleStatusChange">
               <a-select-option :value="10">
                 <a-tag color="processing">待审核</a-tag>
                 <span style="margin-left: 8px;">等待审核</span>
@@ -121,10 +93,11 @@
           </a-form-item>
         </a-col>
         <a-col :span="12">
-          <a-form-item label="审核时间" name="auditTime" v-if="form.applyStatus && form.applyStatus !== 10">
+          <a-form-item label="审核时间" name="auditTime" v-if="form.applyStatus === 20 || form.applyStatus === 30">
             <a-date-picker
               v-model:value="form.auditTime"
               show-time
+              format="YYYY-MM-DD HH:mm:ss"
               placeholder="请选择审核时间"
               style="width: 100%"
             />
@@ -132,15 +105,20 @@
         </a-col>
       </a-row>
 
-      <a-form-item label="驳回原因" name="rejectReason" v-if="form.applyStatus === 30">
-        <a-textarea
-          v-model:value="form.rejectReason"
-          placeholder="请输入驳回原因"
-          :rows="3"
-          :maxlength="200"
-          show-count
-        />
-      </a-form-item>
+      <a-row :gutter="16" v-if="form.applyStatus === 30">
+        <a-col :span="24">
+          <a-form-item label="驳回原因" name="rejectReason">
+            <a-textarea
+              v-model:value="form.rejectReason"
+              placeholder="请输入驳回原因"
+              style="width: 100%"
+              :rows="3"
+              :maxlength="200"
+              show-count
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
     </a-form>
   </ele-modal>
 </template>
@@ -257,14 +235,17 @@
     ],
     rejectReason: [
       {
-        validator: (rule: any, value: any) => {
-          if (form.applyStatus === 30 && !value) {
-            return Promise.reject('驳回时必须填写驳回原因');
-          }
-          return Promise.resolve();
-        },
+        required: true,
+        message: '驳回时必须填写驳回原因',
         trigger: 'blur'
       }
+    ],
+    auditTime: [
+      {
+        required: true,
+        message: '审核时请选择审核时间',
+        trigger: 'change'
+      }
     ]
   });
 
@@ -272,25 +253,71 @@
 
   const { resetFields } = useForm(form, rules);
 
+  /* 处理审核状态变化 */
+  const handleStatusChange = (value: number) => {
+    // 当状态改为审核通过或驳回时，自动设置审核时间为当前时间
+    if ((value === 20 || value === 30) && !form.auditTime) {
+      form.auditTime = dayjs();
+    }
+    // 当状态改为待审核时，清空审核时间和驳回原因
+    if (value === 10) {
+      form.auditTime = undefined;
+      form.rejectReason = '';
+    }
+  };
+
   /* 保存编辑 */
   const save = () => {
     if (!formRef.value) {
       return;
     }
+
+    // 动态验证规则
+    const validateFields: string[] = ['userId', 'realName', 'mobile', 'applyStatus'];
+
+    // 如果是驳回状态，需要验证驳回原因
+    if (form.applyStatus === 30) {
+      validateFields.push('rejectReason');
+    }
+
+    // 如果是审核通过或驳回状态，需要验证审核时间
+    if (form.applyStatus === 20 || form.applyStatus === 30) {
+      validateFields.push('auditTime');
+    }
+
     formRef.value
-      .validate()
+      .validate(validateFields)
       .then(() => {
         loading.value = true;
         const formData = {
           ...form
         };
 
-        // 处理时间字段转换
-        if (formData.applyTime && dayjs.isDayjs(formData.applyTime)) {
-          formData.applyTime = formData.applyTime.valueOf();
+        // 处理时间字段转换 - 转换为ISO字符串格式
+        if (formData.applyTime) {
+          if (dayjs.isDayjs(formData.applyTime)) {
+            formData.applyTime = formData.applyTime.format('YYYY-MM-DD HH:mm:ss');
+          } else if (typeof formData.applyTime === 'number') {
+            formData.applyTime = dayjs(formData.applyTime).format('YYYY-MM-DD HH:mm:ss');
+          }
         }
-        if (formData.auditTime && dayjs.isDayjs(formData.auditTime)) {
-          formData.auditTime = formData.auditTime.valueOf();
+
+        if (formData.auditTime) {
+          if (dayjs.isDayjs(formData.auditTime)) {
+            formData.auditTime = formData.auditTime.format('YYYY-MM-DD HH:mm:ss');
+          } else if (typeof formData.auditTime === 'number') {
+            formData.auditTime = dayjs(formData.auditTime).format('YYYY-MM-DD HH:mm:ss');
+          }
+        }
+
+        // 当审核状态为通过或驳回时，确保有审核时间
+        if ((formData.applyStatus === 20 || formData.applyStatus === 30) && !formData.auditTime) {
+          formData.auditTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+        }
+
+        // 当状态为待审核时，清空审核时间
+        if (formData.applyStatus === 10) {
+          formData.auditTime = undefined;
         }
 
         const saveOrUpdate = isUpdate.value ? updateShopDealerApply : addShopDealerApply;
@@ -315,7 +342,7 @@
       if (visible) {
         if (props.data) {
           assignObject(form, props.data);
-          // 处理时间字段
+          // 处理时间字段 - 确保转换为dayjs对象
           if (props.data.applyTime) {
             form.applyTime = dayjs(props.data.applyTime);
           }
diff --git a/src/views/shop/shopDealerApply/index.vue b/src/views/shop/shopDealerApply/index.vue
index e0f92d6..830fa1d 100644
--- a/src/views/shop/shopDealerApply/index.vue
+++ b/src/views/shop/shopDealerApply/index.vue
@@ -117,9 +117,9 @@
   // 表格列配置
   const columns = ref<ColumnItem[]>([
     {
-      title: 'ID',
-      dataIndex: 'applyId',
-      key: 'applyId',
+      title: '用户ID',
+      dataIndex: 'userId',
+      key: 'userId',
       align: 'center',
       width: 80,
       fixed: 'left'
diff --git a/src/views/shop/shopDealerUser/index.vue b/src/views/shop/shopDealerUser/index.vue
index 14d34a0..c970036 100644
--- a/src/views/shop/shopDealerUser/index.vue
+++ b/src/views/shop/shopDealerUser/index.vue
@@ -112,9 +112,9 @@ const datasource: DatasourceFunction = ({
 // 表格列配置
 const columns = ref<ColumnItem[]>([
   {
-    title: 'ID',
-    dataIndex: 'id',
-    key: 'id',
+    title: '用户ID',
+    dataIndex: 'userId',
+    key: 'userId',
     align: 'center',
     width: 80,
     fixed: 'left'
diff --git a/src/views/shop/shopGift/components/makeCard.vue b/src/views/shop/shopGift/components/makeCard.vue
index 962797e..d96256c 100644
--- a/src/views/shop/shopGift/components/makeCard.vue
+++ b/src/views/shop/shopGift/components/makeCard.vue
@@ -22,17 +22,6 @@
       <a-form-item label="礼品卡" name="name">
         <a-input allow-clear placeholder="请输入礼品卡名称" v-model:value="form.name"/>
       </a-form-item>
-      <a-form-item label="关联商品" name="goodsId">
-        <a-select placeholder="请选择关联商品" v-model:value="form.goodsId">
-          <a-select-option
-            v-for="item in goodsList"
-            :key="item.goodsId"
-            :value="item.goodsId"
-          >
-            {{ item.name }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
       <a-form-item label="关联商品" name="goodsId">
         <a-select
           v-model:value="form.goodsId"
diff --git a/src/views/shop/shopGift/components/search.vue b/src/views/shop/shopGift/components/search.vue
index ed2556b..808c12f 100644
--- a/src/views/shop/shopGift/components/search.vue
+++ b/src/views/shop/shopGift/components/search.vue
@@ -13,20 +13,46 @@
       </template>
       <span>批量生成</span>
     </a-button>
-    <a-button class="ele-btn-icon" @click="exportData">
-      <span>导出</span>
-    </a-button>
+    <a-input-search
+      allow-clear
+      v-model:value="where.keywords"
+      placeholder="名称|秘钥|用户ID"
+      style="width: 240px"
+      @search="reload"
+      @pressEnter="reload"
+    />
+    <a-button
+      type="text"
+      :icon="h(QrcodeOutlined)"
+      @click="handleExport"
+      :loading="exportLoading"
+      >导出二维码</a-button
+    >
     <MakeCard v-model:visible="showMultiAdd" @done="done"></MakeCard>
   </a-space>
 </template>
 
 <script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import { watch, ref } from 'vue';
+  import { PlusOutlined, QrcodeOutlined } from '@ant-design/icons-vue';
+  import { watch, ref, h } from 'vue';
   import {ShopGift, ShopGiftParam} from "@/api/shop/shopGift/model";
   import MakeCard from "@/views/shop/shopGift/components/makeCard.vue";
-  import {exportShopGift} from "@/api/shop/shopGift";
+  import {listShopGift} from "@/api/shop/shopGift";
   import {message} from "ant-design-vue";
+  import {
+    Document,
+    Packer,
+    Paragraph,
+    ImageRun,
+    AlignmentType,
+    Table,
+    TableRow,
+    TableCell,
+    WidthType
+  } from 'docx';
+  import { saveAs } from 'file-saver';
+  import QRCode from 'qrcode';
+  import useSearch from "@/utils/use-search";
 
   const props = withDefaults(
     defineProps<{
@@ -44,9 +70,18 @@
     (e: 'done'): void;
   }>();
 
+  // 表单数据
+  const { where } = useSearch<ShopGiftParam>({
+    keywords: ''
+  });
+
   // 新增
-  const add = () => {
-    emit('add');
+  // const add = () => {
+  //   emit('add');
+  // };
+
+  const reload = () => {
+    emit('search', {...where});
   };
 
  const done = () => {
@@ -54,22 +89,336 @@
   };
 
   const showMultiAdd = ref(false)
+  const exportLoading = ref(false);
+
   const openMultiAdd = () => {
     showMultiAdd.value = true
   };
 
-  const exportData = async () => {
-    const hide = message.loading('请求中..', 0);
-    const ids = []
-    if (props.selection && props.selection.length) {
-      props.selection.forEach(d => {
-        ids.push(d.id)
-      })
+  // 批量导出二维码到Word文档
+  const handleExport = async () => {
+    try {
+      exportLoading.value = true;
+      message.loading('正在生成二维码文档，请稍候...', 0);
+
+      // 获取所有礼品卡数据
+      let giftList: ShopGift[] = [];
+      if (props.selection && props.selection.length > 0) {
+        // 如果有选中的数据，只导出选中的
+        giftList = props.selection;
+      } else {
+        // 如果没有选中，导出所有数据
+        giftList = await listShopGift();
+      }
+
+      if (!giftList || giftList.length === 0) {
+        message.error('没有礼品卡数据可导出');
+        return;
+      }
+
+      // 生成二维码图片
+      const qrCodeImages: { dataUrl: string; giftInfo: ShopGift }[] = [];
+
+      for (const gift of giftList) {
+        try {
+          // 生成二维码（使用礼品卡code作为内容）
+          const qrCodeDataUrl = await QRCode.toDataURL(String(gift.code), {
+            width: 200,
+            margin: 2,
+            color: {
+              dark: '#000000',
+              light: '#FFFFFF'
+            }
+          });
+
+          qrCodeImages.push({ dataUrl: qrCodeDataUrl, giftInfo: gift });
+        } catch (error) {
+          console.error(`生成礼品卡 ${gift.code} 的二维码失败:`, error);
+        }
+      }
+
+      if (qrCodeImages.length === 0) {
+        message.error('二维码生成失败');
+        return;
+      }
+
+      // 尝试创建Word文档，如果失败则使用HTML方式
+      try {
+        await createWordDocument(qrCodeImages);
+        message.destroy();
+        message.success(`成功导出 ${qrCodeImages.length} 个礼品卡二维码`);
+      } catch (docError) {
+        console.warn('Word文档生成失败，使用HTML方式:', docError);
+        createHtmlDocument(qrCodeImages);
+        message.destroy();
+        message.success(
+          `成功生成 ${qrCodeImages.length} 个礼品卡二维码（HTML格式，可直接打印）`
+        );
+      }
+    } catch (error) {
+      console.error('导出失败:', error);
+      message.destroy();
+      message.error('导出失败，请重试');
+    } finally {
+      exportLoading.value = false;
     }
-    const res = await exportShopGift(ids);
-    window.open(res.url);
-    hide();
-  }
+  };
+
+  // 创建Word文档
+  const createWordDocument = async (
+    qrCodeImages: { dataUrl: string; giftInfo: ShopGift }[]
+  ) => {
+    const children: (Paragraph | Table)[] = [];
+
+    // 添加标题
+    children.push(
+      new Paragraph({
+        text: '礼品卡二维码清单',
+        alignment: AlignmentType.CENTER,
+        spacing: { after: 400 }
+      })
+    );
+
+    // 每行放置3个二维码，保持适当间距
+    const itemsPerRow = 3;
+    const rows = Math.ceil(qrCodeImages.length / itemsPerRow);
+
+    for (let row = 0; row < rows; row++) {
+      const startIndex = row * itemsPerRow;
+      const endIndex = Math.min(startIndex + itemsPerRow, qrCodeImages.length);
+      const rowItems = qrCodeImages.slice(startIndex, endIndex);
+
+      // 创建表格行来放置二维码
+      const qrCodeCells: TableCell[] = [];
+      const infoCells: TableCell[] = [];
+
+      for (let i = 0; i < itemsPerRow; i++) {
+        if (i < rowItems.length) {
+          const item = rowItems[i];
+
+          // 将DataURL转换为Buffer
+          const base64Data = item.dataUrl.split(',')[1];
+          const binaryData = atob(base64Data);
+          const bytes = new Uint8Array(binaryData.length);
+          for (let j = 0; j < binaryData.length; j++) {
+            bytes[j] = binaryData.charCodeAt(j);
+          }
+
+          qrCodeCells.push(
+            new TableCell({
+              children: [
+                new Paragraph({
+                  children: [
+                    // @ts-ignore
+                    new ImageRun({
+                      data: bytes,
+                      transformation: {
+                        width: 150,
+                        height: 150
+                      }
+                    })
+                  ],
+                  alignment: AlignmentType.CENTER
+                })
+              ],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+
+          infoCells.push(
+            new TableCell({
+              children: [
+                new Paragraph({
+                  text: `${item.giftInfo.code || '未设置'}`,
+                  alignment: AlignmentType.CENTER
+                }),
+                new Paragraph({
+                  text: `${item.giftInfo.name || ''}`,
+                  alignment: AlignmentType.CENTER
+                })
+              ],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+        } else {
+          // 空单元格
+          qrCodeCells.push(
+            new TableCell({
+              children: [new Paragraph({ text: '' })],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+          infoCells.push(
+            new TableCell({
+              children: [new Paragraph({ text: '' })],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+        }
+      }
+
+      // 添加表格
+      children.push(
+        new Table({
+          rows: [
+            new TableRow({
+              children: qrCodeCells
+            }),
+            new TableRow({
+              children: infoCells
+            })
+          ],
+          width: { size: 100, type: WidthType.PERCENTAGE }
+        })
+      );
+
+      // 添加行间距
+      children.push(
+        new Paragraph({
+          text: '',
+          spacing: { after: 400 }
+        })
+      );
+    }
+
+    // 创建文档
+    const doc = new Document({
+      sections: [
+        {
+          properties: {
+            page: {
+              size: {
+                orientation: 'portrait',
+                width: 11906, // A4宽度 (210mm)
+                height: 16838 // A4高度 (297mm)
+              },
+              margin: {
+                top: 1134, // 2cm
+                right: 1134, // 2cm
+                bottom: 1134, // 2cm
+                left: 1134 // 2cm
+              }
+            }
+          },
+          children
+        }
+      ]
+    });
+
+    // 生成并下载文档
+    try {
+      const buffer = await Packer.toBlob(doc);
+      const fileName = `礼品卡二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.docx`;
+      saveAs(buffer, fileName);
+    } catch (error) {
+      console.error('文档生成失败:', error);
+      // 如果Packer.toBlob失败，尝试使用toBuffer
+      const buffer = await Packer.toBuffer(doc);
+      const blob = new Blob([buffer], {
+        type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+      });
+      const fileName = `礼品卡二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.docx`;
+      saveAs(blob, fileName);
+    }
+  };
+
+  // 创建HTML文档（备用方案）
+  const createHtmlDocument = (
+    qrCodeImages: { dataUrl: string; giftInfo: ShopGift }[]
+  ) => {
+    const itemsPerRow = 3;
+    let htmlContent = `
+      <!DOCTYPE html>
+      <html>
+      <head>
+        <meta charset="UTF-8">
+        <title>礼品卡二维码清单</title>
+        <style>
+          @page {
+            size: A4;
+            margin: 2cm;
+          }
+          body {
+            font-family: Arial, sans-serif;
+            margin: 0;
+            padding: 0;
+          }
+          .title {
+            text-align: center;
+            font-size: 24px;
+            font-weight: bold;
+            margin-bottom: 30px;
+          }
+          .qr-grid {
+            display: grid;
+            grid-template-columns: repeat(${itemsPerRow}, 1fr);
+            gap: 20px;
+            margin-bottom: 30px;
+          }
+          .qr-item {
+            text-align: center;
+            page-break-inside: avoid;
+          }
+          .qr-code {
+            width: 150px;
+            height: 150px;
+            margin: 0 auto 10px;
+          }
+          .qr-info {
+            font-size: 12px;
+            line-height: 1.4;
+          }
+          @media print {
+            .no-print { display: none; }
+          }
+        </style>
+      </head>
+      <body>
+        <div class="title">礼品卡二维码清单</div>
+        <div class="qr-grid">
+    `;
+
+    qrCodeImages.forEach((item) => {
+      htmlContent += `
+        <div class="qr-item">
+          <img src="${item.dataUrl}" alt="QR Code" class="qr-code">
+          <div class="qr-info">
+            <div>礼品卡编号: ${item.giftInfo.code || '未设置'}</div>
+            <div>礼品卡名称: ${item.giftInfo.name || ''}</div>
+            <div>ID: ${item.giftInfo.id}</div>
+          </div>
+        </div>
+      `;
+    });
+
+    htmlContent += `
+        </div>
+        <div class="no-print" style="text-align: center; margin-top: 30px;">
+          <button onclick="window.print()" style="padding: 10px 20px; font-size: 16px;">打印文档</button>
+          <button onclick="window.close()" style="padding: 10px 20px; font-size: 16px; margin-left: 10px;">关闭</button>
+        </div>
+      </body>
+      </html>
+    `;
+
+    // 在新窗口中打开HTML文档
+    const newWindow = window.open('', '_blank');
+    if (newWindow) {
+      newWindow.document.write(htmlContent);
+      newWindow.document.close();
+    } else {
+      // 如果弹窗被阻止，创建下载链接
+      const blob = new Blob([htmlContent], { type: 'text/html;charset=utf-8' });
+      const fileName = `礼品卡二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.html`;
+      saveAs(blob, fileName);
+    }
+  };
 
   watch(
     () => props.selection,