youhua

src/views/projectManage/taskList/taskViewDetail.vue

@@ -109,15 +109,8 @@
                   <el-button slot="reference" class="el-btn-size" size="mini" @click="changeTaskClose">{{ form_query.status === -4 ? closeTask = '解除关闭任务' : closeTask = '关闭任务' }}</el-button>
                 </el-popover>
               </div>
-              <div v-slse-if="!form_query.isTaskClose && form_query.status !== -2">
-                <!-- <el-popover v-if="form_query.status !== -2" v-model="taskVisible" placement="bottom-end" width="300px" :visible-arrow="false" trigger="manual">
-                  <el-input v-model="textarea1" type="textarea" rows="5" style="width:300px" placeholder="请输入关闭原因（选填）" />
-                  <div style="text-align: right; margin-top: 10px;">
-                    <el-button size="mini" type="text" @click="taskVisible = false">取消</el-button>
-                    <el-button type="primary" size="mini" @click="taskOpenOrClose(textarea1)">确定</el-button>
-                  </div> -->
-                <el-button slot="reference" class="el-btn-size" size="mini" @click="changeTaskClose">解除关闭任务</el-button>
-                <!-- </el-popover> -->
+              <div v-if="!form_query.isTaskClose && form_query.status !== -2 && form_query.status === -4">
+                <el-button v-if="taskCode" slot="reference" class="el-btn-size" size="mini" @click="changeTaskClose(false)">{{ form_query.status === -4 ? closeTask = '解除关闭任务' : taskCode = false }}</el-button>
               </div>
               <el-popover v-if="form_query.status !== -4" v-model="visible" placement="bottom-end" width="300px" :visible-arrow="false" trigger="manual">
                 <el-input v-model="textarea2" type="textarea" rows="5" style="width:300px" placeholder="请输入Hold原因（选填）" />
@@ -521,6 +514,7 @@ export default {
       taskVisible: false, // 关闭任务
       dialogVisible: false,
       showunlock: true,
+      taskCode: true,
       toilp: '',
       ScheduId: '', // 排期ID
       LockState: {}, // 锁定状态
@@ -669,14 +663,20 @@ export default {
         this.scheduleVisble = true
       }
     },
-    changeTaskClose() {
+    changeTaskClose(e) {
       console.log(this.closeTask)
+      if (e) {
+        this.taskCode = e
+      } else {
+        this.taskCode = false
+      }
       if (this.closeTask === '关闭任务') {
         this.taskVisible = !this.taskVisible
         this.textarea1 = ''
       }
       if (this.closeTask === '解除关闭任务') {
         this.taskOpenOrClose()
+        this.taskVisible = false
       }
     },
     async taskOpenOrClose(val) {