|
|
@@ -11,17 +11,11 @@
|
|
|
<el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
</el-select>
|
|
|
<el-button class="filter-item" type="primary" size="medium" icon="el-icon-search" @click="querychange(queryLists)">查询</el-button>
|
|
|
- <!-- <el-button class="filter-item" type="primary" size="medium" icon="el-icon-search">导出</el-button> -->
|
|
|
<el-button class="filter-item" type="primary" size="medium" icon="el-icon-search" @click="dialogFormVisible = true, changeaddData()">新增</el-button>
|
|
|
</div>
|
|
|
</el-header>
|
|
|
|
|
|
- <el-table
|
|
|
- :data="list"
|
|
|
- style="width: 100%;margin-bottom: 20px;margin-top: 20px;"
|
|
|
- row-key="id"
|
|
|
- lazy
|
|
|
- >
|
|
|
+ <el-table :data="list" style="width: 100%;margin-bottom: 20px;margin-top: 20px;" row-key="id" lazy>
|
|
|
<!-- :tree-props="{children: 'taskInfoDOList', hasChildren: 'hasChildren'}" -->
|
|
|
<el-table-column label="序号" prop="id" sortable align="center" min-width="80">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -45,7 +39,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="上线时间" min-width="200px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.modifyTime }}</span>
|
|
|
+ <span>{{ scope.row.allOnlineTime }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column v-if="statusproject" label="进展" min-width="200px" align="center">
|
|
|
@@ -77,26 +71,26 @@
|
|
|
</el-form-item>
|
|
|
<div style="display: flex;">
|
|
|
<div style="flex:1;">
|
|
|
- <el-form-item label="业务线" prop="bizId" :label-width="formLabelWidths">
|
|
|
- <el-select v-model="form.bizId" placeholder="业务线">
|
|
|
- <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-form-item label="业务线" prop="bizIdString" :label-width="formLabelWidths">
|
|
|
+ <el-select v-model="form.bizIdString" placeholder="业务线">
|
|
|
+ <el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="状态" prop="statusString" :label-width="formLabelWidths">
|
|
|
<el-select v-model="form.statusString" placeholder="状态">
|
|
|
- <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div style="flex:1;">
|
|
|
<el-form-item label="优先级" prop="priorityString" :label-width="formLabelWidths">
|
|
|
<el-select v-model="form.priorityString" placeholder="优先级">
|
|
|
- <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="进展" prop="stageString" :label-width="formLabelWidths">
|
|
|
<el-select v-model="form.stageString" placeholder="进展">
|
|
|
- <el-option v-for="item in stageStrings" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-option v-for="item in stageStrings" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
@@ -211,8 +205,8 @@
|
|
|
</el-form-item>
|
|
|
<div style="display: flex;">
|
|
|
<div style="flex:1;">
|
|
|
- <el-form-item label="业务线" prop="bizId" label-width="100px">
|
|
|
- <el-select v-model="formTask.bizId" placeholder="业务线">
|
|
|
+ <el-form-item label="业务线" prop="bizIdString" label-width="100px">
|
|
|
+ <el-select v-model="formTask.bizIdString" placeholder="业务线">
|
|
|
<el-option v-for="item in bizOptions" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -338,21 +332,22 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
+ <!-- 二页面 -->
|
|
|
<el-dialog width="80%" :visible.sync="dialogTableVisible">
|
|
|
<div style="font-size:18px;color:#000000;">项目管理</div><hr>
|
|
|
<div>
|
|
|
<div style=" diaplay: flex; padding-top:30px;">
|
|
|
<span class="tableproject" style="flex:1;">状态</span>
|
|
|
- <el-select v-model="projectData.status" style="width: 100px;" size="mini" placeholder="状态" @change="updateData(projectData)">
|
|
|
- <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-select v-model="projectData.statusString" style="width: 100px;" size="mini" placeholder="状态" @change="updateData(projectData)">
|
|
|
+ <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<span class="tableproject" style="flex:1;">优先级</span>
|
|
|
- <el-select v-model="projectData.priority" style="width: 100px;" size="mini" placeholder="优先级" @change="updateData(projectData)">
|
|
|
- <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-select v-model="projectData.priorityString" style="width: 100px;" size="mini" placeholder="优先级" @change="updateData(projectData)">
|
|
|
+ <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<span class="tableproject" style="flex:1;">进展</span>
|
|
|
<el-select v-model="projectData.stageString" placeholder="进展" style="width: 100px;" size="mini" @change="updateData(projectData)">
|
|
|
- <el-option v-for="item in stageStrings" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-option v-for="item in stageStrings" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<el-button type="primary" size="small" style="float:right;margin-right:7%" @click="dialogFormVisible = true, changeData">编辑</el-button>
|
|
|
</div><hr>
|
|
|
@@ -417,6 +412,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</transition>
|
|
|
+
|
|
|
<div style="margin-top:20px;">
|
|
|
<div style="font-size:18px;color:#000000;">任务信息
|
|
|
<el-button type="primary" size="small" style="float:right;margin:-8px 7% 0 0;" @click=" dialogFormTaskVisible = true, changeaddTaskData()">新增</el-button>
|
|
|
@@ -436,7 +432,7 @@
|
|
|
<span class="projectStyle" @click="taskInformation = true, getClickId(scope.row, scope.row.id)">{{ scope.row.name }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="状态" prop="status" align="center" min-width="60">
|
|
|
+ <el-table-column label="状态" prop="statusString" align="center" min-width="60">
|
|
|
<template slot-scope="scope">
|
|
|
<span>{{ scope.row.statusString }}</span>
|
|
|
</template>
|
|
|
@@ -446,9 +442,9 @@
|
|
|
<span>{{ scope.row.createTime }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="上线时间" prop="modifyTime" align="center" min-width="150">
|
|
|
+ <el-table-column label="计划上线时间" prop="modifyTime" align="center" min-width="150">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.row.modifyTime }}</span>
|
|
|
+ <span>{{ scope.row.onlinePlanTime }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" min-width="150">
|
|
|
@@ -461,17 +457,18 @@
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
+ <!-- 三页面 -->
|
|
|
<el-dialog width="80%" :visible.sync="taskInformation">
|
|
|
<div style="font-size:18px;color:#000000;">任务信息</div><hr>
|
|
|
<div width="70%" style="padding-top:30px;">
|
|
|
<div style="padding-bottom:5px; diaplay: flex;">
|
|
|
<span class="tableproject" style="flex:1;">状态</span>
|
|
|
- <el-select v-model="taskDatas.status" style="width: 100px;" size="mini" placeholder="状态" @change="updateaddTaskData(taskDatas)">
|
|
|
- <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-select v-model="taskDatas.statusString" style="width: 100px;" size="mini" placeholder="状态" @change="updateaddTaskData(taskDatas)">
|
|
|
+ <el-option v-for="item in statusOptionss" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<span class="tableproject" style="flex:1;">优先级</span>
|
|
|
- <el-select v-model="taskDatas.priority" style="width: 100px;" size="mini" placeholder="优先级" @change="updateaddTaskData(taskDatas)">
|
|
|
- <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.value" />
|
|
|
+ <el-select v-model="taskDatas.priorityString" style="width: 100px;" size="mini" placeholder="优先级" @change="updateaddTaskData(taskDatas)">
|
|
|
+ <el-option v-for="item in priorityStrings" :key="item.value" :label="item.name" :value="item.name" />
|
|
|
</el-select>
|
|
|
<el-button type="primary" size="small" @click="createReport(1, taskDatas)">新建提测报告</el-button>
|
|
|
<el-button type="primary" size="small" @click="createReport(2, taskDatas)">新建日报报告</el-button>
|
|
|
@@ -486,10 +483,15 @@
|
|
|
<el-form-item label="PM :"><span>{{ taskDatas.pm }}</span></el-form-item>
|
|
|
<el-form-item label="RD :"><span>{{ taskDatas.rd }}</span></el-form-item>
|
|
|
<el-form-item label="QA :"><span>{{ taskDatas.qa }}</span></el-form-item>
|
|
|
+ <el-form-item label="打回次数 :"><span>{{ taskDatas.reopen }}</span></el-form-item>
|
|
|
</el-form>
|
|
|
<el-form style="flex:1;" label="right" size="mini" label-width="110px">
|
|
|
- <el-form-item label="打回次数 :"><span>{{ taskDatas.reopen }}</span></el-form-item>
|
|
|
+ <el-form-item label="业务线 :"><span>{{ taskDatas.bizIdString }}</span></el-form-item>
|
|
|
+ <el-form-item label="任务类型 :"><span>{{ taskDatas.taskType }}</span></el-form-item>
|
|
|
+ <el-form-item label="平台类型 :"><span>{{ taskDatas.typeString }}</span></el-form-item>
|
|
|
+ <el-form-item label="是否免测 :"><span>{{ taskDatas.noTestString }}</span></el-form-item>
|
|
|
<el-form-item label="业务模块 :"><span>{{ taskDatas.businessType }}</span></el-form-item>
|
|
|
+
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<el-form label="right" style="margin-left:30px;" size="mini" label-width="210px">
|
|
|
@@ -533,18 +535,17 @@
|
|
|
<template slot-scope="scope"><span>{{ scope.row.id }}</span></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="标题" prop="name" align="center" min-width="100">
|
|
|
- <template slot-scope="scope"><span @click="queryData(scope.row.id, listTaskDatas)"><a href="#">{{ scope.row.name }}</a></span></template>
|
|
|
+ <template slot-scope="scope"><span class="projectStyle" @click="queryData(scope.row.id, listTaskDatas)"><a href="#">{{ scope.row.name }}</a></span></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="创建时间" prop="gmtCreate" align="center" min-width="150">
|
|
|
<template slot-scope="scope"><span>{{ scope.row.gmtCreate }}</span></template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="状态" prop="status" align="center" min-width="80">
|
|
|
+ <el-table-column label="状态" prop="statusString" align="center" min-width="80">
|
|
|
<template slot-scope="scope"><span>{{ scope.row.statusString }}</span></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" min-width="150">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button type="primary" size="small" disabled>查看</el-button>
|
|
|
- <!-- <el-button type="primary" size="small" disabled>编辑</el-button> -->
|
|
|
<el-button type="primary" size="small" @click="yesCallBack1(2,scope.row.id)">打回</el-button>
|
|
|
<el-button type="primary" size="small" @click="yesCallBack(1,scope.row.id)">通过</el-button>
|
|
|
</template>
|
|
|
@@ -580,7 +581,25 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
- <el-tab-pane label="bug报告">bug报告正在开发中····</el-tab-pane>
|
|
|
+ <el-tab-pane label="bug报告">
|
|
|
+ <el-table :data="projectBug" style="width: 100%">
|
|
|
+ <el-table-column label="ID" align="center" min-width="60">
|
|
|
+ <template slot-scope="scope"><span>{{ scope.row.id }}</span></template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="标题" align="center" min-width="100">
|
|
|
+ <template slot-scope="scope"><span class="projectStyle" @click="queryBugData(scope.row.id, projectBug)"><a href="#">{{ scope.row.bugName }}</a></span></template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="状态" align="center" min-width="80">
|
|
|
+ <template slot-scope="scope"><span>{{ scope.row.status }}</span></template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="当前处理人" align="center" min-width="100">
|
|
|
+ <template slot-scope="scope"><span>{{ scope.row.currentHandler }}</span></template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="创建时间" align="center" min-width="150">
|
|
|
+ <template slot-scope="scope"><span>{{ scope.row.gmtCreate }}</span></template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </el-tab-pane>
|
|
|
</el-tabs>
|
|
|
<div style="height:aotu; text-align:center;">----------------------------------我是底线---------------------------------</div>
|
|
|
</div>
|
|
|
@@ -610,6 +629,7 @@ export default {
|
|
|
dailyTestReports: [],
|
|
|
businessTypeStr: [],
|
|
|
taskTypeStr: [],
|
|
|
+ projectBug: [],
|
|
|
tabPosition: 'top',
|
|
|
textarea: '',
|
|
|
CallBackTheReason: '',
|
|
|
@@ -628,32 +648,14 @@ export default {
|
|
|
stageStrings: [{ name: '正常', value: 1 }, { name: 'delay', value: 2 }, { name: 'pending', value: 3 }],
|
|
|
priorityStrings: [{ name: 'p0', value: 0 }, { name: 'p1', value: 1 }, { name: 'p2', value: 2 }, { name: 'p3', value: 3 }],
|
|
|
statusOptionss: [{ name: '待评估', value: 0 }, { name: '待需求产出', value: 1 }, { name: '待评审', value: 2 }, { name: '待排期', value: 3 }, { name: '待开发', value: 4 }, { name: '开发中', value: 5 }, { name: '待测试', value: 6 }, { name: '测试中', value: 7 }, { name: '验收中', value: 8 }, { name: '已上线', value: 9 }],
|
|
|
- bizOptions: [{ name: '企业级', value: '100' }, { name: '滴滴代驾', value: 261 }, { name: 'prado', value: 330 }, { name: 'carbo', value: 331 }, { name: '海马', value: 309 }],
|
|
|
+ bizOptions: [{ name: '万象', value: 101 }, { name: '企业级', value: 100 }, { name: '滴滴代驾', value: 261 }, { name: 'prado', value: 330 }, { name: 'carbo', value: 331 }, { name: '海马', value: 309 }],
|
|
|
userInformation: localStorage.getItem('username'),
|
|
|
userNames: localStorage.getItem('realname'),
|
|
|
statusShow: '',
|
|
|
childrenList: '',
|
|
|
parameter: '',
|
|
|
- queryLists: {
|
|
|
- stage: '',
|
|
|
- priority: '',
|
|
|
- creater: '',
|
|
|
- curIndex: '',
|
|
|
- pageSize: '',
|
|
|
- statusString: '',
|
|
|
- name: '',
|
|
|
- dateQuery: ''
|
|
|
- },
|
|
|
- queryListData: {
|
|
|
- stage: '',
|
|
|
- priority: '',
|
|
|
- creater: '',
|
|
|
- curIndex: '',
|
|
|
- pageSize: '',
|
|
|
- status: '',
|
|
|
- name: '',
|
|
|
- dateQuery: ''
|
|
|
- },
|
|
|
+ queryLists: {},
|
|
|
+ queryListData: {},
|
|
|
projectShow: '',
|
|
|
statusproject: false,
|
|
|
projectData: {},
|
|
|
@@ -705,7 +707,7 @@ export default {
|
|
|
notest: [{ required: true, message: '是否免测不能为空', trigger: 'change' }],
|
|
|
type: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
|
|
|
name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
|
|
|
- bizId: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
|
|
|
+ bizIdString: [{ required: true, message: '业务线不能为空', trigger: 'change' }],
|
|
|
statusString: [{ required: true, message: '状态不能为空', trigger: 'change' }],
|
|
|
priorityString: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
|
|
|
stageString: [{ required: true, message: '进展不能为空', trigger: 'change' }],
|
|
|
@@ -749,10 +751,23 @@ export default {
|
|
|
this.$refs['serviceDataForms'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.bizData = vel
|
|
|
- this.bizData.stage = vel.stageString
|
|
|
- this.bizData.status = vel.statusString
|
|
|
- this.bizData.priority = vel.priorityString
|
|
|
+ for (var a of this.statusOptionss) {
|
|
|
+ vel.statusString === a.name ? this.bizData.status = a.value : ''
|
|
|
+ }
|
|
|
+ for (var s of this.priorityStrings) {
|
|
|
+ vel.priorityString === s.name ? this.bizData.priority = s.value : ''
|
|
|
+ }
|
|
|
+ for (var f of this.stageStrings) {
|
|
|
+ vel.stageString === f.name ? this.bizData.stage = f.value : ''
|
|
|
+ }
|
|
|
+ // this.bizData.stage = vel.stageString
|
|
|
+ // this.bizData.status = vel.statusString
|
|
|
+ // this.bizData.priority = vel.priorityString
|
|
|
+ } else {
|
|
|
+ console.log('error submit!!')
|
|
|
+ return false
|
|
|
}
|
|
|
+
|
|
|
this.userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
this.objData = { projectInfo: this.bizData, user: this.userData }
|
|
|
addProject(this.objData).then(response => {
|
|
|
@@ -761,7 +776,7 @@ export default {
|
|
|
this.successFun()
|
|
|
this.dialogFormVisible = false
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
@@ -773,31 +788,40 @@ export default {
|
|
|
this.form = vel
|
|
|
},
|
|
|
updateData(vel) {
|
|
|
+ this.bizData = vel
|
|
|
+ for (var a of this.statusOptionss) {
|
|
|
+ vel.statusString === a.name ? this.bizData.status = a.value : ''
|
|
|
+ }
|
|
|
+ for (var s of this.priorityStrings) {
|
|
|
+ vel.priorityString === s.name ? this.bizData.priority = s.value : ''
|
|
|
+ }
|
|
|
+ for (var d of this.bizOptions) {
|
|
|
+ vel.bizIdString === d.name ? this.bizData.bizId = d.value : ''
|
|
|
+ }
|
|
|
+ for (var f of this.stageStrings) {
|
|
|
+ vel.stageString === f.name ? this.bizData.stage = f.value : ''
|
|
|
+ }
|
|
|
if (vel === this.projectData) {
|
|
|
this.bizData = {
|
|
|
- status: vel.status,
|
|
|
- id: this.parameter,
|
|
|
- priority: vel.priority,
|
|
|
- stage: vel.stage
|
|
|
+ id: this.parameter
|
|
|
}
|
|
|
} else {
|
|
|
- this.bizData = vel
|
|
|
this.bizData.id = vel.id
|
|
|
- this.bizData.status = vel.status
|
|
|
- this.bizData.priority = vel.priority
|
|
|
- // this.bizData.stageString = vel.stageString
|
|
|
- this.bizData.stage = vel.stage
|
|
|
}
|
|
|
+ this.bizData.status = vel.status
|
|
|
+ this.bizData.priority = vel.priority
|
|
|
+ this.bizData.stage = vel.stage
|
|
|
this.userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
this.objData = { projectInfo: this.bizData, user: this.userData }
|
|
|
updateProject(this.objData).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
this.dialogFormVisible = false
|
|
|
this.dialogTableVisible = false
|
|
|
+ this.bizData = {}
|
|
|
this.successFun()
|
|
|
this.getList()
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -828,7 +852,7 @@ export default {
|
|
|
this.getList()
|
|
|
this.successFun()
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -866,15 +890,9 @@ export default {
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
this.deleteTaskDataOut(e)
|
|
|
- this.$message({
|
|
|
- type: 'success',
|
|
|
- message: '删除成功!'
|
|
|
- })
|
|
|
+ this.$message({ type: 'success', message: '删除成功!' })
|
|
|
}).catch(() => {
|
|
|
- this.$message({
|
|
|
- type: 'info',
|
|
|
- message: '已取消删除'
|
|
|
- })
|
|
|
+ this.$message({ type: 'info', message: '已取消删除' })
|
|
|
})
|
|
|
},
|
|
|
// 任务删除
|
|
|
@@ -886,7 +904,7 @@ export default {
|
|
|
this.successFun()
|
|
|
this.dialogTableVisible = false
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -916,11 +934,16 @@ export default {
|
|
|
this.$refs['serviceTaskDataForms'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
this.formTask = vel
|
|
|
+ this.formTask.bizId = vel.bizIdString
|
|
|
this.formTask.priority = vel.priorityString
|
|
|
this.formTask.status = vel.statusString
|
|
|
this.formTask.stage = vel.stageString
|
|
|
this.formTask.projectId = this.parameter
|
|
|
+ } else {
|
|
|
+ console.log('error submit!!')
|
|
|
+ return false
|
|
|
}
|
|
|
+
|
|
|
this.userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
this.objData = { taskInfo: this.formTask, user: this.userData }
|
|
|
createTaskData(this.objData).then(response => {
|
|
|
@@ -930,7 +953,7 @@ export default {
|
|
|
this.dialogTableVisible = false
|
|
|
this.dialogFormTaskVisible = false
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
@@ -941,31 +964,34 @@ export default {
|
|
|
this.formTask = ele
|
|
|
this.queryTaskData(this.formTask)
|
|
|
getTaskData(e).then(response => {
|
|
|
- console.log(response)
|
|
|
this.taskDatas = response.data
|
|
|
this.listTaskDatas = response.data.launchTestInfoList
|
|
|
this.listTaskDatas.statusString = this.taskDatas.statusString
|
|
|
this.projectTestReports = response.data.projectTestReports
|
|
|
this.projectTestReports.statusString = this.taskDatas.statusString
|
|
|
this.dailyTestReports = response.data.dailyTestReports
|
|
|
+ this.projectBug = response.data.bugBaseInfoDOS
|
|
|
// this.dailyTestReports.statusString = this.taskDatas.statusString
|
|
|
})
|
|
|
},
|
|
|
|
|
|
updateaddTaskData(vel) {
|
|
|
- // if (vel === this.taskDatas) {
|
|
|
- // this.formTask = {
|
|
|
- // status: vel.status,
|
|
|
- // id: vel.id,
|
|
|
- // priority: vel.priority
|
|
|
- // }
|
|
|
- // } else {
|
|
|
this.formTask = vel
|
|
|
this.formTask.projectId = this.parameter
|
|
|
- this.formTask.status = vel.status
|
|
|
- // this.formTask.stage = vel.stage
|
|
|
- this.formTask.priority = vel.priority
|
|
|
- // }
|
|
|
+ // this.formTask.priority = vel.priority
|
|
|
+ for (var e of this.bizOptions) {
|
|
|
+ // vel.bizIdString === e.name ? this.formTask.bizId = e.value : ''
|
|
|
+ typeof (vel.bizIdString) === 'number' ? this.formTask.bizId = vel.bizIdString : vel.bizIdString === e.name ? this.formTask.bizId = e.value : ''
|
|
|
+ }
|
|
|
+ for (var ele of this.statusOptionss) {
|
|
|
+ typeof (vel.statusString) === 'number' ? this.formTask.status = vel.statusString : vel.statusString === ele.name ? this.formTask.status = ele.value : ''
|
|
|
+ }
|
|
|
+ for (var el of this.statusOptionss) {
|
|
|
+ typeof (vel.stageString) === 'number' ? this.formTask.stage = vel.stageString : vel.stageString === el.name ? this.formTask.stage = el.value : ''
|
|
|
+ }
|
|
|
+ for (var els of this.priorityStrings) {
|
|
|
+ typeof (vel.priorityString) === 'number' ? this.formTask.priority = vel.priorityString : vel.priorityString === els.name ? this.formTask.priority = els.value : ''
|
|
|
+ }
|
|
|
this.userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
this.objData = { taskInfo: this.formTask, user: this.userData }
|
|
|
updateTaskList(this.objData).then(response => {
|
|
|
@@ -977,7 +1003,7 @@ export default {
|
|
|
this.getList()
|
|
|
this.successFun()
|
|
|
} else {
|
|
|
- this.errorFun()
|
|
|
+ this.errorFun(response.msg)
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -1026,8 +1052,8 @@ export default {
|
|
|
successFun() {
|
|
|
this.$notify({ title: 'Success', message: 'Created Successfully', type: 'success', duration: 2000 })
|
|
|
},
|
|
|
- errorFun() {
|
|
|
- this.$notify({ title: 'Failed', message: 'Created Failed', type: 'error', duration: 2000 })
|
|
|
+ errorFun(e) {
|
|
|
+ this.$notify({ title: 'Failed', message: e, type: 'error', duration: 2000 })
|
|
|
},
|
|
|
yesCallBack(e, ele) {
|
|
|
this.centerDialogVisible = false
|
|
|
@@ -1039,10 +1065,11 @@ export default {
|
|
|
this.userData = { id: '', ename: this.userInformation, name: this.userNames }
|
|
|
this.objData = { launchTestInfo: this.tt, user: this.userData }
|
|
|
launchTestUpdate(this.objData).then(res => {
|
|
|
- res.code === 200 ? this.successFun() : this.errorFun()
|
|
|
+ res.code === 200 ? this.successFun() : this.errorFun(res.msg)
|
|
|
})
|
|
|
},
|
|
|
clickType(e) {
|
|
|
+ this.formTask.businessType = ''
|
|
|
e === 1 ? this.businessTypeStr = this.serviceTypeEnumList : this.businessTypeStr = this.clientTypeEnumList
|
|
|
},
|
|
|
yesCallBack1(e, ele) {
|
|
|
@@ -1056,8 +1083,16 @@ export default {
|
|
|
this.mub = val
|
|
|
}
|
|
|
}
|
|
|
- console.log(this.mub)
|
|
|
this.$router.push({ path: '/Platform/presentation/acceptTheReport', query: { data: this.mub }})
|
|
|
+ },
|
|
|
+ queryBugData(e, ele) {
|
|
|
+ // location.href = 'http://localhost:9528/#/Platform/presentation/defectManageQuery?id=' + e
|
|
|
+ for (var val of ele) {
|
|
|
+ if (e === val.id) {
|
|
|
+ this.mub = val
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.$router.push({ path: '/Platform/presentation/defectManageQuery', query: { data: this.mub }})
|
|
|
}
|
|
|
}
|
|
|
}
|
qinzhipeng_v