事件换行 推演任务展示 文件git添加

src/components/Components/WangEditor.vue

@@ -41,14 +41,26 @@
       },
       // 监听禁用状态变化
       disabled(newVal) {
+        console.log("监听便-----")
         if (this.editor) {
-          newVal ? this.editor.disable() : this.editor.enable();
+          console.log(newVal)
+          if (newVal){
+            this.editor.disable()
+            console.log("禁用成功")
+          }else {
+            this.editor.enable();
+          }
+
+        }else{
+          console.log("weizhao放到")
         }
       },
     },
     mounted() {
       // 初始化编辑器
-      this.initEditor();
+      this.$nextTick(()=>{
+        this.initEditor();
+      })
     },
     beforeDestroy() {
       // 销毁编辑器，释放资源
@@ -59,6 +71,7 @@
     },
     methods: {
       initEditor() {
+        console.log("初始化------",this.disabled)
         // 创建编辑器实例
         this.editor = new E(this.$refs.editor);
 
@@ -114,10 +127,7 @@
           this.$emit("change", html); // 触发change事件
         };
 
-        // 如果需要禁用状态
-        if (this.disabled) {
-          this.editor.config.readOnly = true;
-        }
+
 
         // 初始化编辑器
         this.editor.create();
@@ -126,6 +136,13 @@
         if (this.value) {
           this.editor.txt.html(this.value);
         }
+
+        // 如果需要禁用状态
+        if (this.disabled) {
+          this.editor.config.readOnly = true;
+          this.editor.disable()
+          console.log("禁用中---")
+        }
       },
     },
   };

src/views/planAndDeduction/childsTask/index.vue

@@ -603,7 +603,7 @@ export default {
     },
     async handleQuery() {
       const params = {
-        subTaskId_EQ:this.taskId,
+        taskId_EQ:this.taskId,
         subTaskName_LIKE:this.queryForm.name,
         subTaskType_EQ:this.queryForm.taskType,
         subTaskTime_LIKE:this.queryForm.taskTime,

src/views/planningSchem/comprehensive/components/associationTask.vue

@@ -187,7 +187,7 @@ export default {
     },
     async handleQuerySubPlan(plan){
       const params = {
-        subTaskId_EQ:plan.id,
+        taskId_EQ:plan.id,
         pageNo:1,
         pageSize:9999
       }
@@ -200,13 +200,21 @@ export default {
       return 'info';
     },
     back() {
-      this.$router.push({path: '/scheme/comprehensive'});
+      setTimeout(() => {
+        this.$router.push({ path: '/scheme/comprehensive' });
+        this.isReturning = false;
+      }, 300);
     },
-    confirmSelection() {
+    async confirmSelection() {
       // 可以在这里添加跳转或其他处理逻辑
-      schemeChapterInsertPlan({taskId:this.selectedPlan.id,subTaskId:this.selectedSubPlan.id})
-      this.$message.success('新增方案成功')
-      this.back()
+      try{
+        await schemeChapterInsertPlan({taskId:this.selectedPlan.id,subTaskId:this.selectedSubPlan.id})
+        this.$message.success('新增方案成功')
+        this.back()
+      }catch (e){
+        console.log(e)
+      }
+
     }
   }
 };

src/views/programPlanning/collaborativePlanning/CollaborativeCard.vue

@@ -84,7 +84,7 @@
             {{ plan.okStatus }}
           </el-tag>
         </div>
-        <div class="info-row">
+<!--        <div class="info-row">
           <span class="info-label dark-label mr-2">
             编制状态:
           </span>
@@ -96,7 +96,7 @@
           >
             {{ plan.compilingStatus }}
           </el-tag>
-        </div>
+        </div>-->
       </div>
     </div>
 

src/views/programPlanning/collaborativePlanning/collaborativeCreate_CL.vue

@@ -480,6 +480,12 @@ export default {
     }
   },
   methods: {
+    handleQuestion(){
+
+    },
+    qaMessages(){
+
+    },
     async fetchData(){
       await getSynergismScheme({id:this.planInfo.id}).then((res)=>{
         this.schemeInfo = res.data;
@@ -507,6 +513,9 @@ export default {
       } catch (err) {
         console.error('获取失败:', err)
       }
+    },
+    selectTemplate(){
+
     },
     handleUse(plan) {
       // 执行“使用”逻辑