Merge branch 'lijinlong' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/volunteer-pc into dev

src/views/volunteer/userbq/dictGl/index.vue

@@ -110,14 +110,20 @@
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+          <router-link :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId" class="link-type">
+            <span>{{ scope.row.dictName }}</span>
+          </router-link>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <router-link :to="'/volunteer/zyzsjgl/zdgl/' + scope.row.dictId" class="link-type">
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>