odjbin/SmartOpsWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:解决了git冲突

Browse Source
This commit is contained in:
KindSeven
2024-09-12 02:19:51 +08:00
parent 8c3c96ba94 e9f8e22c2e
commit 6b3d57d0ff
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/task-management/all-work-order/index.vue
View File

@@ -55,10 +55,11 @@ const searchConfig = reactive([
label: '工单状态',
prop: 'requirementName',
props: {
placeholder: '请输入工单状态查询',
cacheKey: 'work_order_state',
placeholder: '请选择工单状态查询',
cacheKey: 'work_order_status',
clearable: true,
filterable: true,
filterable: true,
},
component: shallowRef(fvSelect),
}, {

5
src/views/task-management/historical-work-order/index.vue
View File

@@ -55,10 +55,11 @@ const searchConfig = reactive([
label: '工单状态',
prop: 'requirementName',
props: {
placeholder: '请输入工单状态查询',
cacheKey: 'work_order_state',
placeholder: '请选择工单状态查询',
cacheKey: 'work_order_status',
clearable: true,
filterable: true,
filterable: true,
},
component: shallowRef(fvSelect),
}, {

5
src/views/task-management/pending-work-order/index.vue
View File

@@ -55,10 +55,11 @@ const searchConfig = reactive([
label: '工单状态',
prop: 'requirementName',
props: {
placeholder: '请输入工单状态查询',
cacheKey: 'work_order_state',
placeholder: '请选择工单状态查询',
cacheKey: 'work_order_status',
clearable: true,
filterable: true,
filterable: true,
},
component: shallowRef(fvSelect),
}, {