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

src/views/ecw/channel/index.vue

@@ -81,18 +81,18 @@
       <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
       <el-table-column :label="$t('类型编码')" align="center" prop="typeNumber" />-->
       <!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
-      <el-table-column :label="$t('仓库名')" align="center" prop="warehouseNameList" width="180">
-       <template slot-scope="scope">
-       <el-scrollbar style="margin-right: 6px;">
-           <div class="left">
-          <el-tag v-for="warehouseName in scope.row.warehouseNameList"
-             :key="warehouseName.index">
-             <span>{{warehouseName}}</span>
-           </el-tag>
-          </div>
-       </el-scrollbar>
-       </template>
-      </el-table-column>
+<!--      <el-table-column :label="$t('仓库名')" align="center" prop="warehouseNameList" width="180">-->
+<!--       <template slot-scope="scope">-->
+<!--       <el-scrollbar style="margin-right: 6px;">-->
+<!--           <div class="left">-->
+<!--          <el-tag v-for="warehouseName in scope.row.warehouseNameList"-->
+<!--             :key="warehouseName.index">-->
+<!--             <span>{{warehouseName}}</span>-->
+<!--           </el-tag>-->
+<!--          </div>-->
+<!--       </el-scrollbar>-->
+<!--       </template>-->
+<!--      </el-table-column>-->
       <el-table-column :label="$t('简码')" align="center" prop="code" />
       <el-table-column :label="$t('排序')" align="center" prop="sort" />
       <el-table-column :label="$t('快递公司')" align="center" prop="companyName" />