From 619fcdfaf73d43033f4760b22bb61fcf70abed3d Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Thu, 23 Oct 2025 11:22:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(contact):=E4=BF=AE=E5=A4=8D=E5=9B=BD?=
 =?UTF-8?q?=E5=AE=B6=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=8F=8A=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=8D=A0=E4=BD=8D=E7=AC=A6=E9=97=AE=E9=A2=98-=20?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9B=BD=E5=AE=B6=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E7=9A=84=20placeholder=20=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=BA=E2=80=9C=E5=AE=B6=E5=B1=85=E2=80=9D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98-=20=E6=9B=B4=E6=96=B0=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=AC=A1=E6=95=B0=E6=A0=87=E7=AD=BE=E4=B8=BA=E2=80=9C?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=AC=A1=E6=95=B0=E2=80=9D=20-=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8A=E6=AC=A1=E5=8F=91=E9=82=AE=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=87=E7=AD=BE=E4=B8=BA=E2=80=9C=E5=8F=91=E9=82=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E2=80=9D=20-=20=E7=A7=BB=E9=99=A4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=9A=84=E6=98=BE=E9=9A=90?=
 =?UTF-8?q?=E5=88=97=E6=8E=A7=E5=88=B6=20div=20=E5=85=83=E7=B4=A0=20-=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E4=B8=8E?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E4=B9=8B=E9=97=B4=E7=9A=84=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E9=97=AE=E9=A2=98=20-=20=E7=BB=9F=E4=B8=80=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E7=8A=B6=E6=80=81=E5=90=8D=E7=A7=B0=E5=88=97=E4=B8=BA?=
 =?UTF-8?q?=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA=20-=20=E6=9B=B4=E6=AD=A3?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=92=8C=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E9=A2=84=E8=A7=88=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84?=
 =?UTF-8?q?=20visible=20=E5=B1=9E=E6=80=A7=E4=B8=BA=20v-model=20=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sale/article/components/ArticlePreview.vue |  2 +-
 gear-ui3/src/views/sale/contact/index.vue      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gear-ui3/src/views/sale/article/components/ArticlePreview.vue b/gear-ui3/src/views/sale/article/components/ArticlePreview.vue
index c27428d..f1f1cf9 100644
--- a/gear-ui3/src/views/sale/article/components/ArticlePreview.vue
+++ b/gear-ui3/src/views/sale/article/components/ArticlePreview.vue
@@ -7,7 +7,7 @@
         <div class="meta-info">
           <span class="category">
             <i class="el-icon-folder"></i>
-            {{ article.category.categoryName || '未分类' }}
+            {{ article.category?.categoryName || '未分类' }}
           </span>
           <span class="create-time">
             <i class="el-icon-time"></i>
diff --git a/gear-ui3/src/views/sale/contact/index.vue b/gear-ui3/src/views/sale/contact/index.vue
index 76c270b..0398c57 100644
--- a/gear-ui3/src/views/sale/contact/index.vue
+++ b/gear-ui3/src/views/sale/contact/index.vue
@@ -12,7 +12,7 @@
       <el-form-item v-if="columnVisibility.state" label="国家" prop="state">
         <el-input
           v-model="queryParams.state"
-          placeholder="请输入家居"
+          placeholder="请输入国家"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -81,7 +81,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="columnVisibility.emailSendCount" label="发送邮件次数" prop="emailSendCount">
+      <el-form-item v-if="columnVisibility.emailSendCount" label="发送次数" prop="emailSendCount">
         <el-input
           v-model="queryParams.emailSendCount"
           placeholder="请输入发送邮件次数"
@@ -89,7 +89,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item v-if="columnVisibility.lastEmailSendTime" label="上次发邮件时间" prop="lastEmailSendTime">
+      <el-form-item v-if="columnVisibility.lastEmailSendTime" label="发邮时间" prop="lastEmailSendTime">
         <el-date-picker clearable
           v-model="queryParams.lastEmailSendTime"
           type="date"
@@ -178,7 +178,7 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      <div style="float: right; margin-left: 10px;">
+<!--      <div style="float: right; margin-left: 10px;">
         <el-dropdown trigger="click" :hide-on-click="false" style="margin-left: 10px;">
           <el-tooltip class="item" effect="dark" content="显隐列" placement="top">
             <el-button size="mini" circle icon="el-icon-menu" />
@@ -189,12 +189,12 @@
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-      </div>
+      </div>-->
     </el-row>
 
     <el-table v-loading="loading" :data="furnitureTableList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column v-if="columnVisibility.companyName" label="公司名称" align="center" prop="companyName" />
+      <el-table-column label="公司名称" align="center" prop="companyName" />
       <el-table-column v-if="columnVisibility.state" label="国家" align="center" prop="state" />
       <el-table-column v-if="columnVisibility.procurementOfProducts" label="采购产品" align="center" prop="procurementOfProducts" />
       <el-table-column v-if="columnVisibility.contactGroup" label="联系人分组" align="center" prop="contactGroup" />
@@ -269,7 +269,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="国家" prop="state">
-              <el-input v-model="form.state" placeholder="请输入家居" />
+              <el-input v-model="form.state" placeholder="请输入国家" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -343,12 +343,12 @@
     </el-dialog>
 
     <!-- 发送邮件对话框 -->
-    <el-dialog :title="sendEmailTitle" :visible.sync="sendEmailOpen" width="80%" append-to-body>
+    <el-dialog :title="sendEmailTitle" v-model="sendEmailOpen" width="80%" append-to-body>
 
       <!-- 模板预览对话框 -->
       <el-dialog
         title="邮件模板预览"
-        :visible.sync="templatePreviewOpen"
+        v-model="templatePreviewOpen"
         width="70%"
         append-to-body
         :close-on-click-modal="false"