任务状态添加

src/views/automation/index.vue

@@ -12,16 +12,16 @@ export default {
     return {
       show: true,
       iframeHeight: '720px',
-      stable: ' http://10.179.20.26:8080/'
+      stable: ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test'
     }
   },
   computed: {
     envUrl: {
       get() {
-        return envTag === 'test' ? ' http://10.179.20.26:8080/' : ' http://10.179.35.126:8080/#/'
+        return envTag === 'test' ? ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test' : ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_mars_test'
       },
       set(newValue) {
-        return envTag === 'test' ? ' http://10.179.20.26:8080/' : ' http://10.179.35.126:8080/#/'
+        return envTag === 'test' ? ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_dev_multi_service_support_test' : ' http://api-kylin-xg02.intra.xiaojukeji.com/tech_esfe_tr_h5_platform_mars_test'
       }
     }
   },

src/views/projectManage/bugList/bugindex.vue

@@ -12,53 +12,18 @@
             <el-form :model="formInline" class="flex_start" style="width: 100%;">
               <div class="Layout">
                 <div class="queryName">缺陷标题</div>
-                <el-input
-                  v-model="formInline.bugName"
-                  size="small"
-                  style="width:72% !important;"
-                  clearable
-                  filterable
-                  placeholder="请输入标题或ID"
-                  @input="changeSelect()"
-                  @change="curIndex = 1;getBugList()"
-                />
+                <el-input v-model="formInline.bugName" size="small" style="width:72% !important;" clearable filterable placeholder="请输入标题或ID" @input="changeSelect()" @change="curIndex = 1;getBugList()" />
               </div>
               <div class="Layout marginLeft">
                 <div class="queryName">状态</div>
-                <el-select
-                  v-model="formInline.status"
-                  size="small"
-                  style="padding-left: 2px;"
-                  clearable
-                  filterable
-                  placeholder="请选择"
-                  @change="curIndex = 1;getBugList()"
-                >
-                  <el-option
-                    v-for="item in bugEnumList"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  />
+                <el-select v-model="formInline.status" size="small" style="padding-left: 2px;" clearable filterable placeholder="请选择" @change="curIndex = 1;getBugList()">
+                  <el-option v-for="item in bugEnumList" :key="item.code" :label="item.name" :value="item.code" />
                 </el-select>
               </div>
               <div class="Layout marginLeft">
                 <div class="queryName">优先级</div>
-                <el-select
-                  v-model="formInline.priorityLevel"
-                  size="small"
-                  style="padding-left: 2px;"
-                  clearable
-                  filterable
-                  placeholder="请选择"
-                  @change="curIndex = 1;getBugList()"
-                >
-                  <el-option
-                    v-for="item in priorityLevelEnumList"
-                    :key="item.code"
-                    :label="item.name"
-                    :value="item.name"
-                  />
+                <el-select v-model="formInline.priorityLevel" size="small" style="padding-left: 2px;" clearable filterable placeholder="请选择" @change="curIndex = 1;getBugList()">
+                  <el-option v-for="item in priorityLevelEnumList" :key="item.code" :label="item.name" :value="item.name" />
                 </el-select>
               </div>
             </el-form>
@@ -71,20 +36,8 @@
                   <div class="flex_start">
                     <div class="Layout">
                       <div class="queryName">缺陷等级</div>
-                      <el-select
-                        v-model="formInline.priority"
-                        size="small"
-                        clearable
-                        filterable
-                        placeholder="请选择"
-                        @change="changeSelect()"
-                      >
-                        <el-option
-                          v-for="item in priorityEnumList"
-                          :key="item.code"
-                          :label="item.name"
-                          :value="item.code"
-                        />
+                      <el-select v-model="formInline.priority" size="small" clearable filterable placeholder="请选择" @change="changeSelect()">
+                        <el-option v-for="item in priorityEnumList" :key="item.code" :label="item.name" :value="item.code" />
                       </el-select>
                     </div>
                     <div class="Layout marginLeft">
@@ -275,56 +228,20 @@
                   <div style="margin: 1.5% 0;" class="flex_start">
                     <div class="Layout">
                       <div class="queryName">端类型</div>
-                      <el-select
-                        v-model="formInline.sysType"
-                        size="small"
-                        clearable
-                        filterable
-                        placeholder="请选择"
-                        @change="changeSelect()"
-                      >
-                        <el-option
-                          v-for="item in sysTypeEnumList"
-                          :key="item.code"
-                          :label="item.name"
-                          :value="item.code"
-                        />
+                      <el-select v-model="formInline.sysType" size="small" clearable filterable placeholder="请选择" @change="changeSelect()">
+                        <el-option v-for="item in sysTypeEnumList" :key="item.code" :label="item.name" :value="item.code" />
                       </el-select>
                     </div>
                     <div class="Layout marginLeft">
                       <div class="queryName">客户端</div>
-                      <el-select
-                        v-model="formInline.appId"
-                        size="small"
-                        clearable
-                        filterable
-                        placeholder="请选择"
-                        @change="getClient(formInline.appId)"
-                      >
-                        <el-option
-                          v-for="item in appClient"
-                          :key="item.code"
-                          :label="item.msg"
-                          :value="item.code"
-                        />
+                      <el-select v-model="formInline.appId" size="small" clearable filterable placeholder="请选择" @change="getClient(formInline.appId)">
+                        <el-option v-for="item in appClient" :key="item.code" :label="item.msg" :value="item.code" />
                       </el-select>
                     </div>
                     <div class="Layout marginLeft">
                       <div class="queryName">版本</div>
-                      <el-select
-                        v-model="formInline.appVersion"
-                        size="small"
-                        clearable
-                        filterable
-                        placeholder="请选择"
-                        @change="changeSelect()"
-                      >
-                        <el-option
-                          v-for="item in Editionlist"
-                          :key="item.code"
-                          :label="item.msg"
-                          :value="item.msg"
-                        />
+                      <el-select v-model="formInline.appVersion" size="small" clearable filterable placeholder="请选择" @change="changeSelect()">
+                        <el-option v-for="item in Editionlist" :key="item.code" :label="item.msg" :value="item.msg" />
                       </el-select>
                     </div>
                   </div>
@@ -514,14 +431,7 @@
       </el-main>
     </el-container>
     <createdBug v-show="modalShow" ref="createdBug" :get-bug-list="getBugList" />
-    <el-drawer
-      :visible.sync="drawerShow"
-      :modal="false"
-      :with-header="false"
-      size="50%"
-      class="bug_manage_drawer"
-      @click.stop
-    >
+    <el-drawer :visible.sync="drawerShow" :modal="false" :with-header="false" size="50%" class="bug_manage_drawer" @click.stop>
       <div @click.stop>
         <bug-details
           :id="bugQuery.id+''"
@@ -571,13 +481,7 @@
         <el-button size="small" type="primary" @click="statusDialogConfirm">确 定</el-button>
       </template>
     </el-dialog>
-    <normal-dialog
-      :show-dialog="showSaveSearch"
-      :title="'保存筛选项'"
-      :width="'35%'"
-      @confirm="saveSearch('searchForm')"
-      @cancel="showSaveSearch=false"
-    >
+    <normal-dialog :show-dialog="showSaveSearch" :title="'保存筛选项'" :width="'35%'" @confirm="saveSearch('searchForm')" @cancel="showSaveSearch=false">
       <div v-if="showSaveSearch" class="file-dialog">
         <el-form ref="searchForm" :model="searchForm" :rules="searchFormRules" label-width="100px">
           <el-form-item label="过滤器名称" prop="name">
@@ -586,13 +490,7 @@
         </el-form>
       </div>
     </normal-dialog>
-    <normal-dialog
-      :show-footer="false"
-      :show-dialog="showEditSearch"
-      :title="'管理过滤器'"
-      :width="'65%'"
-      @cancel="showEditSearch=false"
-    >
+    <normal-dialog :show-footer="false" :show-dialog="showEditSearch" :title="'管理过滤器'" :width="'65%'" @cancel="showEditSearch=false">
       <filter-list :show-filter="showEditSearch" @deleteFilter="deleteFilter" />
     </normal-dialog>
   </div>

src/views/projectManage/taskList/dialog/taskDialog.vue

@@ -0,0 +1,72 @@
+<template>
+  <el-dialog :visible.sync="visible" :show="show" class="deleteClassName public_task" title="状态变更" width="30%" :close-on-click-modal="false" :destroy-on-close="true" @close="OnClose()">
+    <div class="blueStripe" />
+    <div align="center">
+      <div style=" margin-bottom: 5%; white-space:nowrap;">{{ name }}</div>
+      <div style=" margin: 2% 3%; display: flex; justify-content: space-between; align-items: center; white-space:nowrap;">
+        <span>{{ codeName }}：</span>
+        <el-date-picker v-model="date.name" type="date" style="width:100%;" placeholder="选择日期" format="yyyy 年 MM 月 dd 日" />
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="OnClose">取 消</el-button>
+      <el-button size="small" type="primary">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import '@/styles/PublicStyle/index.scss'
+export default {
+  name: 'TemplateDialog',
+  props: {
+    show: { type: Boolean, default: false },
+    statusName: { type: String, default: null }
+  },
+  data() {
+    return {
+      visible: this.show,
+      date: {},
+      name: '',
+      codeName: '',
+      measurementTimeName: '实际提测时间',
+      exitTimeName: '实际准出时间',
+      onlineTimeName: '实际上线完成时间',
+      measurementTime: '请确认提测报告发出后再切换任务状态为已提测！',
+      exitTime: '请确认准出报告发出后再切换任务状态为已准出！',
+      onlineTime: '请确认所有端或服务均已上线后再切换任务状态为已上线'
+    }
+  },
+  watch: {
+    show: {
+      immediate: true,
+      handler(show) {
+        this.visible = this.show
+      }
+    },
+    statusName: {
+      immediate: true,
+      handler(statusName) {
+        if (statusName === '已提测') {
+          this.name = this.measurementTime
+          this.codeName = this.measurementTimeName
+        }
+        if (statusName === '已准出') {
+          this.name = this.exitTime
+          this.codeName = this.exitTimeName
+        }
+        if (statusName === '已上线') {
+          this.name = this.onlineTime
+          this.codeName = this.onlineTimeName
+        }
+      }
+    }
+  },
+  methods: {
+    OnClose() {
+      this.$emit('update:show', false)
+    }
+  }
+}
+</script>
+

src/views/projectManage/taskList/taskViewDetails.vue

@@ -456,6 +456,7 @@
       @childValInput="childVal"
       @click.stop
     />
+    <task-dialog :show.sync="showTaskDialog" :status-name="statusName" />
   </div>
 </template>
 
@@ -495,6 +496,7 @@ import DailyReport from '@/views/Platform/presentation/Templates/DailyReport' //
 import ClientReport from '@/views/Platform/presentation/Templates/ClientReport' // 准出
 import drawer from '@/views/projectManage/Drawer'
 import image_url from '@/assets/home_images/home_u.png'
+import taskDialog from '@/views/projectManage/taskList/dialog/taskDialog'
 
 export default {
   components: {
@@ -506,7 +508,8 @@ export default {
     DailyReport,
     ClientReport,
     selDatePicker,
-    drawer
+    drawer,
+    taskDialog
   },
   filters: {
     ellipsis(value) {
@@ -542,6 +545,7 @@ export default {
       statusColors: ['#6AB4FF', '#6AB4FF', '#FFCC66', '#7ED321', '#F56C6C'],
       curIndex: 1,
       pageSize: 10,
+      statusName: '',
       task_form: {
         statusString: '未开始',
         describe: '',
@@ -554,6 +558,7 @@ export default {
       },
       dialogVisible1: false, // 提测弹窗
       isHeadShow: false,
+      showTaskDialog: false, // 状态弹窗
       radio: '列表',
       modalShow: false, // 弹窗（新建）
       CallBackTheReason: '', // 打回原因
@@ -947,6 +952,11 @@ export default {
       })
     },
     async handleCommand(command) {
+      if (command.label === '已提测' || command.label === '已准出') {
+        this.statusName = command.label
+        this.showTaskDialog = true
+        return
+      }
       if (command.label === '已上线') {
         this.centerDialogVisible_status = true
         return