Merge remote-tracking branch 'origin/dev' into dev

src/api/customer/credit.js

+import request from '@/utils/request'
+
+// 创建信用等级
+export function createCredit(data) {
+  return request({
+    url: '/customer/credit/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新信用等级
+export function updateCredit(data) {
+  return request({
+    url: '/customer/credit/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除信用等级
+export function deleteCredit(id) {
+  return request({
+    url: '/customer/credit/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得信用等级
+export function getCredit(id) {
+  return request({
+    url: '/customer/credit/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得信用等级分页
+export function getCreditPage(query) {
+  return request({
+    url: '/customer/credit/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出信用等级 Excel
+export function exportCreditExcel(query) {
+  return request({
+    url: '/customer/credit/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/customer/creditRule.js

+import request from '@/utils/request'
+
+// 创建信用规则
+export function createCreditRule(data) {
+  return request({
+    url: '/customer/credit-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新信用规则
+export function updateCreditRule(data) {
+  return request({
+    url: '/customer/credit-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除信用规则
+export function deleteCreditRule(id) {
+  return request({
+    url: '/customer/credit-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得信用规则
+export function getCreditRule(id) {
+  return request({
+    url: '/customer/credit-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得信用规则分页
+export function getCreditRulePage(query) {
+  return request({
+    url: '/customer/credit-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出信用规则 Excel
+export function exportCreditRuleExcel(query) {
+  return request({
+    url: '/customer/credit-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/customer/level.js

+import request from '@/utils/request'
+
+// 创建客户等级
+export function createLevel(data) {
+  return request({
+    url: '/customer/level/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新客户等级
+export function updateLevel(data) {
+  return request({
+    url: '/customer/level/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户等级
+export function deleteLevel(id) {
+  return request({
+    url: '/customer/level/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得客户等级
+export function getLevel(id) {
+  return request({
+    url: '/customer/level/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得客户等级分页
+export function getLevelPage(query) {
+  return request({
+    url: '/customer/level/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出客户等级 Excel
+export function exportLevelExcel(query) {
+  return request({
+    url: '/customer/level/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/customer/levelRule.js

+import request from '@/utils/request'
+
+// 创建客户等级规则
+export function createLevelRule(data) {
+  return request({
+    url: '/customer/level-rule/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新客户等级规则
+export function updateLevelRule(data) {
+  return request({
+    url: '/customer/level-rule/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除客户等级规则
+export function deleteLevelRule(id) {
+  return request({
+    url: '/customer/level-rule/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得客户等级规则
+export function getLevelRule(id) {
+  return request({
+    url: '/customer/level-rule/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得客户等级规则分页
+export function getLevelRulePage(query) {
+  return request({
+    url: '/customer/level-rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出客户等级规则 Excel
+export function exportLevelRuleExcel(query) {
+  return request({
+    url: '/customer/level-rule/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/ecw/productBrandEmpower.js

@@ -34,6 +34,24 @@ export function getProductBrandEmpower(id) {
   })
 }
 
+// 获得商品品牌已授权分页
+export function getProductBrandEmpowerPageAuth(query) {
+  return request({
+    url: '/ecw/product-brand-empower/page/auth',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得商品品牌未授权分页
+export function getProductBrandEmpowerPageUnauth(query) {
+  return request({
+    url: '/ecw/product-brand-empower/page/unauth',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得商品品牌授权分页
 export function getProductBrandEmpowerPage(query) {
   return request({

src/api/system/internalMessage.js

+import request from '@/utils/request'
+
+// 创建站内信
+export function createInternalMessage(data) {
+  return request({
+    url: '/ecw/internal-message/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新站内信
+export function updateInternalMessage(data) {
+  return request({
+    url: '/ecw/internal-message/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除站内信
+export function deleteInternalMessage(id) {
+  return request({
+    url: '/ecw/internal-message/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得站内信
+export function getInternalMessage(id) {
+  return request({
+    url: '/ecw/internal-message/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得站内信分页
+export function getInternalMessagePage(query) {
+  return request({
+    url: '/ecw/internal-message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出站内信 Excel
+export function exportInternalMessageExcel(query) {
+  return request({
+    url: '/ecw/internal-message/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+// 获得我的站内信
+export function getMyInternalMessagePage(query) {
+  return request({
+    url: '/ecw/internal-message/getMyInternalMessagePage',
+    method: 'get',
+    params: query
+  })
+}

src/components/CustomerFollow/index.vue

@@ -49,7 +49,7 @@
       <el-table-column
         prop="followUserId"
         label="跟进业务"
-        :formatter="(row, column, cellValue) => serviceUserList.find(e => e.id === cellValue).nickname"
+        :formatter="(row, column, cellValue) => serviceUserList.find(e => e.id === cellValue) ? serviceUserList.find(e => e.id === cellValue).nickname : ''"
       >
       </el-table-column>
     </el-table>

src/layout/components/Navbar.vue

@@ -7,11 +7,16 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
+
+        <el-badge :value="notReadTotal" class="right-menu-item">
+          <el-button size="small" @click="notRead">未读消息</el-button>
+        </el-badge>
+
+
+
         <search id="header-search" class="right-menu-item" />
 
-<!--        <el-tooltip content="源码地址" effect="dark" placement="bottom">-->
-<!--          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />-->
-<!--        </el-tooltip>-->
+
 
 <!--        <el-tooltip content="文档地址" effect="dark" placement="bottom">-->
 <!--          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />-->
@@ -69,6 +74,7 @@ export default {
       locale: getLocale(),
       // 枚举
       langDatas: LangEnum.LANG,
+      notReadTotal:0,//要去取VUEX里面的未读数据总数，我不会,登录之后要调得到当前人未读记录总数接口放到VUEX中
     }
   },
   components: {
@@ -118,6 +124,9 @@ export default {
           location.href = '/';
         })
       }).catch(() => {});
+    },
+    notRead(){
+      this.$router.push({path:'/system/internalMessage/my-internal-message',query:{'status':0}});
     }
   }
 }
@@ -131,6 +140,7 @@ export default {
   background: #fff;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;

src/utils/dict.js

@@ -26,6 +26,8 @@ export const DICT_TYPE = {
   SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
   SYSTEM_MAIL_SEND_STATUS: 'mail_send_status',
   SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
+  INTERNAL_MESSAGE_TYPE: 'internal_message_type',
+  INTERNAL_MESSAGE_READ_STATUS: 'internal_message_read_status',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING: 'infra_boolean_string',
@@ -110,6 +112,11 @@ export const DICT_TYPE = {
   COMMISSION_UNIT:'commission_unit',//佣金货物单位
   ECW_PORT_TYPE:'port_type',  //港口类型
   CERTIFICATE_TYPE:'certificate_type',//证件类型
+
+  //customer
+  CUSTOMER_CREDIT_RULE_TYPE: 'customer_credit_rule_type',
+  CUSTOMER_LEVEL_RULE_TYPE: 'customer_level_rule_type',
+
 }
 
 /**

src/views/customer/credit/index.vue

+<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="scoreMax">
+        <el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="最低分值" prop="scoreMin">
+        <el-input v-model="queryParams.scoreMin" 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="handleAdd"
+                   v-hasPermi="['customer:credit: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="['customer:credit:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="中文名称" align="center" prop="nameZh" />
+      <el-table-column label="英文名称" align="center" prop="nameEn" />
+      <el-table-column label="最低分值" align="center" prop="scoreMin" />
+      <el-table-column label="最高分值" align="center" prop="scoreMax" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['customer:credit:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['customer:credit: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"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="中文名称" prop="nameZh">
+          <el-input v-model="form.nameZh" placeholder="请输入中文名称" />
+        </el-form-item>
+        <el-form-item label="英文名称" prop="nameEn">
+          <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
+        </el-form-item>
+        <el-form-item label="最高分值" prop="scoreMax">
+          <el-input v-model="form.scoreMax" placeholder="请输入最高分值" />
+        </el-form-item>
+        <el-form-item label="最低分值" prop="scoreMin">
+          <el-input v-model="form.scoreMin" placeholder="请输入最低分值" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createCredit, updateCredit, deleteCredit, getCredit, getCreditPage, exportCreditExcel } from "@/api/customer/credit";
+
+export default {
+  name: "Credit",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 信用等级列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        scoreMax: null,
+        scoreMin: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
+        nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
+        scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }],
+        scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      // 执行查询
+      getCreditPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        nameZh: undefined,
+        nameEn: undefined,
+        scoreMax: undefined,
+        scoreMin: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加信用等级";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getCredit(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改信用等级";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateCredit(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createCredit(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除信用等级编号为"' + id + '"的数据项?').then(function() {
+          return deleteCredit(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有信用等级数据项?').then(() => {
+          this.exportLoading = true;
+          return exportCreditExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/customer/creditRule/index.vue

+<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="name">
+        <el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="规则分类" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </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="handleAdd"
+                   v-hasPermi="['customer:credit-rule: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="['customer:credit-rule:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="规则名称" align="center" prop="name" />
+      <el-table-column label="规则分类" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="规则得分" align="center" prop="score" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['customer:credit-rule:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['customer:credit-rule: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"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="规则名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入规则名称" />
+        </el-form-item>
+        <el-form-item label="规则分类" prop="type">
+          <el-select v-model="form.type" placeholder="请选择规则分类">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_CREDIT_RULE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规则得分" prop="score">
+          <el-input v-model="form.score" placeholder="请输入规则得分" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createCreditRule, updateCreditRule, deleteCreditRule, getCreditRule, getCreditRulePage, exportCreditRuleExcel } from "@/api/customer/creditRule";
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+
+export default {
+  name: "CreditRule",
+  components: {
+  },
+  data() {
+    return {
+      getDictDatas,
+      DICT_TYPE,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 信用规则列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
+        score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getCreditRulePage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        type: undefined,
+        score: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加信用规则";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getCreditRule(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改信用规则";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateCreditRule(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createCreditRule(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除信用规则编号为"' + id + '"的数据项?').then(function() {
+          return deleteCreditRule(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有信用规则数据项?').then(() => {
+          this.exportLoading = true;
+          return exportCreditRuleExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/customer/level/index.vue

+<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="scoreMax">
+        <el-input v-model="queryParams.scoreMax" placeholder="请输入最高分值" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="最低分值" prop="scoreMin">
+        <el-input v-model="queryParams.scoreMin" placeholder="请输入最低分值" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </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="handleAdd"
+                   v-hasPermi="['customer:level: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="['customer:level:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="中文名称" align="center" prop="nameZh" />
+      <el-table-column label="英文名称" align="center" prop="nameEn" />
+      <el-table-column label="最低分值" align="center" prop="scoreMin" />
+      <el-table-column label="最高分值" align="center" prop="scoreMax" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['customer:level:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['customer:level: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"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="名称" prop="nameZh">
+          <el-input v-model="form.nameZh" placeholder="请输入中文名称" />
+        </el-form-item>
+        <el-form-item label="英文名称" prop="nameEn">
+          <el-input v-model="form.nameEn" placeholder="请输入英文名称" />
+        </el-form-item>
+        <el-form-item label="最低分值" prop="scoreMin">
+          <el-input v-model="form.scoreMin" placeholder="请输入最低分值" />
+        </el-form-item>
+        <el-form-item label="最高分值" prop="scoreMax">
+          <el-input v-model="form.scoreMax" placeholder="请输入最高分值" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createLevel, updateLevel, deleteLevel, getLevel, getLevelPage, exportLevelExcel } from "@/api/customer/level";
+
+export default {
+  name: "Level",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户等级列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        scoreMax: null,
+        scoreMin: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nameZh: [{ required: true, message: "中文名称不能为空", trigger: "blur" }],
+        nameEn: [{ required: true, message: "英文名称不能为空", trigger: "blur" }],
+        scoreMax: [{ required: true, message: "最大分值不能为空", trigger: "blur" }],
+        scoreMin: [{ required: true, message: "最小分值不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getLevelPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        nameZh: undefined,
+        nameEn: undefined,
+        scoreMax: undefined,
+        scoreMin: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户等级";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getLevel(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户等级";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateLevel(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createLevel(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除客户等级编号为"' + id + '"的数据项?').then(function() {
+          return deleteLevel(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有客户等级数据项?').then(() => {
+          this.exportLoading = true;
+          return exportLevelExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/customer/levelRule/index.vue

+<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="name">
+        <el-input v-model="queryParams.name" placeholder="请输入规则名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="规则分类" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择规则分类" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </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="handleAdd"
+                   v-hasPermi="['customer:level-rule: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="['customer:level-rule:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="规则名称" align="center" prop="name" />
+      <el-table-column label="规则分类" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="规则得分" align="center" prop="score" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['customer:level-rule:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['customer:level-rule: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"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="规则名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入规则名称" />
+        </el-form-item>
+        <el-form-item label="规则分类" prop="type">
+          <el-select v-model="form.type" placeholder="请选择规则分类">
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL_RULE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规则得分" prop="score">
+          <el-input v-model="form.score" placeholder="请输入规则得分" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createLevelRule, updateLevelRule, deleteLevelRule, getLevelRule, getLevelRulePage, exportLevelRuleExcel } from "@/api/customer/levelRule";
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+
+export default {
+  name: "LevelRule",
+  components: {
+  },
+  data() {
+    return {
+      getDictDatas,
+      DICT_TYPE,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 客户等级规则列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        type: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [{ required: true, message: "规则名称不能为空", trigger: "blur" }],
+        type: [{ required: true, message: "规则分类不能为空", trigger: "change" }],
+        score: [{ required: true, message: "规则得分不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getLevelRulePage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        name: undefined,
+        type: undefined,
+        score: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加客户等级规则";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getLevelRule(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改客户等级规则";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateLevelRule(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createLevelRule(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除客户等级规则编号为"' + id + '"的数据项?').then(function() {
+          return deleteLevelRule(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有客户等级规则数据项?').then(() => {
+          this.exportLoading = true;
+          return exportLevelRuleExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/ecw/customerComplaint/index.vue

@@ -128,7 +128,7 @@
         </el-form-item>
       </el-form>
 
-      <customer-follow :customer-id="form.id"></customer-follow>
+      <customer-follow v-show="!!this.form.id" :customer-id="form.id"></customer-follow>
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/ecw/productBrank/BrandForm/index.vue

+<template>
+  <el-form ref="form" :model="form" label-width="80px">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>卡片名称</span>
+        <el-button style="float: right; padding: 3px 0" type="text" @click="$emit('delete')">删除</el-button>
+      </div>
+      <el-form-item :label="'商标' + (index + 1)">
+        <el-input v-model="form.brandName" placeholder="商标"></el-input>
+      </el-form-item>
+      <el-form-item :label="`商标${index + 1}分类`">
+        <el-select v-model="form.productTypeId" placeholder="placeholder" @change="form.productIds = [], updateValue()">
+          <el-option
+            v-for="item in productTypeList"
+            :key="item.id"
+            :label="item.titleZh"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="`商标${index + 1}商品`">
+        <el-select v-model="form.productIds" placeholder="placeholder" multiple filterable @change="updateValue">
+          <el-option
+            v-for="item in getProductListByTypeId(form.productTypeId)"
+            :key="item.id"
+            :label="item.titleZh"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-card>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: "BrandForm",
+  props: {
+    productTypeList: {
+      type: Array,
+      default: []
+    },
+    productList: {
+      type: Array,
+      default: []
+    },
+    value: {
+      type: Object,
+      default: {
+        "brandName": "",
+        "trademarkCategoryRelList": []
+      }
+    },
+    index: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      form :{
+        id: undefined,
+        productBrandId: undefined,
+        brandName: '',
+        productTypeId: 0,
+        productIds: []
+      }
+    }
+  },
+  mounted() {
+    this.updateForm(this.value)
+  },
+  methods: {
+    getProductListByTypeId(typeId) {
+      return typeId === 0 ? [] : this.productList.filter((p) => p.typeId === typeId)
+    },
+    updateValue() {
+      const trademarkCategoryRelList = []
+      this.form.productIds.forEach(productId => {
+        trademarkCategoryRelList.push({
+          productCategoryId: this.form.productTypeId,
+          productId,
+        })
+      })
+      this.$emit('input', {
+        brandName: this.form.brandName,
+        id: this.form.id,
+        productBrandId: this.form.productBrandId,
+        trademarkCategoryRelList
+      })
+    },
+    updateForm(e){
+      if (!!e){
+        this.form.brandName = e.brandName
+        this.form.id = e.id
+        this.form.productBrandId = e.productBrandId
+        if (e.trademarkCategoryRelList && e.trademarkCategoryRelList.length > 0) {
+          this.form.productTypeId = e.trademarkCategoryRelList[0].productCategoryId
+          this.form.productIds = []
+          e.trademarkCategoryRelList.forEach(f => {
+            this.form.productIds.push(f.productId)
+          })
+        }
+      }
+    }
+  },
+  watch: {
+    value(e) {
+      this.updateForm(e)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/productBrank/Empower/index.vue

+<template>
+
+  <div>
+    <el-dialog
+      :title="brandName"
+      :visible.sync="dialogVisible"
+      width="900px"
+      :before-close="handleClose()">
+      <el-tabs v-model="activeName">
+        <el-tab-pane label="未授权客户" name="first">
+          <el-form :inline="true" class="demo-form-inline">
+            <el-form-item label="关键字">
+              <el-input v-model="customerKey" placeholder="审批人"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="filterCustomer">查询</el-button>
+            </el-form-item>
+          </el-form>
+
+          <el-table
+            :data="list1"
+            style="width: 100%">
+            <el-table-column
+              prop="customerName"
+              label="客户名称">
+            </el-table-column>
+            <el-table-column
+              prop="phone"
+              label="客户号码">
+            </el-table-column>
+            <el-table-column
+              width="100px"
+              label="操作">
+              <template v-slot="{row}">
+                <el-button type="primary" size="mini" @click="handleAdd(row)">添加</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="已授权客户" name="second">
+          <el-table
+            :data="list2"
+            style="width: 100%">
+            <el-table-column
+              prop="customerName"
+              label="客户名称">
+            </el-table-column>
+            <el-table-column
+              prop="phone"
+              label="客户号码">
+            </el-table-column>
+            <el-table-column
+              width="100px"
+              label="操作">
+              <template v-slot="{row}">
+                <el-button type="primary" size="mini" @click="handleDelete(row.id)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+    </el-dialog>
+
+    <el-dialog
+      title="添加"
+      :visible.sync="addDialog.dialogVisible"
+      width="500px">
+      <el-form ref="form" :model="addDialog.form" label-width="80px">
+        <el-form-item label="客户名称">{{ addDialog.form.customerName }}</el-form-item>
+        <el-form-item label="授权时间">
+          <el-date-picker
+            v-model="addDialog.dateRange"
+            @chang="handleDatePick"
+            type="daterange"
+            range-separator="至"
+            value-format="timestamp"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="收费模式">
+          <dict-selector v-model="addDialog.form.feeScale" :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL"></dict-selector>
+        </el-form-item>
+        <el-form-item label="授权证明"></el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addDialog.dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="handleAddSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  createProductBrandEmpower,
+  deleteProductBrandEmpower,
+  getProductBrandEmpowerPageAuth,
+  getProductBrandEmpowerPageUnauth
+} from "@/api/ecw/productBrandEmpower"
+import DictSelector from "@/components/DictSelector"
+import {DICT_TYPE} from "@/utils/dict"
+
+export default {
+  name: "Empower",
+  components: {
+    DictSelector
+  },
+  props: {
+    id: {
+      type: Number,
+      default: 0
+    },
+    brandName: String,
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      DICT_TYPE,
+      dialogVisible: false,
+      activeName: 'first',
+      customerKey: '',
+      list1: [],
+      list2: [],
+
+      addDialog: {
+        dialogVisible: false,
+        customerName: '',
+        form: {
+          "customerContactsId": 0,
+          "customerId": 0,
+          "endTime": "",
+          "feeScale": 0,
+          "fileUrl": "",
+          "productBrandId": null,
+          "startTime": "",
+          "status": 0
+        },
+        dateRange: []
+      }
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+    handleAddSubmit(){
+      this.addDialog.form.productBrandId = this.id
+      createProductBrandEmpower(this.addDialog.form).then(() => {
+        this.addDialog.dialogVisible = false
+        this.getList1()
+        this.getList2()
+      })
+    },
+    handleDatePick(e){
+      console.log(e)
+    },
+    handleClose() {},
+    filterCustomer() {},
+    handleAdd(row) {
+      this.addDialog.form.customerId = row.customerId
+      this.addDialog.form.customerName = row.customerName
+      this.addDialog.dialogVisible = true
+    },
+    handleDelete(id) {
+      deleteProductBrandEmpower(id).then(r => {
+        this.getList2()
+      })
+    },
+    getList1(){
+      getProductBrandEmpowerPageUnauth({productBrandId: this.id}).then(r => {
+        this.list1 = r.data.list
+      })
+    },
+    getList2() {
+      getProductBrandEmpowerPageAuth({productBrandId: this.id}).then(r => {
+        this.list2 = r.data.list
+      })
+    }
+  },
+  watch: {
+    visible(v){
+      if (v){
+        this.getList1()
+        this.getList2()
+      }
+      this.dialogVisible = v
+    },
+    dialogVisible(v) {
+      this.$emit('update:visible', v)
+    },
+
+    'addDialog.dateRange'(v) {
+      this.addDialog.form.startTime = v[0]
+      this.addDialog.form.endTime = v[1]
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/productBrank/index.vue

@@ -67,6 +67,8 @@
         </template>
       </el-table-column>      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEmpower(scope.row)" v-show="scope.row.filing === '1'"
+                     v-hasPermi="['ecw:product-brank:update']">添加授权客户</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:product-brank:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -79,7 +81,7 @@
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="品牌中文标题" prop="titleZh">
           <el-input v-model="form.titleZh" placeholder="请输入品牌中文标题" />
@@ -107,28 +109,28 @@
 
       <h3>包含商标列表</h3>
 
-      <el-form ref="form" :model="brand" label-width="80px" v-for="(brand, index) in brands" :key="index">
-        <el-form-item label="商标">
-          <el-input v-model="brand.name" placeholder="商标"></el-input>
-        </el-form-item>
-        <el-form-item label="商标分类">
-          <el-select v-model="brand.type" placeholder="placeholder">
-            <el-option
-              v-for="item in []"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
+      <brand-form
+        v-for="(item, index) in form.trademarkList"
+        v-model="form.trademarkList[index]"
+        :index="index"
+        :key="item.id"
+        :product-type-list="productTypeList"
+        :product-list="productList"
+        @delete="form.trademarkList.splice(index, 1)"></brand-form>
+
+      <el-button type="primary" @click="form.trademarkList.push({
+        brandName: '',
+        productBrandId: form.id,
+      trademarkCategoryRelList: []
+      })">添加商标</el-button>
 
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <empower :visible.sync="showEmpower" :brandName="empowerTitle" :id="empowerId"></empower>
   </div>
 </template>
 
@@ -136,11 +138,17 @@
 import { createProductBrank, updateProductBrank, deleteProductBrank, getProductBrank, getProductBrankPage, exportProductBrankExcel } from "@/api/ecw/productBrank";
 import { CommonStatusEnum } from '@/utils/constants';
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import {getProductTypeList} from "@/api/ecw/productType"
+import {getProductList} from "@/api/ecw/product"
+import BrandForm from "@/views/ecw/productBrank/BrandForm"
+import Empower from "@/views/ecw/productBrank/Empower"
 
 
 export default {
   name: "ProductBrank",
   components: {
+    BrandForm,
+    Empower
   },
   data() {
     return {
@@ -176,13 +184,30 @@ export default {
       rules: {
       },
       recordStatus: getDictDatas(DICT_TYPE.BRAND_REG_TYPE),
-      brands: [{name: '', type: ''}]
+
+      productTypeList: [],
+      productList: [],
+
+      showEmpower: false,
+      empowerId: null,
+      empowerTitle: ''
     };
   },
   created() {
     this.getList();
+    getProductTypeList().then(r => {
+      this.productTypeList = r.data
+    })
+    getProductList().then(r => {
+      this.productList = r.data
+    })
   },
   methods: {
+    handleEmpower(row){
+      this.empowerId = row.id
+      this.empowerTitle = row.titleZh
+      this.showEmpower = true
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;
@@ -212,6 +237,17 @@ export default {
         titleEn: undefined,
         aorder: undefined,
         filing: undefined,
+        "trademarkList": [
+          {
+            "brandName": "",
+            "trademarkCategoryRelList": [
+              {
+                "productCategoryId": 0,
+                "productId": 0
+              }
+            ]
+          }
+        ]
       };
       this.resetForm("form");
     },

src/views/system/dict/data.vue

@@ -49,6 +49,7 @@
       <el-table-column label="颜色类型" align="center" prop="colorType" />
       <el-table-column label="CSS Class" align="center" prop="cssClass" />
       <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="创建人" align="creatorName" prop="creatorName" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>

src/views/system/myInternalMessage/index.vue

+<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="fromId">
+        <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="发送时间">
+        <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </el-form-item>
+      <el-form-item label="标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="消息类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_TYPE)"
+                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.INTERNAL_MESSAGE_READ_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+      </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-table v-loading="loading" :data="list">
+      <el-table-column label="" align="center" prop="id" />
+      <el-table-column label="站内信来源" align="center" prop="fromId" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="标题" align="center" prop="title" />
+<!--      <el-table-column label="内容" align="center" prop="content" />-->
+      <el-table-column label="消息类型" align="center" prop="type">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="50">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_READ_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="viewMessage(scope.row)">查看</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"/>
+  </div>
+</template>
+
+<script>
+import {  getMyInternalMessagePage} from "@/api/system/internalMessage";
+
+export default {
+  name: "MyInternalMessage",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 站内信列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeSendTime: [],
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        fromId: null,
+        title: null,
+        content: null,
+        type: null,
+        status: this.$route.query.status?this.$route.query.status:null,
+      },
+      // 表单参数
+      form: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getMyInternalMessagePage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        fromId: undefined,
+        sendTime: undefined,
+        title: undefined,
+        content: undefined,
+        type: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeSendTime = [];
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    viewMessage(e){
+
+    }
+  }
+};
+</script>