css

src/components/menu.vue

@@ -277,7 +277,7 @@ export default {
     }
     }
     return {
     return {
       supplier_id: Number(localStorage.getItem('supplier_id')) || 0,
       supplier_id: Number(localStorage.getItem('supplier_id')) || 0,
-      seconds: 60,
+      seconds: 10,
       checked: false,
       checked: false,
       activeName: "all",
       activeName: "all",
       userinfo: {},
       userinfo: {},
@@ -395,7 +395,6 @@ export default {
         sys_id: 17//云芯系统
         sys_id: 17//云芯系统
       }).then((res) => {
       }).then((res) => {
         if (res.code === 0) {
         if (res.code === 0) {
-          Notification.closeAll();
           let htmlArr = [];
           let htmlArr = [];
           let data = JSON.parse(res.data.list[0].msg_data);
           let data = JSON.parse(res.data.list[0].msg_data);
           sessionStorage.removeItem('msg_id');
           sessionStorage.removeItem('msg_id');
@@ -410,8 +409,36 @@ export default {
           this.msg_id = res.data.list[0].id;//存储最新id
           this.msg_id = res.data.list[0].id;//存储最新id
           let has_more = data.has_more;//判断是否出现更多，样式有区别
           let has_more = data.has_more;//判断是否出现更多，样式有区别
           let html = '';
           let html = '';
+          let color_arr = [{
+            name: '询价',
+            value: '#409EFF'
+          }, {
+            name: '成单',
+            value: '#1969F9'
+          }, {
+            name: '退货',
+            value: '#FF870E'
+          }, {
+            name: '上架有效期',
+            value: '#FF0000'
+          }];
+          let cate_id = data.cate_id;
+          let colorStyle = '';
+          //定义颜色提醒
+          if (cate_id) {
+            if (cate_id == 6) {
+              colorStyle = 'color:' + color_arr[0].value;
+            } else if (cate_id == 7) {
+              colorStyle = 'color:' + color_arr[1].value;
+            } else if (cate_id == 8) {
+              colorStyle = 'color:' + color_arr[2].value;
+            } else if (cate_id == 9) {
+              colorStyle = 'color:' + color_arr[3].value;
+            }
+          }
+
           if (has_more) {
           if (has_more) {
-            html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a class="alink" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a><a style="margin-left: 8px" class="alink" target="_blank" href="' + data.has_more + '">更多>>></a></P>';
+            html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a class="alink" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a><a style="margin-left: 8px;" class="alink" target="_blank" href="' + data.has_more + '">更多>>></a></P>';
           } else {
           } else {
             html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a class="alink" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a></P>';
             html = '<P class="notify-text"><b>' + data.date + '</b><b>' + data.title + '</b><a class="alink" target="_blank" href="' + data.link + '">' + data.title_suffix + '</a></P>';
           }
           }
@@ -435,7 +462,6 @@ export default {
               that.countDown();//开启定时轮询
               that.countDown();//开启定时轮询
             }
             }
           });
           });
-
         } else {
         } else {
           this.$message({
           this.$message({
             message: res.msg,
             message: res.msg,
@@ -448,7 +474,8 @@ export default {
       this.timer = setInterval(() => {
       this.timer = setInterval(() => {
         this.seconds--;
         this.seconds--;
         if (this.seconds <= 0) {
         if (this.seconds <= 0) {
-          this.seconds = 60;
+          clearInterval(this.timer);
+          this.seconds = 10;
           this.getLatestMsg();
           this.getLatestMsg();
         }
         }
       }, 1000)
       }, 1000)

src/views/OrderTrack/invoice.vue

@@ -80,12 +80,14 @@
           <el-table-column label="质检信息">
           <el-table-column label="质检信息">
             <el-table-column prop="qc_type_val" label="质检结果" width="100" align="center">
             <el-table-column prop="qc_type_val" label="质检结果" width="100" align="center">
               <template slot-scope="scope">
               <template slot-scope="scope">
+                <template v-if="qc_type_val">
                   <span>{{ scope.row.qc_type_val }}</span>
                   <span>{{ scope.row.qc_type_val }}</span>
                   <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
                   <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
                     <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
                     <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
                     <div slot="content">{{ scope.row.qc_type_tips }}</div>
                     <div slot="content">{{ scope.row.qc_type_tips }}</div>
                   </el-tooltip>
                   </el-tooltip>
                 </template>
                 </template>
+              </template>
             </el-table-column>
             </el-table-column>
             <el-table-column prop="package" label="封装" width="100" align="center"></el-table-column>
             <el-table-column prop="package" label="封装" width="100" align="center"></el-table-column>
             <el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>
             <el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>