Commit 107e38fa by qinjianhui

fix: 问题修改

parent bdc60142
......@@ -42,11 +42,17 @@
v-model="searchForm.prop"
placeholder="请选择"
clearable
style="width:100px"
style="width: 100px"
>
<el-option label="开始时间" value="startTime"></el-option>
<el-option label="创建时间" value="createTime"></el-option>
</el-select>
<el-option
label="开始时间"
value="startTime"
></el-option>
<el-option
label="创建时间"
value="createTime"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<choose-time-period
......@@ -450,6 +456,7 @@ import assignWork from '@/assets/work/assign.png'
import startWork from '@/assets/work/start.png'
import archiveWork from '@/assets/work/archive.png'
import completeWork from '@/assets/work/complete.png'
import rejectWork from '@/assets/work/reject.png'
export default {
name: 'task_center',
......@@ -482,7 +489,11 @@ export default {
selections: [],
is_tab: '1',
statusCode: 'PRE_HANDLING',
searchForm: { timeProp: 'create_time', leaders: [], prop: 'createTime' },
searchForm: {
timeProp: 'create_time',
leaders: [],
prop: 'createTime',
},
isEdit: false,
sourceData: [],
currentRowId: '',
......@@ -609,8 +620,7 @@ export default {
align: 'center',
render: (item) => (
<span>
{(item.orderStatus === 'PRE_HANDLING' ||
item.orderStatus === 'IN_COMPLETE') && (
{
<span
title="详情"
class="icon-view icon-tools-view"
......@@ -620,7 +630,7 @@ export default {
onClick={() => this.showDetail(item)}
></i>
</span>
)}
}
{item.orderStatus === 'TO_BE_ASSIGN' && (
<span title="指派给" class="icon-view">
<img
......@@ -663,6 +673,16 @@ export default {
/>
</span>
)}
{item.orderStatus === 'IN_COMPLETE' && (
<span title="驳回" class="icon-view">
<img
width="24"
height="24"
src={rejectWork}
onClick={() => this.reject(item)}
/>
</span>
)}
</span>
),
},
......@@ -831,7 +851,9 @@ export default {
startTime: this.periodTime && this.periodTime[0],
endTime: this.periodTime && this.periodTime[1],
...this.searchForm,
leaders: this.searchForm.leaders && this.searchForm.leaders.join(','),
leaders:
this.searchForm.leaders &&
this.searchForm.leaders.join(','),
})
.then((res) => {
this.sourceData = res.data.records
......@@ -879,6 +901,15 @@ export default {
console.error(e)
}
},
async reject() {
try {
await this.$confirm('确定驳回吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
} catch {}
},
async submitTime() {
if (!this.estimateCompleteTime) {
return this.$message.warning('请选择预计完成时间')
......@@ -938,11 +969,9 @@ export default {
watch: {
statusCode(val) {
if (val === 'IN_PROGRESS') {
this.$set(
this.searchForm,
'leaders',
[this.userInfo.id],
)
this.$set(this.searchForm, 'leaders', [
this.userInfo.id,
])
} else {
this.$set(this.searchForm, 'leaders', [])
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment