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

src/api/ecw/node.js

@@ -34,6 +34,15 @@ export function getNode(id) {
   })
 }
 
+// 获得服务网点分页
+export function getNodeList(query) {
+  return request({
+    url: '/ecw/node/list',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获得服务网点分页
 export function getNodePage(query) {
   return request({

src/router/index.js

@@ -91,6 +91,16 @@ export const constantRoutes = [
         meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'}
       }
     ]
+  }, {
+    path: '/c',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: 'ecw/customer/edit/:customerId(\\d+)',
+      component: (resolve) => require(['@/views/ecw/customer/edit'], resolve),
+      name: 'Data',
+      meta: {title: '字典数据', icon: '', activeMenu: '/system/dict'}
+    }]
   }, {
     path: '/job',
     component: Layout,

src/views/ecw/customer/view.vue

+<template>
+  <view>
+
+    <el-row type="flex" style="margin-top: 15px;margin-bottom: 15px" justify="center">
+      <el-col  :xs="24" :sm="24" :md="24" :lg="20" :xl="16">
+        <h2></h2>
+        <el-row :gutter="10">
+          <el-col>
+            <h2>查看</h2>
+          </el-col>
+          <el-col>
+            <el-button type="primary">主要按钮</el-button>
+            <el-button type="primary">主要按钮</el-button>
+            <el-button type="primary">主要按钮</el-button>
+            <el-button type="primary">主要按钮</el-button>
+            <el-button type="primary">主要按钮</el-button>
+            <el-button type="danger">危险按钮</el-button>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'view'
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ecw/productBrank/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <!-- 搜索工作栏 -->
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="品牌中文标题" prop="titleZh">
         <el-input v-model="queryParams.titleZh" placeholder="请输入品牌中文标题" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -20,7 +20,7 @@
 <!--      </el-form-item>-->
       <el-form-item label="是否备案" prop="filing">
         <el-select v-model="queryParams.filing" placeholder="请选择是否备案" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
+          <el-option v-for="dict in getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
                      :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -79,8 +79,8 @@
                 @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="500px" 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="请输入品牌中文标题" />
         </el-form-item>
@@ -99,11 +99,31 @@
 
         <el-form-item label="是否备案" prop="filing">
           <el-select v-model="form.filing" placeholder="请选择是否备案">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
+            <el-option v-for="dict in getDictDatas(DICT_TYPE.BRAND_REG_TYPE)"
                        :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
       </el-form>
+
+      <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>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -124,6 +144,8 @@ export default {
   },
   data() {
     return {
+      getDictDatas,
+      DICT_TYPE,
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -154,6 +176,7 @@ export default {
       rules: {
       },
       recordStatus: getDictDatas(DICT_TYPE.BRAND_REG_TYPE),
+      brands: [{name: '', type: ''}]
     };
   },
   created() {