diff --git a/.env.dev b/.env.dev index d3d9618..6a50f1c 100644 --- a/.env.dev +++ b/.env.dev @@ -13,7 +13,7 @@ VITE_ROUTER_HISTORY=hash # api # VITE_API_BASIC=https://zh.shibeitong.com -VITE_API_BASIC=http://10.10.1.6:8070 +VITE_API_BASIC=http://10.10.1.39:8070 VITE_API_HTTP=/api/v1/ # storage VITE_STORAGE_NAMESPACE = gin-admin_local_ diff --git a/src/apis/modules/signIn.js b/src/apis/modules/signIn.js index 73f0f00..6e05413 100644 --- a/src/apis/modules/signIn.js +++ b/src/apis/modules/signIn.js @@ -14,3 +14,5 @@ export const updateItem = (id, params) => request.basic.put(`/api/v1/sign-reward export const delItem = (id) => request.basic.delete(`/api/v1/sign-rewards/${id}`) // 获取签到列表 export const getSignInList = (params) => request.basic.get('/api/v1/sign-reward-logs', params) +// 获取签到列表核销 +export const updateSingInItem = (id, params) => request.basic.put(`/api/v1/sign-reward-logs/${id}`, params) diff --git a/src/views/earnPointModule/earnPointRule/components/EditDialog.vue b/src/views/earnPointModule/earnPointRule/components/EditDialog.vue index 3e978ac..0c4b84f 100644 --- a/src/views/earnPointModule/earnPointRule/components/EditDialog.vue +++ b/src/views/earnPointModule/earnPointRule/components/EditDialog.vue @@ -6,8 +6,8 @@ - - + + @@ -29,12 +29,12 @@ style="width: 100%;"> - - + - {{ signInEnum.getName(record.maxCount) }} + {{ record.maxCount }} - @@ -100,7 +100,7 @@ const columns = [ { title: '客户电话', dataIndex: 'customerPhone', width: 130, align: 'center' }, { title: '所属日期', dataIndex: 'signMonth', align: 'center' }, { title: '状态', dataIndex: 'status', align: 'center' }, - // { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, + { title: t('button.action'), key: 'action', fixed: 'right', width: 100, align: 'center' }, ] const { listData, loading, showLoading, hideLoading, paginationState, resetPagination, searchFormData } = usePagination() const editDialogRef = ref() @@ -135,21 +135,25 @@ async function getPageList() { /** * 删除 */ -function handleDelete({ id }) { +function handleDelete(params) { Modal.confirm({ - title: t('pages.system.user.delTip'), + title: '即将核销,是否继续?', content: t('button.confirm'), okText: t('button.confirm'), onOk: () => { return new Promise((resolve, reject) => { ; (async () => { try { - const { success } = await apis.signIn.delItem(id).catch(() => { + const form={ + ...params, + status:'success' + } + const { success } = await apis.signIn.updateSingInItem(form.id,form).catch(() => { throw new Error() }) if (config('http.code.success') === success) { resolve() - message.success(t('component.message.success.delete')) + message.success('核销成功') await getPageList() } } catch (error) {