Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/productBrank.js

+import request from '@/utils/request'
+
+// 创建品牌
+export function createProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新品牌
+export function updateProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除品牌
+export function deleteProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得品牌
+export function getProductBrank(id) {
+  return request({
+    url: '/ecw/product-brank/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得品牌分页
+export function getProductBrankPage(query) {
+  return request({
+    url: '/ecw/product-brank/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出品牌 Excel
+export function exportProductBrankExcel(query) {
+  return request({
+    url: '/ecw/product-brank/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/utils/dict.js

@@ -78,7 +78,8 @@ export const DICT_TYPE = {
   CUSTOMER_COMPLAINT_STATUS: 'customer_complaint_status',
   ECW_MESSAGE_LEAVE_TYPE: 'ecw_message_leave_type',
   ECW_MESSAGE_LEAVE_STATUS: 'ecw_message_leave_status',
-  PWD_TYPE: 'pwd_type'
+  PWD_TYPE: 'pwd_type',
+  BRAND_REG_TYPE: 'brand_registry_type',
 
 }
 

src/views/ecw/customer/index.vue

@@ -11,25 +11,25 @@
       </el-form-item>
       <el-form-item label="客户等级" prop="level">
         <el-select v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户来源" prop="source">
         <el-select v-model="queryParams.source" placeholder="请选择客户来源" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
       <el-form-item label="跟进客服" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
                        :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.CUSTOMER_STATUS)"
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
@@ -103,9 +103,9 @@
                 @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-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="客户名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入客户名称" />
@@ -114,7 +114,7 @@
           <el-col :span="12">
             <el-form-item label="国家" prop="country">
               <el-select v-model="form.country" placeholder="请选择国家">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -122,7 +122,7 @@
           <el-col :span="12">
             <el-form-item label="客户等级" prop="level">
               <el-select v-model="form.level" placeholder="请选择客户等级">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -130,7 +130,7 @@
           <el-col :span="12">
             <el-form-item label="所属代理" prop="agentId">
               <el-select v-model="form.agentId" placeholder="请选择所属代理">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -143,7 +143,7 @@
           <el-col :span="12">
             <el-form-item label="客户类别" prop="type">
               <el-select v-model="form.type" placeholder="请选择客户类别">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_TYPE)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_TYPE)"
                            :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
@@ -181,7 +181,7 @@
 
             <el-form-item label="客户来源" prop="source">
               <el-select v-model="form.source" placeholder="请选择客户来源">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -190,7 +190,7 @@
 
             <el-form-item label="结算方式" prop="balance">
               <el-select v-model="form.balance" placeholder="请选择结算方式">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_BALANCE)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -199,7 +199,7 @@
 
             <el-form-item label="跟进客服" prop="customerService">
               <el-select v-model="form.customerService" placeholder="请选择跟进客服">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -214,7 +214,7 @@
           <el-col :span="12">
             <el-form-item label="客户状态" prop="status">
               <el-select v-model="form.status" placeholder="请选择客户状态">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
+                <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_STATUS)"
                            :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
               </el-select>
             </el-form-item>
@@ -249,9 +249,7 @@
               <el-input v-model="form.weightUnit" placeholder="请输入重货标准(CBM)" />
             </el-form-item>
           </el-col>
-
-
-
+        </el-row>
 
         <el-form-item label="关联会员账号" prop="memberId">
           <el-input v-model="form.memberId" placeholder="请输入关联会员账号" />
@@ -307,6 +305,8 @@ export default {
   },
   data() {
     return {
+      getDictDatas,
+      DICT_TYPE,
       // 遮罩层
       loading: true,
       // 导出遮罩层