|
@@ -74,7 +74,7 @@
|
|
|
|
|
|
|
|
<view class="record-card__status">
|
|
<view class="record-card__status">
|
|
|
<view class="record-card__dot" />
|
|
<view class="record-card__dot" />
|
|
|
- <text>{{ getPackageStatusText(item.packageStatus) }}</text>
|
|
|
|
|
|
|
+ <text>{{ item.claimStatusLabel }}</text>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
@@ -197,6 +197,7 @@ enum RecordTab {
|
|
|
Processing = '2',
|
|
Processing = '2',
|
|
|
Approving = '3',
|
|
Approving = '3',
|
|
|
Finished = '4',
|
|
Finished = '4',
|
|
|
|
|
+ Rejected = '5',
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
type Nullable<T> = T | null | undefined
|
|
type Nullable<T> = T | null | undefined
|
|
@@ -219,8 +220,9 @@ interface ListResponse {
|
|
|
*/
|
|
*/
|
|
|
const tabs = [
|
|
const tabs = [
|
|
|
{ label: '全部', value: RecordTab.All },
|
|
{ label: '全部', value: RecordTab.All },
|
|
|
- { label: '进行中', value: RecordTab.Processing },
|
|
|
|
|
{ label: '待审批', value: RecordTab.Approving },
|
|
{ label: '待审批', value: RecordTab.Approving },
|
|
|
|
|
+ { label: '已拒绝', value: RecordTab.Rejected },
|
|
|
|
|
+ { label: '进行中', value: RecordTab.Processing },
|
|
|
{ label: '已完成', value: RecordTab.Finished },
|
|
{ label: '已完成', value: RecordTab.Finished },
|
|
|
] as const
|
|
] as const
|
|
|
|
|
|
|
@@ -250,7 +252,6 @@ const openType = ref<PageEntryType>('')
|
|
|
const loading = ref(false)
|
|
const loading = ref(false)
|
|
|
const finished = ref(false)
|
|
const finished = ref(false)
|
|
|
const recordList = ref<ScorePackageRecordItem[]>([])
|
|
const recordList = ref<ScorePackageRecordItem[]>([])
|
|
|
-const packageStatusMap = ref<DictItem[]>([])
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 当前选中的月份,格式:YYYY-MM
|
|
* 当前选中的月份,格式:YYYY-MM
|
|
@@ -265,7 +266,7 @@ const selectedDate = computed(() => {
|
|
|
*/
|
|
*/
|
|
|
const selectedDateText = computed(() => {
|
|
const selectedDateText = computed(() => {
|
|
|
const { selectedYear, selectedMonth } = params
|
|
const { selectedYear, selectedMonth } = params
|
|
|
- return selectedYear && selectedMonth ? `${selectedYear}年${selectedMonth}月` : '筛选'
|
|
|
|
|
|
|
+ return selectedYear && selectedMonth ? `${selectedYear}/${selectedMonth}` : '筛选'
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -301,18 +302,6 @@ const refreshRecordList = () => {
|
|
|
fetchRecordList()
|
|
fetchRecordList()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-/**
|
|
|
|
|
- * 获取积分包状态字典
|
|
|
|
|
- */
|
|
|
|
|
-const fetchPackageStatus = async () => {
|
|
|
|
|
- try {
|
|
|
|
|
- const res = await getDictTypeApi('package_new_status')
|
|
|
|
|
- packageStatusMap.value = res?.data ?? []
|
|
|
|
|
- } catch (error) {
|
|
|
|
|
- console.error('获取积分包状态字典失败:', error)
|
|
|
|
|
- }
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 获取积分包记录列表
|
|
* 获取积分包记录列表
|
|
|
*/
|
|
*/
|
|
@@ -440,14 +429,6 @@ const handleOpenDetail = (item: ScorePackageRecordItem) => {
|
|
|
})
|
|
})
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-/**
|
|
|
|
|
- * 获取积分包状态文案
|
|
|
|
|
- */
|
|
|
|
|
-const getPackageStatusText = (status: Nullable<string | number>) => {
|
|
|
|
|
- const statusItem = packageStatusMap.value.find((item) => String(item.value) === String(status))
|
|
|
|
|
- return statusItem?.label || '-'
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
/**
|
|
/**
|
|
|
* 获取积分包类型标签
|
|
* 获取积分包类型标签
|
|
|
*/
|
|
*/
|
|
@@ -589,7 +570,6 @@ onLoad((query) => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
fetchRecordList()
|
|
fetchRecordList()
|
|
|
- fetchPackageStatus()
|
|
|
|
|
})
|
|
})
|
|
|
</script>
|
|
</script>
|
|
|
|
|
|
|
@@ -649,9 +629,10 @@ onLoad((query) => {
|
|
|
|
|
|
|
|
.record-date {
|
|
.record-date {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
|
|
+ flex-shrink: 0;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
justify-content: center;
|
|
|
- width: 240rpx;
|
|
|
|
|
|
|
+ width: 200rpx;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
color: #333333;
|
|
color: #333333;
|
|
|
}
|
|
}
|
|
@@ -659,7 +640,7 @@ onLoad((query) => {
|
|
|
.record-date__divider {
|
|
.record-date__divider {
|
|
|
width: 2rpx;
|
|
width: 2rpx;
|
|
|
height: 40rpx;
|
|
height: 40rpx;
|
|
|
- margin-right: 24rpx;
|
|
|
|
|
|
|
+ margin-right: 16rpx;
|
|
|
background: #ebebeb;
|
|
background: #ebebeb;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -667,7 +648,7 @@ onLoad((query) => {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: center;
|
|
justify-content: center;
|
|
|
- min-width: 170rpx;
|
|
|
|
|
|
|
+ min-width: 140rpx;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
}
|
|
}
|
|
|
|
|
|