Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/LiaoNingDangAn

src/views/productsMsg/components/cosmeticsArchives.vue

@@ -98,7 +98,7 @@
               />
               <el-table-column label="产品名称" align="center">
                 <template slot-scope="scope">
-                  {{ scope.row.mc || scope.row.cpmc }}
+                  {{ scope.row.cpmc }}
                 </template>
               </el-table-column>
               <el-table-column :label="A2" align="center" width="230">
@@ -108,7 +108,7 @@
               </el-table-column>
               <el-table-column :label="A3" align="center" width="240">
                 <template slot-scope="scope">
-                  {{ scope.row.qy || scope.row.sf }}
+                  {{ scope.row.qymc || scope.row.sf }}
                 </template>
               </el-table-column>
               <el-table-column