From 4f613a4853f422216041efaa35220720238ab11a Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Sun, 4 Aug 2024 12:15:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=BA=93=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/label/index.js        |  53 ++++++++++
 src/views/base/label/LabelForm.vue | 104 +++++++++++++++++++
 src/views/base/label/index.vue     | 154 +++++++++++++++++++++++++++++
 3 files changed, 311 insertions(+)
 create mode 100644 src/api/base/label/index.js
 create mode 100644 src/views/base/label/LabelForm.vue
 create mode 100644 src/views/base/label/index.vue

diff --git a/src/api/base/label/index.js b/src/api/base/label/index.js
new file mode 100644
index 0000000..4371fc8
--- /dev/null
+++ b/src/api/base/label/index.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建标签库
+export function createLabel(data) {
+  return request({
+    url: '/base/label/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新标签库
+export function updateLabel(data) {
+  return request({
+    url: '/base/label/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除标签库
+export function deleteLabel(id) {
+  return request({
+    url: '/base/label/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得标签库
+export function getLabel(id) {
+  return request({
+    url: '/base/label/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得标签库分页
+export function getLabelPage(params) {
+  return request({
+    url: '/base/label/page',
+    method: 'get',
+    params
+  })
+}
+// 导出标签库 Excel
+export function exportLabelExcel(params) {
+  return request({
+    url: '/base/label/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/src/views/base/label/LabelForm.vue b/src/views/base/label/LabelForm.vue
new file mode 100644
index 0000000..1c94be3
--- /dev/null
+++ b/src/views/base/label/LabelForm.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="标签名称" prop="lableName">
+                      <el-input v-model="formData.lableName" placeholder="请输入标签名称" />
+                    </el-form-item>
+                    <el-form-item label="标签描述" prop="lableDesc">
+                      <el-input v-model="formData.lableDesc" placeholder="请输入标签描述" />
+                    </el-form-item>
+                    <el-form-item label="系统标识" prop="systemCode">
+                      <el-input v-model="formData.systemCode" placeholder="请输入系统标识" />
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as LabelApi from '@/api/base/label';
+      export default {
+    name: "LabelForm",
+    components: {
+                    },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            id: undefined,
+                            lableName: undefined,
+                            lableDesc: undefined,
+                            systemCode: undefined,
+        },
+        // 表单校验
+        formRules: {
+        },
+                        };
+    },
+    methods: {
+      /** 打开弹窗 */
+     async open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            const res = await LabelApi.getLabel(id);
+            this.formData = res.data;
+            this.title = "修改标签库";
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增标签库";
+              },
+      /** 提交按钮 */
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
+        try {
+          const data = this.formData;
+                  // 修改的提交
+          if (data.id) {
+            await LabelApi.updateLabel(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
+            return;
+          }
+          // 添加的提交
+          await LabelApi.createLabel(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
+          this.formLoading = false;
+        }
+      },
+                      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            id: undefined,
+                            lableName: undefined,
+                            lableDesc: undefined,
+                            systemCode: undefined,
+        };
+        this.resetForm("formRef");
+      }
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/src/views/base/label/index.vue b/src/views/base/label/index.vue
new file mode 100644
index 0000000..d6a41a2
--- /dev/null
+++ b/src/views/base/label/index.vue
@@ -0,0 +1,154 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标签名称" prop="lableName">
+        <el-input v-model="queryParams.lableName" placeholder="请输入标签名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="标签描述" prop="lableDesc">
+        <el-input v-model="queryParams.lableDesc" placeholder="请输入标签描述" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="系统标识" prop="systemCode">
+        <el-input v-model="queryParams.systemCode" placeholder="请输入系统标识" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['base:label:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['base:label:export']">导出</el-button>
+      </el-col>
+              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+            <el-table-column label="主键标识" align="center" prop="id" />
+      <el-table-column label="标签名称" align="center" prop="lableName" />
+      <el-table-column label="标签描述" align="center" prop="lableDesc" />
+      <el-table-column label="系统标识" align="center" prop="systemCode" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['base:label:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:label:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <LabelForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as LabelApi from '@/api/base/label';
+import LabelForm from './LabelForm.vue';
+export default {
+  name: "Label",
+  components: {
+          LabelForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+              // 总条数
+        total: 0,
+      // 标签库列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                    pageNo: 1,
+            pageSize: 10,
+        lableName: null,
+        lableDesc: null,
+        systemCode: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+      this.loading = true;
+              const res = await LabelApi.getLabelPage(this.queryParams);
+        this.list = res.data.list;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除标签库编号为"' + id + '"的数据项?')
+      try {
+       await LabelApi.deleteLabel(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有标签库数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await LabelApi.exportLabelExcel(this.queryParams);
+        this.$download.excel(data, '标签库.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+              }
+};
+</script>
\ No newline at end of file

From 11c177fab41866e5231d0cef3ab0813311a6d6c1 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Sun, 4 Aug 2024 15:35:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.js                             |   2 +
 .../base/customer/components/CorpCustomer.vue |   2 +-
 .../customer/components/PrivateCustomer.vue   |   2 +-
 .../base/customer/components/TodoCustomer.vue |   2 +-
 src/views/base/label/LabelForm.vue            | 218 +++++++------
 src/views/base/label/index.vue                | 302 +++++++++---------
 6 files changed, 267 insertions(+), 261 deletions(-)

diff --git a/src/utils/dict.js b/src/utils/dict.js
index ba9c21a..3399146 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -100,6 +100,8 @@ export const DICT_TYPE = {
   DICT_CAR_NATURE : 'car_nature',
   //车辆类别
   DICT_CAR_CATEGORY : 'car_category',
+  //标签样式
+  DICT_BASE_LABEL_TYPE : 'base_label_type',
 }
 
 /**
diff --git a/src/views/base/customer/components/CorpCustomer.vue b/src/views/base/customer/components/CorpCustomer.vue
index 99237f4..2102842 100644
--- a/src/views/base/customer/components/CorpCustomer.vue
+++ b/src/views/base/customer/components/CorpCustomer.vue
@@ -245,7 +245,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除客户管理编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除客户"' + row.cusName)
       try {
         await CustomerMainApi.deleteCustomerMain(id);
         await this.getList();
diff --git a/src/views/base/customer/components/PrivateCustomer.vue b/src/views/base/customer/components/PrivateCustomer.vue
index 8abe0c2..4d30ff5 100644
--- a/src/views/base/customer/components/PrivateCustomer.vue
+++ b/src/views/base/customer/components/PrivateCustomer.vue
@@ -228,7 +228,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除客户名称为"' + row.cusName + '"的数据项?')
+      await this.$modal.confirm('是否确认删除客户"' + row.cusName )
       try {
         await CustomerMainApi.deleteCustomerMain(id);
         await this.getList();
diff --git a/src/views/base/customer/components/TodoCustomer.vue b/src/views/base/customer/components/TodoCustomer.vue
index 7d3d673..320b531 100644
--- a/src/views/base/customer/components/TodoCustomer.vue
+++ b/src/views/base/customer/components/TodoCustomer.vue
@@ -209,7 +209,7 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除客户管理编号为"' + id + '"的数据项?')
+      await this.$modal.confirm('是否确认删除客户"' + row.cusName)
       try {
         await CustomerMainApi.deleteCustomerMain(id);
         await this.getList();
diff --git a/src/views/base/label/LabelForm.vue b/src/views/base/label/LabelForm.vue
index 1c94be3..c403708 100644
--- a/src/views/base/label/LabelForm.vue
+++ b/src/views/base/label/LabelForm.vue
@@ -1,104 +1,114 @@
-<template>
-  <div class="app-container">
-    <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
-                    <el-form-item label="标签名称" prop="lableName">
-                      <el-input v-model="formData.lableName" placeholder="请输入标签名称" />
-                    </el-form-item>
-                    <el-form-item label="标签描述" prop="lableDesc">
-                      <el-input v-model="formData.lableDesc" placeholder="请输入标签描述" />
-                    </el-form-item>
-                    <el-form-item label="系统标识" prop="systemCode">
-                      <el-input v-model="formData.systemCode" placeholder="请输入系统标识" />
-                    </el-form-item>
-      </el-form>
-              <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import * as LabelApi from '@/api/base/label';
-      export default {
-    name: "LabelForm",
-    components: {
-                    },
-    data() {
-      return {
-        // 弹出层标题
-        dialogTitle: "",
-        // 是否显示弹出层
-        dialogVisible: false,
-        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-        formLoading: false,
-        // 表单参数
-        formData: {
-                            id: undefined,
-                            lableName: undefined,
-                            lableDesc: undefined,
-                            systemCode: undefined,
-        },
-        // 表单校验
-        formRules: {
-        },
-                        };
-    },
-    methods: {
-      /** 打开弹窗 */
-     async open(id) {
-        this.dialogVisible = true;
-        this.reset();
-        // 修改时，设置数据
-        if (id) {
-          this.formLoading = true;
-          try {
-            const res = await LabelApi.getLabel(id);
-            this.formData = res.data;
-            this.title = "修改标签库";
-          } finally {
-            this.formLoading = false;
-          }
-        }
-        this.title = "新增标签库";
-              },
-      /** 提交按钮 */
-      async submitForm() {
-        // 校验主表
-        await this.$refs["formRef"].validate();
-                  this.formLoading = true;
-        try {
-          const data = this.formData;
-                  // 修改的提交
-          if (data.id) {
-            await LabelApi.updateLabel(data);
-            this.$modal.msgSuccess("修改成功");
-            this.dialogVisible = false;
-            this.$emit('success');
-            return;
-          }
-          // 添加的提交
-          await LabelApi.createLabel(data);
-          this.$modal.msgSuccess("新增成功");
-          this.dialogVisible = false;
-          this.$emit('success');
-        } finally {
-          this.formLoading = false;
-        }
-      },
-                      /** 表单重置 */
-      reset() {
-        this.formData = {
-                            id: undefined,
-                            lableName: undefined,
-                            lableDesc: undefined,
-                            systemCode: undefined,
-        };
-        this.resetForm("formRef");
-      }
-    }
-  };
-</script>
\ No newline at end of file
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+        <el-form-item label="标签名称" prop="labelName">
+          <el-input v-model="formData.labelName" placeholder="请输入标签名称"/>
+        </el-form-item>
+        <el-form-item label="标签样式" prop="labelType">
+          <el-select v-model="formData.labelType" placeholder="请选择标签样式">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.DICT_BASE_LABEL_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
+           实例：<el-tag :type="formData.labelType">{{ formData.labelName }}</el-tag>
+        </el-form-item>
+        <el-form-item label="标签描述" prop="labelDesc">
+          <el-input v-model="formData.labelDesc" placeholder="请输入标签描述"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import * as LabelApi from '@/api/base/label';
+
+export default {
+  name: "LabelForm",
+  components: {},
+  data() {
+    return {
+      // 弹出层标题
+      dialogTitle: "",
+      // 是否显示弹出层
+      dialogVisible: false,
+      // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+      formLoading: false,
+      // 表单参数
+      formData: {
+        id: undefined,
+        labelName: undefined,
+        labelDesc: undefined,
+        labelType: undefined
+      },
+      // 表单校验
+      formRules: {
+        labelName: [
+          {required: true, message: '请输入标签名称', trigger: 'blur'},
+        ],
+        labelType: [
+          {required: true, message: '请选择标签样式', trigger: 'blur'},
+        ],
+      },
+    };
+  },
+  methods: {
+    /** 打开弹窗 */
+    async open(id) {
+      this.dialogVisible = true;
+      this.reset();
+      // 修改时，设置数据
+      if (id) {
+        this.formLoading = true;
+        try {
+          const res = await LabelApi.getLabel(id);
+          this.formData = res.data;
+          this.title = "修改标签库";
+        } finally {
+          this.formLoading = false;
+        }
+      }
+      this.title = "新增标签库";
+    },
+    /** 提交按钮 */
+    async submitForm() {
+      // 校验主表
+      await this.$refs["formRef"].validate();
+      this.formLoading = true;
+      try {
+        const data = this.formData;
+        // 修改的提交
+        if (data.id) {
+          await LabelApi.updateLabel(data);
+          this.$modal.msgSuccess("修改成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+          return;
+        }
+        // 添加的提交
+        await LabelApi.createLabel(data);
+        this.$modal.msgSuccess("新增成功");
+        this.dialogVisible = false;
+        this.$emit('success');
+      } finally {
+        this.formLoading = false;
+      }
+    },
+    /** 表单重置 */
+    reset() {
+      this.formData = {
+        id: undefined,
+        labelName: undefined,
+        labelDesc: undefined,
+        systemCode: undefined,
+      };
+      this.resetForm("formRef");
+    }
+  }
+};
+</script>
diff --git a/src/views/base/label/index.vue b/src/views/base/label/index.vue
index d6a41a2..4c6b5c5 100644
--- a/src/views/base/label/index.vue
+++ b/src/views/base/label/index.vue
@@ -1,154 +1,148 @@
-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标签名称" prop="lableName">
-        <el-input v-model="queryParams.lableName" placeholder="请输入标签名称" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="标签描述" prop="lableDesc">
-        <el-input v-model="queryParams.lableDesc" placeholder="请输入标签描述" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="系统标识" prop="systemCode">
-        <el-input v-model="queryParams.systemCode" placeholder="请输入系统标识" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <!-- 操作工具栏 -->
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
-                   v-hasPermi="['base:label:create']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['base:label:export']">导出</el-button>
-      </el-col>
-              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-            <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-            <el-table-column label="主键标识" align="center" prop="id" />
-      <el-table-column label="标签名称" align="center" prop="lableName" />
-      <el-table-column label="标签描述" align="center" prop="lableDesc" />
-      <el-table-column label="系统标识" align="center" prop="systemCode" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template v-slot="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template v-slot="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-                     v-hasPermi="['base:label:update']">修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['base:label:delete']">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-    <!-- 对话框(添加 / 修改) -->
-    <LabelForm ref="formRef" @success="getList" />
-    </div>
-</template>
-
-<script>
-import * as LabelApi from '@/api/base/label';
-import LabelForm from './LabelForm.vue';
-export default {
-  name: "Label",
-  components: {
-          LabelForm,
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 显示搜索条件
-      showSearch: true,
-              // 总条数
-        total: 0,
-      // 标签库列表
-      list: [],
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 选中行
-      currentRow: {},
-      // 查询参数
-      queryParams: {
-                    pageNo: 1,
-            pageSize: 10,
-        lableName: null,
-        lableDesc: null,
-        systemCode: null,
-        createTime: [],
-      },
-            };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询列表 */
-    async getList() {
-      try {
-      this.loading = true;
-              const res = await LabelApi.getLabelPage(this.queryParams);
-        this.list = res.data.list;
-        this.total = res.data.total;
-      } finally {
-        this.loading = false;
-      }
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 添加/修改操作 */
-    openForm(id) {
-      this.$refs["formRef"].open(id);
-    },
-    /** 删除按钮操作 */
-    async handleDelete(row) {
-      const id = row.id;
-      await this.$modal.confirm('是否确认删除标签库编号为"' + id + '"的数据项?')
-      try {
-       await LabelApi.deleteLabel(id);
-       await this.getList();
-       this.$modal.msgSuccess("删除成功");
-      } catch {}
-    },
-    /** 导出按钮操作 */
-    async handleExport() {
-      await this.$modal.confirm('是否确认导出所有标签库数据项?');
-      try {
-        this.exportLoading = true;
-        const data = await LabelApi.exportLabelExcel(this.queryParams);
-        this.$download.excel(data, '标签库.xls');
-      } catch {
-      } finally {
-        this.exportLoading = false;
-      }
-    },
-              }
-};
-</script>
\ No newline at end of file
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标签名称" prop="labelName">
+        <el-input v-model="queryParams.labelName" placeholder="请输入标签名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['base:label:create']">新增
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="标签名称" align="center" prop="labelName"/>
+      <el-table-column label="标签样式" align="center" prop="labelType">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.DICT_BASE_LABEL_TYPE" :value="scope.row.labelType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="标签描述" align="center" prop="labelDesc"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['base:label:update']">修改
+          </el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['base:label:delete']">删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+    <!-- 对话框(添加 / 修改) -->
+    <LabelForm ref="formRef" @success="getList"/>
+  </div>
+</template>
+
+<script>
+import * as LabelApi from '@/api/base/label';
+import LabelForm from './LabelForm.vue';
+
+export default {
+  name: "Label",
+  components: {
+    LabelForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 标签库列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        labelName: null,
+        labelDesc: null,
+        systemCode: null,
+        createTime: [],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+        this.loading = true;
+        const res = await LabelApi.getLabelPage(this.queryParams);
+        this.list = res.data.records;
+        this.total = res.data.total;
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除标签库编号为"' + id + '"的数据项?')
+      try {
+        await LabelApi.deleteLabel(id);
+        await this.getList();
+        this.$modal.msgSuccess("删除成功");
+      } catch {
+      }
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有标签库数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await LabelApi.exportLabelExcel(this.queryParams);
+        this.$download.excel(data, '标签库.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+  }
+};
+</script>