Преглед на файлове

调整部分新增按钮的文案和样式

lihaiting преди 1 седмица
родител
ревизия
e00f32e00a

+ 68 - 89
src/views/hrManagement/employeeTemplate/offerLetterTemplate/index.vue

@@ -1,48 +1,23 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" class="offer-template-page">
-      <el-form
-        label-width="80px"
-        class="ele-form-search"
-        @keyup.enter.native="applyFilters"
-        @submit.native.prevent
-      >
+      <el-form label-width="80px" class="ele-form-search" @keyup.enter.native="applyFilters" @submit.native.prevent>
         <el-row :gutter="15">
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="模板名称">
-              <el-input
-                v-model.trim="draftFilters.keyword"
-                clearable
-                placeholder="请输入"
-              />
+              <el-input v-model.trim="draftFilters.keyword" clearable placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="适用法人">
-              <el-select
-                v-model="draftFilters.legalId"
-                clearable
-                filterable
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in legalEntities"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
+              <el-select v-model="draftFilters.legalId" clearable filterable placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in legalEntities" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="模板状态">
-              <el-select
-                v-model="draftFilters.status"
-                clearable
-                placeholder="请选择"
-                style="width: 100%"
-              >
+              <el-select v-model="draftFilters.status" clearable placeholder="请选择" style="width: 100%">
                 <el-option label="启用" :value="1" />
                 <el-option label="停用" :value="0" />
               </el-select>
@@ -50,20 +25,10 @@
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <div class="ele-form-actions">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                class="ele-btn-icon"
-                @click="applyFilters"
-              >
+              <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="applyFilters">
                 查询
               </el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                class="ele-btn-icon"
-                @click="resetFilters"
-              >
+              <el-button type="primary" icon="el-icon-refresh" class="ele-btn-icon" @click="resetFilters">
                 重置
               </el-button>
             </div>
@@ -71,25 +36,11 @@
         </el-row>
       </el-form>
 
-      <ele-pro-table
-        ref="table"
-        row-key="id"
-        :columns="columns"
-        :datasource="filteredRecords"
-        :need-page="true"
-        :page-size="20"
-        :cache-key="cacheKeyUrl"
-        stripe
-        class="offer-template-table"
-      >
+      <ele-pro-table ref="table" row-key="id" :columns="columns" :datasource="filteredRecords" :need-page="true"
+        :page-size="20" :cache-key="cacheKeyUrl" stripe class="offer-template-table">
         <template v-slot:toolbar>
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            class="ele-btn-icon"
-            @click="openCreate"
-          >
-            新增模板
+          <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openCreate">
+            新增
           </el-button>
         </template>
         <template v-slot:name="{ row }">
@@ -112,12 +63,8 @@
           <el-link type="primary" :underline="false" icon="el-icon-search" @click.stop="openPreview(row)">
             预览
           </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            :icon="row.status === 1 ? 'el-icon-close' : 'el-icon-check'"
-            @click.stop="toggleStatus(row)"
-          >
+          <el-link type="primary" :underline="false" :icon="row.status === 1 ? 'el-icon-close' : 'el-icon-check'"
+            @click.stop="toggleStatus(row)">
             {{ row.status === 1 ? "停用" : "启用" }}
           </el-link>
           <el-link type="danger" :underline="false" icon="el-icon-delete" @click.stop="remove(row)">
@@ -134,7 +81,8 @@
     <offer-template-editor :visible.sync="editorVisible" :template="editing" @save="saveTemplate" />
 
     <!-- 模板详情 -->
-    <el-drawer :visible.sync="detailVisible" direction="rtl" :size="drawerSize" custom-class="offer-detail-drawer" append-to-body :before-close="closeDetail">
+    <el-drawer :visible.sync="detailVisible" direction="rtl" :size="drawerSize" custom-class="offer-detail-drawer"
+      append-to-body :before-close="closeDetail">
       <template slot="title">
         <div class="drawer-title">
           <span><i class="el-icon-document"></i></span>
@@ -149,13 +97,18 @@
           <span>版本 {{ detailForm.version }}</span>
           <div>
             <h3>{{ detailForm.name }}</h3>
-            <p>{{ detailForm.code }} · {{ detailForm.legal || legalName(detailForm.legalId) }} · {{ detailForm.status === 1 ? "已启用" : "已停用" }}</p>
+            <p>{{ detailForm.code }} · {{ detailForm.legal || legalName(detailForm.legalId) }} · {{ detailForm.status
+              === 1
+              ? "已启用" : "已停用" }}</p>
           </div>
         </section>
         <section class="detail-section">
           <div class="detail-heading">
             <span><i class="el-icon-document"></i></span>
-            <div><h3>模板信息</h3><p>模板编码、适用法人、版本与备注</p></div>
+            <div>
+              <h3>模板信息</h3>
+              <p>模板编码、适用法人、版本与备注</p>
+            </div>
           </div>
           <div class="detail-grid">
             <div><span>模板编码</span><strong>{{ detailForm.code }}</strong></div>
@@ -166,10 +119,12 @@
             <div><span>更新时间</span><strong>{{ detailForm.updatedAt || "-" }}</strong></div>
           </div>
           <div class="detail-block">
-            <span>备注</span><p>{{ detailForm.remark || "暂无备注" }}</p>
+            <span>备注</span>
+            <p>{{ detailForm.remark || "暂无备注" }}</p>
           </div>
           <div class="detail-block">
-            <span>组件数量</span><p>{{ (detailForm.blocks || []).length }} 个(含 {{ variableCount(detailForm.blocks) }} 个动态变量)</p>
+            <span>组件数量</span>
+            <p>{{ (detailForm.blocks || []).length }} 个(含 {{ variableCount(detailForm.blocks) }} 个动态变量)</p>
           </div>
         </section>
       </div>
@@ -183,21 +138,22 @@
     </el-drawer>
 
     <!-- 预览打印弹窗(模拟真实业务数据) -->
-    <el-dialog
-      title="Offer 模板预览"
-      :visible.sync="previewVisible"
-      width="860px"
-      custom-class="offer-preview-dialog"
-      append-to-body
-      :close-on-click-modal="false"
-    >
+    <el-dialog title="Offer 模板预览" :visible.sync="previewVisible" width="860px" custom-class="offer-preview-dialog"
+      append-to-body :close-on-click-modal="false">
       <div class="offer-paper">
         <div v-for="block in previewBlocks" :key="block.id" class="preview-block">
-          <component v-if="block.type === 'heading'" :is="block.props.size || 'h2'" class="render-heading" :class="renderClass(block)">{{ resolveText(block) }}</component>
+          <component v-if="block.type === 'heading'" :is="block.props.size || 'h2'" class="render-heading"
+            :class="renderClass(block)">{{ resolveText(block) }}</component>
           <div v-else-if="block.type === 'bullet'">
-            <p v-if="bulletLines(block)[0]" class="render-p" :class="renderClass(block)">{{ resolveText({ ...block, content: bulletLines(block)[0] }) }}</p>
+            <p v-if="bulletLines(block)[0]" class="render-p" :class="renderClass(block)">{{ resolveText({
+              ...block,
+              content:
+              bulletLines(block)[0] }) }}</p>
             <ul v-if="bulletLines(block).length > 1" class="render-ul" :class="renderClass(block)">
-              <li v-for="(line, li) in bulletLines(block).slice(1)" :key="li">{{ resolveText({ ...block, content: line }) }}</li>
+              <li v-for="(line, li) in bulletLines(block).slice(1)" :key="li">{{ resolveText({
+                ...block, content: line
+                }) }}
+              </li>
             </ul>
           </div>
           <hr v-else-if="block.type === 'divider'" class="render-divider" />
@@ -403,7 +359,7 @@ export default {
           this.persist();
           this.$message.success("模板已删除");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // ===== 详情 / 预览 =====
     openDetail(row) {
@@ -446,13 +402,36 @@ export default {
 <style lang="scss">
 /* 打印 Offer 纸面:仅输出列表页预览弹窗中的 .offer-paper */
 @media print {
-  body * { visibility: hidden !important; }
-  .offer-preview-dialog .el-dialog__wrapper { position: static !important; overflow: visible !important; height: auto !important; }
-  .offer-preview-dialog .el-dialog { position: static !important; box-shadow: none !important; width: 100% !important; margin: 0 !important; }
+  body * {
+    visibility: hidden !important;
+  }
+
+  .offer-preview-dialog .el-dialog__wrapper {
+    position: static !important;
+    overflow: visible !important;
+    height: auto !important;
+  }
+
+  .offer-preview-dialog .el-dialog {
+    position: static !important;
+    box-shadow: none !important;
+    width: 100% !important;
+    margin: 0 !important;
+  }
+
   .offer-preview-dialog .el-dialog__header,
-  .offer-preview-dialog .preview-toolbar { display: none !important; }
+  .offer-preview-dialog .preview-toolbar {
+    display: none !important;
+  }
+
   .offer-preview-dialog .offer-paper,
-  .offer-preview-dialog .offer-paper * { visibility: visible !important; }
-  .offer-preview-dialog .offer-paper { border: none; padding: 0; }
+  .offer-preview-dialog .offer-paper * {
+    visibility: visible !important;
+  }
+
+  .offer-preview-dialog .offer-paper {
+    border: none;
+    padding: 0;
+  }
 }
 </style>

+ 1 - 1
src/views/hrManagement/employeeTemplate/onboardingContractTemplate/index.vue

@@ -39,7 +39,7 @@
         :page-size="20" :cache-key="cacheKey" stripe>
         <template v-slot:toolbar>
           <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openCreate">
-            新增模板
+            新增
           </el-button>
         </template>
         <template v-slot:name="{ row }">

+ 53 - 175
src/views/hrManagement/employeeTemplate/regularizationTemplate/index.vue

@@ -1,47 +1,23 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" class="template-page">
-      <el-form
-        label-width="80px"
-        class="ele-form-search"
-        @keyup.enter.native="apply"
-        @submit.native.prevent
-      >
+      <el-form label-width="80px" class="ele-form-search" @keyup.enter.native="apply" @submit.native.prevent>
         <el-row :gutter="15">
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="模板名称">
-              <el-input
-                v-model.trim="filters.keyword"
-                clearable
-                placeholder="请输入"
-              />
+              <el-input v-model.trim="filters.keyword" clearable placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="模板类型">
-              <el-select
-                v-model="filters.type"
-                clearable
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in types"
-                  :key="item"
-                  :label="item"
-                  :value="item"
-                />
+              <el-select v-model="filters.type" clearable placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in types" :key="item" :label="item" :value="item" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="状态">
-              <el-select
-                v-model="filters.status"
-                clearable
-                placeholder="请选择"
-                style="width: 100%"
-              >
+              <el-select v-model="filters.status" clearable placeholder="请选择" style="width: 100%">
                 <el-option label="已启用" value="已启用" />
                 <el-option label="已停用" value="已停用" />
               </el-select>
@@ -49,59 +25,27 @@
           </el-col>
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <div class="ele-form-actions">
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                class="ele-btn-icon"
-                @click="apply"
-              >
+              <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="apply">
                 查询
               </el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                class="ele-btn-icon"
-                @click="reset"
-              >
+              <el-button type="primary" icon="el-icon-refresh" class="ele-btn-icon" @click="reset">
                 重置
               </el-button>
             </div>
           </el-col>
         </el-row>
       </el-form>
-      <ele-pro-table
-        row-key="id"
-        :columns="columns"
-        :datasource="filteredTemplates"
-        :need-page="true"
-        :page-size="20"
-        :cache-key="cacheKey"
-        stripe
-        class="template-table"
-        @selection-change="selectedRows = $event"
-      >
+      <ele-pro-table row-key="id" :columns="columns" :datasource="filteredTemplates" :need-page="true" :page-size="20"
+        :cache-key="cacheKey" stripe class="template-table" @selection-change="selectedRows = $event">
         <template v-slot:toolbar>
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            class="ele-btn-icon"
-            @click="openCreate"
-          >
-            新增模板
+          <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openCreate">
+            新增
           </el-button>
-          <el-button
-            icon="el-icon-document-copy"
-            class="ele-btn-icon"
-            :disabled="selectedRows.length !== 1"
-            @click="copyTemplate(selectedRows[0])"
-          >
+          <el-button icon="el-icon-document-copy" class="ele-btn-icon" :disabled="selectedRows.length !== 1"
+            @click="copyTemplate(selectedRows[0])">
             复制
           </el-button>
-          <el-button
-            icon="el-icon-download"
-            class="ele-btn-icon"
-            @click="exportTemplates"
-          >
+          <el-button icon="el-icon-download" class="ele-btn-icon" @click="exportTemplates">
             导出
           </el-button>
         </template>
@@ -133,20 +77,10 @@
           </div>
         </template>
         <template v-slot:action="{ row }">
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-view"
-            @click.stop="openEdit(row, true)"
-          >
+          <el-link type="primary" :underline="false" icon="el-icon-view" @click.stop="openEdit(row, true)">
             预览
           </el-link>
-          <el-link
-            type="primary"
-            :underline="false"
-            icon="el-icon-edit"
-            @click.stop="openEdit(row, false)"
-          >
+          <el-link type="primary" :underline="false" icon="el-icon-edit" @click.stop="openEdit(row, false)">
             编辑
           </el-link>
           <el-dropdown trigger="click" @command="handleCommand($event, row)">
@@ -158,9 +92,7 @@
               <el-dropdown-item command="toggle">{{
                 row.status === "已启用" ? "停用模板" : "启用模板"
               }}</el-dropdown-item>
-              <el-dropdown-item command="delete" :disabled="row.usedCount > 0"
-                >删除模板</el-dropdown-item
-              >
+              <el-dropdown-item command="delete" :disabled="row.usedCount > 0">删除模板</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -169,34 +101,22 @@
         </template>
       </ele-pro-table>
     </el-card>
-    <el-drawer
-      :visible.sync="drawerVisible"
-      direction="rtl"
-      :size="drawerSize"
-      append-to-body
-      custom-class="template-drawer"
-      ><template slot="title"
-        ><div class="drawer-title">
-          <span
-            ><i :class="readOnly ? 'el-icon-view' : 'el-icon-edit-outline'"></i
-          ></span>
+    <el-drawer :visible.sync="drawerVisible" direction="rtl" :size="drawerSize" append-to-body
+      custom-class="template-drawer"><template slot="title">
+        <div class="drawer-title">
+          <span><i :class="readOnly ? 'el-icon-view' : 'el-icon-edit-outline'"></i></span>
           <div>
             <h2>
               {{ readOnly ? "模板预览" : editing.id ? "编辑模板" : "新增模板" }}
             </h2>
             <p>{{ editing.name || "完善模板基本信息与字段" }}</p>
           </div>
-        </div></template
-      >
+        </div>
+      </template>
       <div class="drawer-body">
-        <el-form
-          ref="templateForm"
-          :model="editing"
-          :rules="rules"
-          label-position="top"
-          :disabled="readOnly"
-          class="template-form"
-          ><section class="form-section">
+        <el-form ref="templateForm" :model="editing" :rules="rules" label-position="top" :disabled="readOnly"
+          class="template-form">
+          <section class="form-section">
             <header>
               <span><i class="el-icon-document"></i></span>
               <div>
@@ -205,23 +125,13 @@
               </div>
             </header>
             <div class="form-grid">
-              <el-form-item label="模板名称" prop="name"
-                ><el-input v-model.trim="editing.name" /></el-form-item
-              ><el-form-item label="模板类型" prop="type"
-                ><el-select v-model="editing.type"
-                  ><el-option
-                    v-for="item in types"
-                    :key="item"
-                    :label="item"
-                    :value="item" /></el-select
-              ></el-form-item>
+              <el-form-item label="模板名称" prop="name"><el-input
+                  v-model.trim="editing.name" /></el-form-item><el-form-item label="模板类型" prop="type"><el-select
+                  v-model="editing.type"><el-option v-for="item in types" :key="item" :label="item"
+                    :value="item" /></el-select></el-form-item>
             </div>
-            <el-form-item label="模板说明"
-              ><el-input
-                v-model.trim="editing.description"
-                type="textarea"
-                :rows="3"
-            /></el-form-item>
+            <el-form-item label="模板说明"><el-input v-model.trim="editing.description" type="textarea"
+                :rows="3" /></el-form-item>
           </section>
           <section class="form-section">
             <header>
@@ -230,43 +140,23 @@
                 <h3>字段配置</h3>
                 <p>设置字段类型与是否必填</p>
               </div>
-              <div class="field-header-stats"><span>{{ editing.fields.length }} 个字段</span><b>{{ requiredCount(editing) }} 个必填</b></div>
-              <el-button
-                v-if="!readOnly"
-                size="small"
-                type="primary"
-                plain
-                @click="addField"
-                >添加字段</el-button
-              >
+              <div class="field-header-stats"><span>{{ editing.fields.length }} 个字段</span><b>{{ requiredCount(editing)
+                  }}
+                  个必填</b></div>
+              <el-button v-if="!readOnly" size="small" type="primary" plain @click="addField">添加字段</el-button>
             </header>
             <div class="field-list">
-              <div
-                v-for="(field, index) in editing.fields"
-                :key="field.id + index"
-                class="field-row"
-              >
+              <div v-for="(field, index) in editing.fields" :key="field.id + index" class="field-row">
                 <span class="field-drag"><i class="el-icon-rank"></i></span>
                 <span class="field-index">{{ index + 1 }}</span>
                 <div class="field-main">
                   <el-input v-model.trim="field.label" size="small" placeholder="请输入字段名称" maxlength="30" />
                   <small><i class="el-icon-info"></i>{{ field.placeholder || `请输入${field.label || '字段内容'}` }}</small>
                 </div>
-                <el-select v-model="field.type" size="small" class="field-type"
-                  ><el-option
-                    v-for="item in fieldTypes"
-                    :key="item"
-                    :label="item"
-                    :value="item" /></el-select
-                ><el-switch
-                  v-model="field.required"
-                  active-text="必填"
-                /><el-button
-                  v-if="!readOnly"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="removeField(index)"
-                />
+                <el-select v-model="field.type" size="small" class="field-type"><el-option v-for="item in fieldTypes"
+                    :key="item" :label="item" :value="item" /></el-select><el-switch v-model="field.required"
+                  active-text="必填" /><el-button v-if="!readOnly" type="text" icon="el-icon-delete"
+                  @click="removeField(index)" />
               </div>
             </div>
           </section>
@@ -283,31 +173,23 @@
                 转正审批表<small>{{ editing.name || "未命名模板" }}</small>
               </div>
               <div class="preview-grid">
-                <div
-                  v-for="field in editing.fields"
-                  :key="field.id"
-                  class="preview-field"
-                >
+                <div v-for="field in editing.fields" :key="field.id" class="preview-field">
                   <label><i v-if="field.required">*</i>{{ field.label }}</label>
                   <div class="preview-input">{{ field.placeholder }}</div>
                 </div>
               </div>
             </div>
-          </section></el-form
-        >
+          </section>
+        </el-form>
       </div>
       <div class="drawer-footer">
         <div>
-          <el-button @click="drawerVisible = false">关闭</el-button
-          ><el-button v-if="readOnly" type="primary" @click="readOnly = false"
-            >编辑</el-button
-          ><el-button v-if="!readOnly" @click="save">保存</el-button
-          ><el-button v-if="!readOnly" type="primary" @click="saveAndEnable"
-            >保存并启用</el-button
-          >
+          <el-button @click="drawerVisible = false">关闭</el-button><el-button v-if="readOnly" type="primary"
+            @click="readOnly = false">编辑</el-button><el-button v-if="!readOnly" @click="save">保存</el-button><el-button
+            v-if="!readOnly" type="primary" @click="saveAndEnable">保存并启用</el-button>
         </div>
-      </div></el-drawer
-    >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -390,9 +272,9 @@ export default {
           label: "平均字段数",
           value: this.templates.length
             ? Math.round(
-                this.templates.reduce((s, x) => s + x.fields.length, 0) /
-                  this.templates.length,
-              )
+              this.templates.reduce((s, x) => s + x.fields.length, 0) /
+              this.templates.length,
+            )
             : 0,
           note: "保持申请信息完整",
           icon: "el-icon-s-operation",
@@ -553,8 +435,4 @@ export default {
   },
 };
 </script>
-<style
-  src="../../../../styles/views/regularizationTemplate/index.scss"
-  scoped
-  lang="scss"
-></style>
+<style src="../../../../styles/views/regularizationTemplate/index.scss" scoped lang="scss"></style>

+ 1 - 1
src/views/hrManagement/employeeTemplate/resignationLetter/index.vue

@@ -39,7 +39,7 @@
         class="letter-table" @selection-change="selectedRows = $event">
         <template v-slot:toolbar>
           <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openCreate">
-            新增模板
+            新增
           </el-button>
           <el-button icon="el-icon-document-copy" class="ele-btn-icon" :disabled="selectedRows.length !== 1"
             @click="copyTemplate">

+ 1 - 1
src/views/performanceScheme/index.vue

@@ -40,6 +40,7 @@
             <div class="ele-form-actions">
               <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="applyFilters">查询</el-button>
               <el-button type="primary" icon="el-icon-refresh" class="ele-btn-icon" @click="resetFilters">重置</el-button>
+              <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="createScheme">新增方案</el-button>
             </div>
           </el-col>
         </el-row>
@@ -48,7 +49,6 @@
       <ele-pro-table ref="table" row-key="id" :columns="columns" :datasource="filteredSchemes" :need-page="true"
         :page-size="20" :cache-key="cacheKeyUrl" class="scheme-table" @selection-change="selectedRows = $event">
         <template slot="toolbar">
-          <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="createScheme">新增方案</el-button>
           <el-button icon="el-icon-document-copy" class="ele-btn-icon" :disabled="selectedRows.length !== 1"
             @click="copyScheme(selectedRows[0])">复制</el-button>
           <el-button icon="el-icon-download" class="ele-btn-icon" @click="exportSchemes">导出</el-button>

+ 1 - 1
src/views/salary/fieldSetting/index.vue

@@ -29,7 +29,7 @@
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
           <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit()">
-            新增项目
+            新增
           </el-button>
           <!-- C17:批量删除接口已就绪,勾选后出现批量删除入口 -->
           <el-button v-if="SALARY_ITEM_BATCH_DELETE_READY" type="danger" icon="el-icon-delete"

+ 1 - 1
src/views/salary/salaryTemplate/index.vue

@@ -23,7 +23,7 @@
         <!-- 表头工具栏 -->
         <template v-slot:toolbar>
           <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openCreate">
-            新增模板
+            新增
           </el-button>
         </template>
 

+ 16 - 23
src/views/salary/socialScheme/index.vue

@@ -12,11 +12,6 @@
             缴费基数取员工档案,超出上下限时按上下限截断;方案变更后所有引用它的薪资模板于下次核算自动生效
           </div>
         </div>
-        <div class="page-header-right">
-          <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit()">
-            新增方案
-          </el-button>
-        </div>
       </div>
 
 
@@ -45,22 +40,25 @@
                 <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="reload">
                   查询
                 </el-button>
+                <el-button type="primary" icon="el-icon-refresh" class="ele-btn-icon" @click="resetSearch">
+                  重置
+                </el-button>
               </div>
             </el-form-item>
           </el-col>
-          <el-col class="scheme-search-actions">
-            <div class="ele-form-actions">
-              <el-button type="primary" icon="el-icon-refresh" class="ele-btn-icon" @click="resetSearch">
-                重置
-              </el-button>
-            </div>
-          </el-col>
         </el-row>
       </el-form>
 
       <!-- 表格 -->
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource" row-key="id" :page-size="pageSize"
-        @columns-change="handleColumnChange" :cache-key="cacheKeyUrl">
+        class="scheme-table" @columns-change="handleColumnChange" :cache-key="cacheKeyUrl">
+        <!-- 表头工具栏:新增按钮放表格左上角(与其他列表页一致) -->
+        <template v-slot:toolbar>
+          <el-button type="primary" icon="el-icon-plus" class="ele-btn-icon" @click="openEdit()">
+            新增
+          </el-button>
+        </template>
+
         <!-- 参保地 -->
         <template v-slot:area="{ row }">
           <span>{{ areaText(row) }}</span>
@@ -492,6 +490,11 @@ export default {
     margin-bottom: 4px;
   }
 
+  /* 列表(表格)顶部间距,与查询区分开 */
+  .scheme-table {
+    margin-top: 12px;
+  }
+
   /* 方案名称:输入框与查询按钮同一行 */
   .scheme-name-search {
     display: flex;
@@ -544,13 +547,3 @@ export default {
   }
 }
 </style>
-
-<style lang="scss">
-.social-scheme-page .scheme-search-form.ele-form-search .el-col.scheme-search-actions {
-  flex: 1 0 100% !important;
-  width: 100% !important;
-  max-width: 100% !important;
-  display: flex !important;
-  justify-content: flex-end;
-}
-</style>