qinzhipeng_v@didiglobal.com 4 anni fa
parent
commit
b54d11e28d

+ 45 - 0
src/views/projectManage/components/workflowAndStatus.vue

@@ -0,0 +1,45 @@
+<template>
+  <el-dialog
+    title="提示"
+    :visible.sync="dialogVisible"
+    width="30%"
+    :before-close="handleClose"
+  >
+    <span>这是一段信息</span>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    visible: { type: Boolean, default: false }
+  },
+  data() {
+    return {
+      dialogVisible: false
+    }
+  },
+  watch: {
+    visible(newVal, olfVal) {
+      this.dialogVisible = newVal
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭?')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {})
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

+ 30 - 21
src/views/projectManage/requirement/requirementDetail.vue

@@ -66,26 +66,29 @@
               <div class="title-left-icon" />
               <div class="title-left-name">工作流</div>
             </div>
-            <el-popover
-              v-model="visible"
-              placement="bottom-start"
-              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;">
-                <el-button size="mini" type="text" @click="visible = false">取消</el-button>
-                <el-button type="primary" size="mini" @click="requirementHold(textarea2)">确定</el-button>
-              </div>
-              <el-button slot="reference" class="el-btn-size" size="mini" @click="changeBtn">{{ form_query.status === -2 ? HoldTask = '解除 Hold' : HoldTask = 'Hold 需求' }}</el-button>
-            </el-popover>
+            <div>
+              <el-button class="el-btn-size" size="mini" @click="dialogVisible = true">{{ '拉取望岳状态及工作流' }}</el-button>
+              <el-popover
+                v-model="visible"
+                placement="bottom-start"
+                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;">
+                  <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+                  <el-button type="primary" size="mini" @click="requirementHold(textarea2)">确定</el-button>
+                </div>
+                <el-button slot="reference" class="el-btn-size" size="mini" @click="changeBtn">{{ form_query.status === -2 ? HoldTask = '解除 Hold' : HoldTask = 'Hold 需求' }}</el-button>
+              </el-popover>
+            </div>
           </div>
           <timeLine :id="requirementId" ref="timeLine1" :name="'需求'" />
         </section>
@@ -335,6 +338,9 @@
       <!-- 排期锁定 -->
       <schedule :visible.sync="scheduleVisble" :name="'需求'" :is-schedule-locked="isScheduleLocked" :require-id="requirementId" @updataData="GetRequireScheduleHistory" />
       <!-- 排期锁定 -->
+      <!-- 状态及工作流 -->
+      <workflowAndStatus :visible.sync="dialogVisible" />
+      <!-- 状态及工作流 -->
       <drawer
         ref="drawer"
         title="需求成员"
@@ -423,6 +429,7 @@ import download from '@/views/projectManage/components/export.vue'
 import demand from '@/views/projectManage/components/demand.vue'
 import record from '@/views/projectManage/components/record.vue'
 import timeLine from '@/views/projectManage/components/timeLine.vue'
+import workflowAndStatus from '@/views/projectManage/components/workflowAndStatus.vue'
 import ganntViews from './components/ganntViews'
 import '@/styles/PublicStyle/index.scss'
 export default {
@@ -441,7 +448,8 @@ export default {
     record,
     timeLine,
     demand,
-    ganntViews
+    ganntViews,
+    workflowAndStatus
   },
   filters: {
     ellipsis(value, num) {
@@ -456,6 +464,7 @@ export default {
     return {
       urgent: urgent,
       showunlock: true,
+      dialogVisible: false,
       show2: true,
       activeTitle: '1', // 默认展示列表视图
       taskShow: 1, // 默认展示仅任务