merge

src/components/common/fileTable/fileTypeChange.vue

@@ -42,8 +42,12 @@ const changeFileType = () => {
     id: props.id,
     fileType: Number(fileType.value),
   };
-  dataUpdateFileApi(params).then(() => {
-    ElMessage.success('修改文件类型成功');
+  dataUpdateFileApi(params).then((res: any) => {
+    if (res.code === 200) {
+      ElMessage.success('修改文件类型成功');
+    } else {
+      fileType.value = props.modelValue === null ? '' : String(props.modelValue);
+    }
   });
 };
 </script>

src/components/project/projectInfoDialog.vue

@@ -237,6 +237,8 @@ const initTableForm = () => {
       // tableFormRef.value.resetFun();
       editRowInfo.value = {};
       // setEditForm({ exeStatus: PROJECT_EXE_STATUS_CODE.NOT_STARTED });
+      editRowInfo.value.projectSource = 'EP';
+      projectInfo.projectSource = 'EP';
     } else {
       // setEditForm({ ...props.currentRow });
       statusList = getProjectExeStatus(projectInfo.exeStatus as PROJECT_EXE_STATUS_CODE);

src/views/competenceCenter/condition/components/addApprove.vue

@@ -23,7 +23,11 @@
           prop="approveTemplateId"
           v-if="form.bApprove === true"
         >
-          <ApproveList v-model="form.approveTemplateId" @change="onApproveChangeFun" />
+          <ApproveList
+            v-model="form.approveTemplateId"
+            @change="onApproveChangeFun"
+            :attrs="{ moduleCode: 'TASK_POOL_APPROVAL' }"
+          />
         </el-form-item>
         <el-form-item :label="$t('工况库.升版')" prop="bNewVersion">
           <el-radio-group v-model="form.bNewVersion" :disabled="props.isInitial">

src/views/task/projectDetail/components/statisticAnalysis.vue

@@ -130,13 +130,13 @@ watchEffect(() => {
 
 // 进度状态颜色列表：已驳回、未开始、进行中、已完成、已暂停、已关闭、已延期
 const statusColorList = [
-  'rgb(200, 201, 204)', // 未开始
-  getThemeColor('--el-color-primary'), // 进行中
-  getThemeColor('--el-color-danger'), // 已驳回
-  getThemeColor('--el-color-success'), // 已完成
-  getThemeColor('--el-color-warning'), // 已暂停
-  getThemeColor('--el-color-info'), // 已关闭
-  'rgb(248, 152, 152)', // 已延期
+  getThemeColor('--el-color-danger'),
+  'rgb(200, 201, 204)',
+  getThemeColor('--el-color-primary'),
+  getThemeColor('--el-color-success'),
+  getThemeColor('--el-color-warning'),
+  'rgb(222, 223, 224)',
+  'rgb(250, 182, 182)',
   'rgb(179, 225, 157)', // 已闭环
 ];