fix(contact):修复国家字段显示及表单占位符问题- 修正国家输入框的 placeholder 错误显示为“家居”的问题- 更新邮件发送次数标签为“发送次数”

- 修改上次发邮件时间标签为“发邮时间”
- 移除页面中多余的显隐列控制 div 元素
- 修复导出按钮与工具栏之间的布局问题
- 统一公司状态名称列为始终显示
- 更正邮件对话框和模板预览对话框的 visible 属性为 v-model 绑定方式

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>

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"