From 60107cb11e472d693de543e8ec422bfe8e31dbec Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 31 十月 2025 17:30:48 +0800
Subject: [PATCH] Merge branch 'master' into dev-3.4.2.10
---
src/views/MaterialReview/MaterialReReviewList.vue | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReReviewList.vue b/src/views/MaterialReview/MaterialReReviewList.vue
index d9283cc..bb422f0 100644
--- a/src/views/MaterialReview/MaterialReReviewList.vue
+++ b/src/views/MaterialReview/MaterialReReviewList.vue
@@ -16,7 +16,7 @@
</QueryFilterItem>
<QueryFilterItem tip-content="瀹℃牳鏃ユ湡">
<FieldDatePicker
- v-model="extraParamState.outCheckTime"
+ v-model="extraParamState.outReCheckTime"
type="daterange"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
@@ -27,7 +27,7 @@
</QueryFilterItem>
<QueryFilterItem>
<FieldRadio
- v-model="extraParamState.outCheckStatus"
+ v-model="extraParamState.outReCheckStatus"
:value-enum="BountyCheckStatusEnumText"
buttonStyle
showAllBtn
@@ -109,19 +109,34 @@
name: '鐢虫姤鏃ユ湡',
},
{
- id: '7',
+ id: '6-1',
enCode: 'outCheckAuditOperator',
- name: '瀹℃牳浜�',
+ name: '鍒濆浜�',
+ },
+ {
+ id: '6-2',
+ enCode: 'outCheckTime',
+ name: '鍒濆鏃ユ湡',
+ },
+ {
+ id: '6-3',
+ enCode: 'outCheckStatus',
+ name: '鍒濆鐘舵��',
+ },
+ {
+ id: '7',
+ enCode: 'outReCheckAuditOperator',
+ name: '澶嶅浜�',
},
{
id: '8',
- enCode: 'outCheckTime',
- name: '瀹℃牳鏃ユ湡',
+ enCode: 'outReCheckTime',
+ name: '澶嶅鏃ユ湡',
},
{
id: '9',
- enCode: 'outCheckStatus',
- name: '瀹℃牳鐘舵��',
+ enCode: 'outReCheckStatus',
+ name: '澶嶅鐘舵��',
},
];
@@ -145,7 +160,7 @@
},
extraProps: {
hide: (row: API.GetParkBountyApplyListOutput) =>
- row.outCheckStatus !== BountyCheckStatusEnum.WaitCheck,
+ row.outReCheckStatus !== BountyCheckStatusEnum.WaitCheck,
},
},
]);
@@ -184,11 +199,15 @@
orderInput: extraParamState.orderInput,
},
batchNo: extraParamState.batchNo,
- outCheckStatus: extraParamState.outCheckStatus,
+ outCheckStatus: BountyCheckStatusEnum.CheckPassed,
+ outReCheckStatus: extraParamState.outReCheckStatus,
creationTimeBegin: format(extraParamState.creationTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
creationTimeEnd: format(extraParamState.creationTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
- outCheckTimeBegin: format(extraParamState.outCheckTime?.[0] ?? '', 'YYYY-MM-DD 00:00:00'),
- outCheckTimeEnd: format(extraParamState.outCheckTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
+ outReCheckTimeBegin: format(
+ extraParamState.outReCheckTime?.[0] ?? '',
+ 'YYYY-MM-DD 00:00:00'
+ ),
+ outReCheckTimeEnd: format(extraParamState.outReCheckTime?.[1] ?? '', 'YYYY-MM-DD 23:59:59'),
};
let res = await parkBountyApplyServices.getOutcheckParkBountyList(params, {
showLoading: !state.loading,
@@ -199,17 +218,19 @@
{
defaultExtraParams: {
batchNo: '',
- outCheckStatus: '' as any as BountyCheckStatusEnum,
+ outReCheckStatus: '' as any as BountyCheckStatusEnum,
creationTime: [] as unknown as ModelValueType,
- outCheckTime: [] as unknown as ModelValueType,
+ outReCheckTime: [] as unknown as ModelValueType,
orderInput: [{ property: 'creationTime', order: OrderInputType.Desc }],
},
columnsRenderProps: {
applyMonth: { type: 'date', format: 'YYYY骞碝M鏈�' },
creationTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
outCheckTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
+ outReCheckTime: { type: 'date', format: 'YYYY-MM-DD HH:mm:ss' },
applySumAmount: { type: 'money', precision: 2 },
outCheckStatus: { type: 'enum', valueEnum: BountyCheckStatusEnumText },
+ outReCheckStatus: { type: 'enum', valueEnum: BountyCheckStatusEnumText },
},
}
);
@@ -220,11 +241,14 @@
params: {
id: row.id,
},
+ query: {
+ type: 'reReview',
+ },
});
}
function goAudit(row: API.GetParkBountyApplyListOutput) {
router.push({
- name: 'MaterialReviewAudit',
+ name: 'MaterialReReviewAudit',
params: {
id: row.id,
},
--
Gitblit v1.9.1