Merge branch 'dev' into test

src/views/ecw/product/index.vue

@@ -236,15 +236,15 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('商品材质')" align="center" prop="materialType">
+      <el-table-column :label="$t('商品材质')" align="center">
         <template slot-scope="scope">
-          <span>{{ getMaterialTypeName(scope.row.materialType) }}</span>
+          <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="scope.row.materialType" />
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('包装要求')" align="center" prop="packaging">
+      <el-table-column :label="$t('包装要求')" align="center">
         <template slot-scope="scope">
-          <span>{{ getPackagingName(scope.row.packaging) }}</span>
+          <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="scope.row.packaging" />
         </template>
       </el-table-column>
 
@@ -638,10 +638,12 @@ import { uploadFile } from "@/api/infra/file";
 import ImageUpload from "@/components/ImageUpload";
 import PackagingType from "@/views/ecw/channel/componrnts/packaging-type.vue";
 import ProductDialog from "@/views/ecw/product/product-dialog.vue";
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "EcwProductIndex",
   components: {
+    Template,
     ProductDialog,
     PackagingType,
     ImageUpload,
@@ -659,12 +661,7 @@ export default {
       attrList: [],
       //类型列表
       typeList: [],
-      //材质列表
-      materialList: [],
-      //包装列表
-      packagingList: [],
-      //货柜位置
-      locationList: [],
+
 
       // 遮罩层
       loading: true,
@@ -741,10 +738,12 @@ export default {
       CommonStatusEnum: CommonStatusEnum,
       AuditStatusEnum: AuditStatusEnum,
       statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
       auditStatusDictDatas: getDictDatas(DICT_TYPE.AUDIT_STATUS),
+      // 材质列表
       materialList: getDictDatas(DICT_TYPE.ECW_PRODUCT_MATERIAL),
-      packagingList: getDictDatas(DICT_TYPE.ECW_PACKAAGING_TYPE),
+      //包装列表
+      packagingList: getDictDatas(DICT_TYPE.ECW_PACKAGING_TYPE),
+      //货柜位置
       locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
       preferentialList: [],
       exceptionProductId: 0, //新增商品异常传的id