youhua

src/views/projectManage/taskList/taskViewDetail.vue

@@ -99,8 +99,8 @@
             </div>
             <div class="Layout_space_between">
               <el-button v-if="form_query.isDirectlyFromDpm === 0 || form_query.isDirectlyFromDpm === 1" class="el-btn-size" size="mini" @click="dialogVisible = true">{{ '拉取望岳状态及工作流' }}</el-button>
-              <div v-if="form_query.status !== -2">
-                <el-popover v-model="taskVisible" placement="bottom-end" width="300px" :visible-arrow="false" trigger="manual">
+              <div v-if="form_query.isTaskClose">
+                <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>
@@ -109,6 +109,16 @@
                   <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>
               <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原因（选填）" />
                 <div style="text-align: right; margin-top: 10px;">