shiyanyu преди 1 месец
родител
ревизия
3c318016b2
променени са 2 файла, в които са добавени 22 реда и са изтрити 17 реда
  1. 20 15
      src/components/task/taskInfo.vue
  2. 2 2
      src/views/EntDeclaration/auditTaskManagement/components/ProjectInfoTab.vue

+ 20 - 15
src/components/task/taskInfo.vue

@@ -198,7 +198,7 @@
               </el-form-item>
               <el-form-item label="监审任务负责人:">
                 <el-select
-                  v-model="formData.basicInfo.projectMembers"
+                  v-model="formData.basicInfo.leaderId"
                   placeholder="请选择负责人"
                   style="width: 100%"
                   :disabled="isViewMode"
@@ -213,7 +213,7 @@
               </el-form-item>
               <el-form-item label="监审任务组成员:">
                 <el-select
-                  v-model="formData.basicInfo.leaderId"
+                  v-model="formData.basicInfo.projectMembers"
                   placeholder="请选择成员"
                   multiple
                   style="width: 100%"
@@ -309,11 +309,7 @@
         </el-tab-pane>
 
         <!-- 报送资料 -->
-        <el-tab-pane
-          v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
-          label="报送资料"
-          name="dataRequirements"
-        >
+        <el-tab-pane label="报送资料" name="dataRequirements">
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               border
@@ -496,11 +492,7 @@
         </el-tab-pane>
 
         <!-- 成本调查表 -->
-        <el-tab-pane
-          v-if="currentNode === 'clcs' || currentNode === 'tjcl'"
-          label="成本调查表"
-          name="costSurvey"
-        >
+        <el-tab-pane label="成本调查表" name="costSurvey">
           <div v-loading="loading" element-loading-text="加载中...">
             <el-table
               style="width: 100%"
@@ -1051,12 +1043,24 @@
             }
 
             // 处理监审任务组成员(可能是字符串或数组)
+            let auditTeamMembers = []
+            if (data.projectMembers) {
+              if (typeof data.projectMembers === 'string') {
+                auditTeamMembers = data.projectMembers
+                  .split(',')
+                  .filter(Boolean)
+              } else if (Array.isArray(data.projectMembers)) {
+                auditTeamMembers = data.projectMembers
+              }
+            }
+
+            // 处理监审任务组成员(可能是字符串或数组)
             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
+              } else if (Array.isArray(data.leaderId)) {
+                leaderId = data.leaderId[0] || ''
               }
             }
 
@@ -1078,7 +1082,8 @@
               isEmergency:
                 data.isEmergency !== undefined ? data.isEmergency : 1,
               establishmentReason: data.establishmentReason || '',
-              projectMembers: data.projectMembers || '',
+              // projectMembers: data.projectMembers || '',
+              projectMembers: auditTeamMembers,
               leaderId: leaderId,
               expertStr: data.expertStr || '',
               plannedAuditStartDate: data.plannedAuditStartDate || '',

+ 2 - 2
src/views/EntDeclaration/auditTaskManagement/components/ProjectInfoTab.vue

@@ -178,7 +178,7 @@
     </el-form-item>
     <el-form-item label="监审任务负责人:">
       <el-select
-        v-model="localFormData.projectMembers"
+        v-model="localFormData.leaderId"
         placeholder="请选择负责人"
         style="width: 100%"
         :disabled="isViewMode"
@@ -193,7 +193,7 @@
     </el-form-item>
     <el-form-item label="监审任务组成员:">
       <el-select
-        v-model="localFormData.leaderId"
+        v-model="localFormData.auditTeamMembers"
         placeholder="请选择成员"
         multiple
         style="width: 100%"