From ee2882cff02d3545b66c7591f88ed4800f730a9a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 21 五月 2025 10:00:17 +0800
Subject: [PATCH] 消息通知数据自动筛选

---
 src/components/view/b1-inspect-order-plan.vue |   13 ++++++++++++-
 src/components/view/notice-detail.vue         |   36 ++++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 39c53dc..1011779 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -425,6 +425,8 @@
     Inspection,
     Add
   },
+  props: ['entrustCodeNew', 'laboratoryNew'],
+
   data() {
     return {
       currentHistory: {},
@@ -1133,7 +1135,16 @@
         if (this.tabList.length > 0) {
           this.componentData.entity.sonLaboratory = this.tabList[0].value
         }
-        this.refreshTable()
+        if (this.entrustCodeNew) {
+          this.componentData.entity.entrustCode = this.entrustCodeNew
+
+        }
+        if (this.laboratoryNew) {
+          let index = this.tabList.findIndex(item => item.label == this.laboratoryNew)
+          this.componentData.entity.sonLaboratory = this.tabList[index].label
+          this.tabIndex = index;
+          this.refreshTable()
+        }
       })
     },
     selectAllByOne(row) {
diff --git a/src/components/view/notice-detail.vue b/src/components/view/notice-detail.vue
index 47320a7..9a79989 100644
--- a/src/components/view/notice-detail.vue
+++ b/src/components/view/notice-detail.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="notice-detail-page">
     <div class="notice-detail-head">
-      <h4 style="margin-bottom: 16px;text-align:left;" v-if="noticeInfo.theme">{{ noticeInfo.theme }} <el-tag style="margin-left: 10px;" :type="options.find(m=>m.value==noticeInfo.messageType).type" v-if="options.find(m=>m.value==noticeInfo.messageType)">{{ options.find(m=>m.value==noticeInfo.messageType).label }}</el-tag></h4>
+      <h4 style="margin-bottom: 16px;text-align:left;" v-if="noticeInfo.theme">{{ noticeInfo.theme }} <el-tag
+          style="margin-left: 10px;" :type="options.find(m => m.value == noticeInfo.messageType).type"
+          v-if="options.find(m => m.value == noticeInfo.messageType)">{{
+            options.find(m => m.value == noticeInfo.messageType).label }}</el-tag></h4>
       <p style="font-size: 12px;color: #999;margin-bottom: 20px;text-align:left;">
         <!-- <span>娑堟伅绫诲瀷锛氬鎵�&nbsp; </span> -->
         <span>鍙戦�佷汉锛歿{ noticeInfo.createUser }} </span>
@@ -16,8 +19,9 @@
       </div>
     </div>
     <div class="info-box" v-if="noticeInfo.jumpPath">
-      <component class="notice-content" :is="noticeInfo.jumpPath">
-		  </component>
+      <component class="notice-content" :is="noticeInfo.jumpPath" :entrustCodeNew="noticeInfo.entrustCode"
+        :laboratoryNew="noticeInfo.laboratory">
+      </component>
     </div>
   </div>
 </template>
@@ -36,12 +40,12 @@
 export default {
   components: comObj,
   data() {
-    return{
-      noticeInfo:{},
-      options:[]
+    return {
+      noticeInfo: {},
+      options: []
     }
   },
-  mounted(){
+  mounted() {
     this.noticeInfo = JSON.parse(localStorage.getItem("noticeInfo"));
     this.$bus.$on("change", (msg) => {
       this.noticeInfo = JSON.parse(msg);
@@ -49,7 +53,7 @@
     });
     this.getTypeDicts()
   },
-  methods:{
+  methods: {
     getTypeDicts() {
       this.$axios.post(this.$api.enums.selectEnumByCategory, {
         category: "娑堟伅绫诲瀷"
@@ -63,31 +67,35 @@
 </script>
 
 <style scoped>
-.notice-detail-page{
+.notice-detail-page {
   height: calc(100% - 30px);
   overflow-y: auto;
   padding: 16px 0;
 }
+
 .notice-detail-page::-webkit-scrollbar {
   width: 0;
 }
-.notice-detail-head{
+
+.notice-detail-head {
   background: #fff;
   border-radius: 3px;
   box-sizing: border-box;
   padding: 16px;
 }
-.info-box{
+
+.info-box {
   margin-top: 16px;
   width: 100%;
   box-sizing: border-box;
   padding: 8px 20px 20px;
-  background: rgba(0,0,0, 0.03);
+  background: rgba(0, 0, 0, 0.03);
   /* box-shadow: 0 0 10px 10px #fff; */
   border-radius: 4px;
   min-height: calc(100% - 192px - 22px);
 }
-.notice-detail-head-content div{
+
+.notice-detail-head-content div {
   border-radius: 8px;
   border: 1px solid #ccc;
   min-height: 60px;
@@ -97,7 +105,7 @@
   margin-top: 12px;
 }
 
-.notice-content{
+.notice-content {
   height: 600px;
 }
 </style>

--
Gitblit v1.9.3