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

src/views/productsMsg/components/cosmeticsArchives.vue

@@ -108,7 +108,7 @@
               </el-table-column>
               <el-table-column :label="A3" align="center" width="240">
                 <template slot-scope="scope">
-                  {{ scope.row.qymc || scope.row.sf }}
+                  {{ scope.row.qymc || scope.row.sf || scope.row.zcr }}
                 </template>
               </el-table-column>
               <el-table-column
@@ -153,6 +153,7 @@
 <script>
 import { download, dchzpsj } from "../../../api/archives/updata";
 import { Notification, MessageBox, Message, Loading } from "element-ui";
+import logVue from '../../monitor/job/log.vue';
 export default {
   components: {},
   data() {
@@ -286,6 +287,7 @@ export default {
     },
     //去内嵌页面
     toDetail(e) {
+      console.log(e);
       let data = "";
       if (this.types == "1") {
         data = e.bah;