humingbo 1 год назад
Родитель
Сommit
603f748ff2
2 измененных файлов с 17 добавлено и 11 удалено
  1. 17 10
      src/views/enforceflow/enforceflow.vue
  2. 0 1
      src/views/meeting/weeklyRecords.vue

+ 17 - 10
src/views/enforceflow/enforceflow.vue

@@ -292,7 +292,7 @@
                :close-on-click-modal="false" @click="enforceManageDialog">
       <el-steps :active="maxStep" finish-status="success">
         <el-badge is-dot class="item" :hidden="elBadgeForm.elBadge1"></el-badge>
-        <el-step @click.native="on_click(1)" title="项目启动会" :class="stepClass"/>
+        <el-step @click.native="on_click(1)" title="项目启动会"/>
         <el-badge is-dot class="item" :hidden="elBadgeForm.elBadge2"></el-badge>
         <el-step @click.native="on_click(2)" title="发货"/>
         <el-badge is-dot class="item" :hidden="elBadgeForm.elBadge3"></el-badge>
@@ -639,7 +639,8 @@ export default {
   watch: {
     filterText(val) {
       this.$refs.dept1.filter(val);
-    }
+    },
+    immediate: true
   },
   data() {
     return {
@@ -983,7 +984,7 @@ export default {
       this.enforceManageVisble = false
     },
     openEnforceManageDialog(row) {
-      this.enforceManageVisble = true
+
       this.enforceFlowId = row.id
       this.enforceFlowTitle = row.name + "实施流程明细"
       let step=row.act.step
@@ -993,6 +994,7 @@ export default {
       }
       this.enforceDetail = row
       this.on_click(step)
+      this.enforceManageVisble = true
 
     },
     createwangeditor() {
@@ -1057,8 +1059,6 @@ export default {
       let dot = e;
       //判断一下当前最大流程
       let maxStep=this.maxStep;
-
-
       switch (dot) {
         case 1:
           this.elBadgeForm.elBadge1 = false;
@@ -1110,11 +1110,10 @@ export default {
           break;
       }
 
-      if (e !== "" || e != null) {
+      if ( e != null ) {
         if (e !== 12 && e !== 11) {
           let id = this.enforceFlowId
           getEnforceFlowsByEnforceIdAndStep(id, e).then(res => {
-            console.log(JSON.stringify(res))
             let data = res.data;
             this.enforceFlow = data.enforceFlow
             if (data.dtos.length > 0) {
@@ -1135,7 +1134,17 @@ export default {
             if (dtos.length > 0) {
               this.enforceForm = dtos[0]
             }else{
-              this.enforceForm=null
+              this.enforceForm={
+                id: null,
+                enforceId: null,
+                director: null,
+                directorId: null,
+                remark: null,
+                taskId: null,
+                currentStep: null,
+                filess: [],
+                content:null
+              }
             }
             this.$nextTick(() => {
               if (editor == null) {
@@ -1261,7 +1270,6 @@ export default {
     getEnforceFlowFileList() {
       let id = this.enforceDetail.id
       getEnforceFlowFiles(id).then(res => {
-        console.log(res.data)
         this.enforceFileData = res.data
       });
     },
@@ -1285,7 +1293,6 @@ export default {
     },
     getTaskList() {
       getPersonalTaskList().then(res => {
-        console.log(res.data)
       })
     },
     enforceFlowDealWin(row){

+ 0 - 1
src/views/meeting/weeklyRecords.vue

@@ -472,7 +472,6 @@ export default {
             this.workPlanTitle=row.userName+'下周工作计划'
             getWorkPlanByWeeks(weeks,userId).then(res=>{
               this.workPlanDatas=res.data
-              console.log(JSON.stringify(res))
             })
             this.row=row
             this.workPlanVisible=true