Merge branch 'master' of http://116.204.116.5:3000/zzw/cbjsxt-front-master

src/components/task/taskInfo.vue

@@ -1092,15 +1092,17 @@
           this.loading = true
           const params = {
             taskId: this.currentTaskInfo.taskId,
-            currentPage: this.messageNoticePagination.currentPage,
+            auditedUnitId: this.currentTaskInfo.auditedUnitId,
+            projectId: this.currentTaskInfo.projectId,
+            pageNum: this.messageNoticePagination.currentPage,
             pageSize: this.messageNoticePagination.pageSize,
           }
           const res = await sendMessage(params)
 
           console.log('消息通知接口返回:', res)
-          if (res && res.code === 200 && res.value && res.value.value) {
-            this.formData.messageNotice = res.value.value.records || []
-            this.messageNoticePagination.total = res.value.value.total || 0
+          if (res && res.code === 200 && res.value) {
+            this.formData.messageNotice = res.value.records || []
+            this.messageNoticePagination.total = res.value.total || 0
           } else {
             this.formData.messageNotice = []
             this.messageNoticePagination.total = 0

src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -277,7 +277,11 @@
         </el-tab-pane>
 
         <!-- 监审文书 -->
-        <el-tab-pane label="监审文书" name="auditDocument">
+        <el-tab-pane
+          v-if="currentNode !== 'clcs' && currentNode !== 'jtsy'"
+          label="监审文书"
+          name="auditDocument"
+        >
           <div style="font-size: 18px">
             <strong>说明：</strong>
             被监审单位接收《送达回证》后需签名并反馈监审主体。
@@ -364,8 +368,11 @@
         </el-tab-pane>
 
         <!-- 报送资料 -->
-        <!-- <el-tab-pane label="报送资料" name="dataRequirements"></el-tab-pane> -->
-        <el-tab-pane label="报送资料" name="dataRequirements">
+        <el-tab-pane
+          v-if="currentNode === 'clcs'"
+          label="报送资料"
+          name="dataRequirements"
+        >
           <el-button
             type="primary"
             :disabled="isViewMode"
@@ -522,7 +529,11 @@
           </el-table>
         </el-tab-pane>
         <!-- 成本调查表 -->
-        <el-tab-pane label="成本调查表" name="costSurvey">
+        <el-tab-pane
+          v-if="currentNode === 'clcs'"
+          label="成本调查表"
+          name="costSurvey"
+        >
           <el-table
             style="width: 100%; margin-top: 20px"
             :data="paginatedCostSurveyData"
@@ -661,7 +672,11 @@
         </el-tab-pane>
 
         <!-- 监审意见 -->
-        <el-tab-pane v-if="tabVisiable" label="监审意见" name="auditOpinion">
+        <el-tab-pane
+          v-if="currentNode === 'jtsy'"
+          label="监审意见"
+          name="auditOpinion"
+        >
           <div class="cost-supervision-container">
             <!-- 成本监审意见部分 -->
             <div class="cost-opinion-section">
@@ -748,7 +763,11 @@
         </el-tab-pane>
 
         <!-- 消息通知 -->
-        <el-tab-pane label="消息通知" name="messageNotice">
+        <el-tab-pane
+          v-if="currentNode !== 'clcs' && currentNode !== 'jtsy'"
+          label="消息通知"
+          name="messageNotice"
+        >
           <el-table
             style="width: 100%; margin-top: 20px"
             border
@@ -967,6 +986,7 @@
         pageTitle: '立项信息',
         projectId: '', // 项目ID
         taskId: '', // 任务ID
+        auditedUnitId: '', // 被监审单位ID
         // 当前激活的标签页
         activeTab: 'projectInfo',
         // 加载状态管理
@@ -985,7 +1005,7 @@
         },
         // 消息通知分页相关
         messageNoticePagination: {
-          currentPage: 1,
+          pageNo: 1,
           pageSize: 10,
           total: 0,
         },
@@ -1332,6 +1352,7 @@
       this.projectId = this.$route.query.info.projectId
       this.taskId = this.$route.query.info.userTask.id
       this.tabCheck = this.$route.query.info.status
+      this.auditedUnitId = this.$route.query.info.auditedUnitId
       if (this.tabCheck === 'jtsy') {
         this.tabVisiable = false
       }
@@ -1496,15 +1517,17 @@
       getSendMessage() {
         const params = {
           taskId: this.taskId,
-          currentPage: this.messageNoticePagination.currentPage,
+          auditedUnitId: this.auditedUnitId,
+          projectId: this.projectId,
+          pageNum: this.messageNoticePagination.currentPage,
           pageSize: this.messageNoticePagination.pageSize,
         }
         sendMessage(params)
           .then((res) => {
             console.log('消息通知', res)
-            if (res && res.code === 200 && res.value && res.value.value) {
-              this.formData.messageNoticeData = res.value.value.records || []
-              this.messageNoticePagination.total = res.value.value.total || 0
+            if (res && res.code === 200 && res.value) {
+              this.formData.messageNoticeData = res.value.records || []
+              this.messageNoticePagination.total = res.value.total || 0
             } else {
               this.formData.messageNoticeData = []
               this.messageNoticePagination.total = 0