Merge remote-tracking branch 'langye/master'

master
xy 9 months ago
commit 34cb133ef9

@ -63,6 +63,34 @@
"
>
</el-date-picker>
<el-select
style="width: 150px"
size="small"
v-model="select.status"
placeholder="请选择状态"
clearable
>
<el-option
v-for="item in myStatusList"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-select
style="width: 150px"
size="small"
v-model="select.flow_log_cancel"
placeholder="请选择我退回的"
clearable
>
<el-option
v-for="item in [{value:1,label:'我退回过'}]"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
<el-input
clearable
v-model="select.keyword"
@ -218,6 +246,14 @@
>
</div>
</div>
<div class="mobile-desc-row">
<div class="mobile-desc-row__title">
我是否退回过
</div>
<div class="mobile-desc-row__value">
{{ row.flow_log_cancel?'是':'否' }}
</div>
</div>
</div>
<template v-if="$route.params.type !== 'all'">
<el-button
@ -324,6 +360,7 @@
>
</template>
</vxe-column>
<vxe-column
:visible="$store.getters.device === 'desktop'"
width="164"
@ -366,6 +403,19 @@
>
</template>
</vxe-column>
<vxe-column
:visible="$store.getters.device === 'desktop'"
width="120"
align="center"
field="status"
title="我是否退回过"
>
<template #default="{ row }">
{{ row.flow_log_cancel?'是':'否' }}
</template>
</vxe-column>
<vxe-column
:visible="$store.getters.device === 'desktop'"
min-width="280"
@ -493,6 +543,18 @@ export default {
[0, "办理中"],
[1, "已完成"],
]),
myStatusList:[
{
value:-1,
label:'已退回'
},{
value:0,
label:'办理中'
},{
value:1,
label:'已完成'
}
],
statusColor: new Map([
[-1, "warning"],
[0, ""],
@ -563,6 +625,8 @@ export default {
sort_name: "",
sort_type: "",
keyword: "",
flow_log_cancel:'',
status:'',
department_id: "",
is_fav: "",
custom_model_id: "",

Loading…
Cancel
Save