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

src/utils/dict.js

@@ -57,6 +57,7 @@ export const DICT_TYPE = {
   PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
   ECW_BANK_TYPE: 'bank_type', // 银行账号类型
   ECW_DATA_SOURCE: 'data_source', // 数据来源
+  ECW_REGION_TYPE: 'region_trade_type', // 区域类型
 }
 
 /**

src/views/ecw/region/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="中文名称" prop="titleZh">
-        <el-input v-model="queryParams.titleZh" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.titleZh" placeholder="请输入中文名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="英文名称" prop="titleEn">
-        <el-input v-model="queryParams.titleEn" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.titleEn" placeholder="请输入英文名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="语言" prop="language">
         <el-input v-model="queryParams.language" placeholder="请输入语言" clearable @keyup.enter.native="handleQuery"/>
@@ -15,6 +15,12 @@
           <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+          <el-option v-for="dict in regionTypeDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+        </el-select>
+      </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>
@@ -34,11 +40,16 @@
   <!--列表-->
     <el-table v-if="refreshTable" v-loading="loading" :data="regionList" row-key="id" :default-expand-all="isExpandAll"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column prop="titleZh" label="中文名称" width="260"></el-table-column>
-      <el-table-column prop="titleEn" label="英文名称" width="260"></el-table-column>
+      <el-table-column prop="titleZh" label="中文名称" width="200"></el-table-column>
+      <el-table-column prop="titleEn" label="英文名称" width="200"></el-table-column>
       <el-table-column prop="shortName" label="简称"  width="120"/>
-      <el-table-column label="语言" align="center" prop="language" />
-      <el-table-column prop="sort" label="排序" width="200"></el-table-column>
+      <el-table-column label="语言" width="120" align="center" prop="language" />
+      <el-table-column prop="sort" label="排序" width="50"></el-table-column>
+      <el-table-column prop="type" label="类型" width="120">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.ECW_REGION_TYPE" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
 <!--      <el-table-column prop="parentId" label="父节点" width="200"></el-table-column>-->
       <el-table-column prop="status" label="状态" width="100">
 <!--        <template slot-scope="scope">-->
@@ -86,6 +97,11 @@
           <el-form-item label="语言" prop="language">
             <el-input v-model="form.language" placeholder="请输入语言" />
           </el-form-item>
+          <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择">
+            <el-option v-for="dict in regionTypeDatas" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
+          </el-form-item>
           <el-form-item label="显示顺序" prop="sort">
             <el-input v-model="form.sort" placeholder="请输入显示顺序" />
           </el-form-item>
@@ -176,7 +192,8 @@ export default {
       // 枚举
       CommonStatusEnum: CommonStatusEnum,
       // 数据字典
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
+      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
+      regionTypeDatas: getDictDatas(DICT_TYPE.ECW_REGION_TYPE)
     };
   },
   created() {