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

src/components/task/taskInfo.vue

@@ -155,7 +155,7 @@
                     >
                       <el-date-picker
                         v-model="year.value"
-                        style="width: 82%"
+                        style="width: 82%; margin-bottom: 5px"
                         type="year"
                         placeholder="请选择年份"
                         format="yyyy"
@@ -198,7 +198,7 @@
               </el-form-item>
               <el-form-item label="监审任务负责人：">
                 <el-select
-                  v-model="formData.basicInfo.auditGroup"
+                  v-model="formData.basicInfo.projectMembers"
                   placeholder="请选择负责人"
                   style="width: 100%"
                   :disabled="isViewMode"
@@ -213,7 +213,7 @@
               </el-form-item>
               <el-form-item label="监审任务组成员：">
                 <el-select
-                  v-model="formData.basicInfo.auditTeamMembers"
+                  v-model="formData.basicInfo.leaderId"
                   placeholder="请选择成员"
                   multiple
                   style="width: 100%"
@@ -259,16 +259,7 @@
         </el-tab-pane>
 
         <!-- 监审文书 -->
-        <el-tab-pane
-          v-if="
-            currentNode !== 'clcs' &&
-            currentNode !== 'jtsy' &&
-            currentNode !== 'yjfk' &&
-            currentNode === 'tjcl'
-          "
-          label="监审文书"
-          name="auditDocument"
-        >
+        <el-tab-pane label="监审文书" name="auditDocument">
           <div v-loading="loading" element-loading-text="加载中...">
             <div style="font-size: 14px; margin-bottom: 15px; color: #606266">
               <strong>说明：</strong>
@@ -393,7 +384,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="isUploaded"
+                prop="isUpload"
                 label="是否上传"
                 width="110"
                 align="center"
@@ -401,7 +392,9 @@
                 <template slot-scope="scope">
                   <span v-if="!scope.row.isCategoryHeader">
                     <span
-                      v-if="scope.row.isUploaded === true"
+                      v-if="
+                        scope.row.isUpload === 1 || scope.row.isUpload === '1'
+                      "
                       style="color: #67c23a"
                     >
                       已上传
@@ -486,10 +479,10 @@
                   <span
                     :style="{
                       color:
-                        scope.row.isUploaded === true ? '#67c23a' : '#f56c6c',
+                        scope.row.isUpload === true ? '#67c23a' : '#f56c6c',
                     }"
                   >
-                    {{ scope.row.isUploaded === true ? '已上传' : '未上传' }}
+                    {{ scope.row.isUpload === true ? '已上传' : '未上传' }}
                   </span>
                 </template>
               </el-table-column>
@@ -597,16 +590,7 @@
         </el-tab-pane>
 
         <!-- 消息通知 -->
-        <el-tab-pane
-          v-if="
-            currentNode !== 'clcs' &&
-            currentNode === 'tjcl' &&
-            currentNode !== 'jtsy' &&
-            currentNode !== 'yjfk'
-          "
-          label="消息通知"
-          name="messageNotice"
-        >
+        <el-tab-pane label="消息通知" name="messageNotice">
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               style="width: 100%"
@@ -755,9 +739,9 @@
             needHearing: 1,
             isEmergency: 1,
             establishmentReason: '',
-            auditGroup: '',
+            projectMembers: '',
             auditGroupName: '',
-            auditTeamMembers: [],
+            leaderId: [],
             auditTeamMembersText: '',
             expertStr: '',
             plannedAuditStartDate: '',
@@ -998,14 +982,12 @@
             }
 
             // 处理监审任务组成员（可能是字符串或数组）
-            let auditTeamMembers = []
-            if (data.auditTeamMembers) {
-              if (typeof data.auditTeamMembers === 'string') {
-                auditTeamMembers = data.auditTeamMembers
-                  .split(',')
-                  .filter(Boolean)
-              } else if (Array.isArray(data.auditTeamMembers)) {
-                auditTeamMembers = data.auditTeamMembers
+            let leaderId = []
+            if (data.leaderId) {
+              if (typeof data.leaderId === 'string') {
+                leaderId = data.leaderId.split(',').filter(Boolean)
+              } else if (Array.isArray(data.leaderId)) {
+                leaderId = data.leaderId
               }
             }
 
@@ -1027,8 +1009,8 @@
               isEmergency:
                 data.isEmergency !== undefined ? data.isEmergency : 1,
               establishmentReason: data.establishmentReason || '',
-              auditGroup: data.auditGroup || '',
-              auditTeamMembers: auditTeamMembers,
+              projectMembers: data.projectMembers || '',
+              leaderId: leaderId,
               expertStr: data.expertStr || '',
               plannedAuditStartDate: data.plannedAuditStartDate || '',
               plannedAuditEndDate: data.plannedAuditEndDate || '',

src/views/EntDeclaration/auditTaskManagement/components/DataRequirementsTab.vue

@@ -66,14 +66,19 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="isUploaded"
+        prop="isUpload"
         label="是否上传"
         width="110"
         align="center"
       >
         <template slot-scope="scope">
           <span v-if="!scope.row.isCategoryHeader">
-            <span v-if="scope.row.isUploaded === true">已上传</span>
+            <span
+              v-if="scope.row.isUpload === 1 || scope.row.isUpload === '1'"
+              style="color: #67c23a"
+            >
+              已上传
+            </span>
             <span v-else class="text-danger">未上传</span>
           </span>
         </template>
@@ -106,7 +111,7 @@
           <template v-if="!scope.row.isCategoryHeader">
             <template v-if="scope.row.formatRequired !== '3'">
               <el-button
-                v-if="scope.row.isUploaded === true"
+                v-if="scope.row.isUpload === 1 || scope.row.isUpload === '1'"
                 type="text"
                 size="small"
                 @click="$emit('handleFileView', scope.row)"
@@ -114,7 +119,7 @@
                 查看
               </el-button>
               <el-button
-                v-if="scope.row.isUploaded === true"
+                v-if="scope.row.isUpload === 1 || scope.row.isUpload === '1'"
                 type="text"
                 size="small"
                 @click="$emit('handleFileDownload', scope.row)"
@@ -122,7 +127,7 @@
                 下载
               </el-button>
               <el-button
-                v-if="scope.row.isUploaded === false"
+                v-if="scope.row.isUpload === 0 || scope.row.isUpload === '0'"
                 type="text"
                 size="small"
                 :disabled="isViewMode"
@@ -133,7 +138,7 @@
             </template>
             <template v-if="scope.row.formatRequired == '3'">
               <el-button
-                v-if="scope.row.isUploaded === true"
+                v-if="scope.row.isUpload === 1 || scope.row.isUpload === '1'"
                 type="text"
                 size="small"
                 @click="$emit('handleTemplateDownload', scope.row)"
@@ -141,7 +146,7 @@
                 模版下载
               </el-button>
               <el-button
-                v-if="scope.row.isUploaded === false"
+                v-if="scope.row.isUpload === 0 || scope.row.isUpload === '0'"
                 type="text"
                 size="small"
                 :disabled="isViewMode"

src/views/EntDeclaration/auditTaskManagement/components/ProjectInfoTab.vue

@@ -127,7 +127,7 @@
           >
             <el-date-picker
               v-model="year.value"
-              style="width: 82%"
+              style="width: 82%; margin-bottom: 5px"
               type="year"
               placeholder="请选择年份"
               format="yyyy"
@@ -178,7 +178,7 @@
     </el-form-item>
     <el-form-item label="监审任务负责人：">
       <el-select
-        v-model="localFormData.auditGroup"
+        v-model="localFormData.projectMembers"
         placeholder="请选择负责人"
         style="width: 100%"
         :disabled="isViewMode"
@@ -193,7 +193,7 @@
     </el-form-item>
     <el-form-item label="监审任务组成员：">
       <el-select
-        v-model="localFormData.auditTeamMembers"
+        v-model="localFormData.leaderId"
         placeholder="请选择成员"
         multiple
         style="width: 100%"
@@ -289,8 +289,17 @@
         handler(newVal) {
           // 标记为内部更新，避免触发 localFormData 的 watch
           this.isInternalUpdate = true
-          // 深拷贝 formData
+          // 处理监审任务组成员（可能是字符串或数组）
+          let leaderId = []
+          if (newVal && newVal.leaderId) {
+            if (typeof newVal.leaderId === 'string') {
+              leaderId = newVal.leaderId.split(',').filter(Boolean)
+            } else if (Array.isArray(newVal.leaderId)) {
+              leaderId = newVal.leaderId
+            }
+          }
           this.localFormData = JSON.parse(JSON.stringify(newVal))
+          this.localFormData.leaderId = leaderId
           this.$nextTick(() => {
             this.isInternalUpdate = false
           })

src/views/EntDeclaration/auditTaskManagement/taskFillIn.vue

@@ -61,16 +61,7 @@
           </el-tab-pane>
 
           <!-- 监审文书 -->
-          <el-tab-pane
-            v-if="
-              currentNode !== 'clcs' &&
-              currentNode !== 'jtsy' &&
-              currentNode !== 'yjfk' &&
-              currentNode === 'tjcl'
-            "
-            label="监审文书"
-            name="auditDocument"
-          >
+          <el-tab-pane label="监审文书" name="auditDocument">
             <audit-document-tab
               :form-data="formData.auditDocument"
               :is-view-mode="isViewMode"
@@ -133,16 +124,7 @@
           </el-tab-pane>
 
           <!-- 消息通知 -->
-          <el-tab-pane
-            v-if="
-              currentNode !== 'clcs' &&
-              currentNode === 'tjcl' &&
-              currentNode !== 'jtsy' &&
-              currentNode !== 'yjfk'
-            "
-            label="消息通知"
-            name="messageNotice"
-          >
+          <el-tab-pane label="消息通知" name="messageNotice">
             <message-notice-tab
               :form-data="formData.messageNotice"
               :pagination="messageNoticePagination"