diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts index eea44dd..724310e 100644 --- a/src/api/admin/user.ts +++ b/src/api/admin/user.ts @@ -112,15 +112,13 @@ export const resetUserPassword = (userInfo: object) => { } export function validateUsername(rule: any, value: any, callback: any, isEdit: boolean) { + if (isEdit) { + return callback() + } const flag = new RegExp(/^([a-z\d]+?)$/).test(value) if (!flag) { callback(new Error("用户名支持小写英文、数字")) } - - if (isEdit) { - return callback() - } - getDetails({ username: value }).then((response) => { const result = response.data if (result !== null) { diff --git a/src/api/hard/hard-after-sale.ts b/src/api/hard/hard-after-sale.ts index 2462cb0..ad4ae65 100644 --- a/src/api/hard/hard-after-sale.ts +++ b/src/api/hard/hard-after-sale.ts @@ -1,84 +1,88 @@ import request from "/@/utils/request" +export function adminRefund(data?: Object) { + return request({ + url: "/hard/hard-after-sale/admin-refund", + method: "post", + data, + }) +} export function history(query?: Object) { - return request({ - url: '/hard/hard-after-sale/history', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/history", + method: "get", + params: query, + }) } export function agree(obj?: Object) { - return request({ - url: '/hard/hard-after-sale/agree', - method: 'put', - params: obj - }) + return request({ + url: "/hard/hard-after-sale/agree", + method: "put", + params: obj, + }) } export function disagree(obj?: Object) { - return request({ - url: '/hard/hard-after-sale/disagree', - method: 'post', - data: obj - }) + return request({ + url: "/hard/hard-after-sale/disagree", + method: "post", + data: obj, + }) } - export function detailByOrderId(query?: Object) { - return request({ - url: '/hard/hard-after-sale/detail-by-order-id', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/detail-by-order-id", + method: "get", + params: query, + }) } - export function pageJoin(query?: Object) { - return request({ - url: '/hard/hard-after-sale/page-join', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/page-join", + method: "get", + params: query, + }) } export function fetchList(query?: Object) { - return request({ - url: '/hard/hard-after-sale/page', - method: 'get', - params: query - }) + return request({ + url: "/hard/hard-after-sale/page", + method: "get", + params: query, + }) } export function addObj(obj?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'post', - data: obj - }) + return request({ + url: "/hard/hard-after-sale", + method: "post", + data: obj, + }) } export function getObj(id?: string) { - return request({ - url: '/hard/hard-after-sale/' + id, - method: 'get' - }) + return request({ + url: "/hard/hard-after-sale/" + id, + method: "get", + }) } export function delObjs(ids?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'delete', - data: ids - }) + return request({ + url: "/hard/hard-after-sale", + method: "delete", + data: ids, + }) } export function putObj(obj?: Object) { - return request({ - url: '/hard/hard-after-sale', - method: 'put', - data: obj - }) + return request({ + url: "/hard/hard-after-sale", + method: "put", + data: obj, + }) } - diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts index 9ad8815..ead8f8c 100644 --- a/src/api/hard/hard-total.ts +++ b/src/api/hard/hard-total.ts @@ -1,5 +1,13 @@ import request from "/@/utils/request" +export function pageListDept(query?: Object) { + return request({ + url: "/hard/hard-total/page-list-dept", + method: "get", + params: query, + }) +} + export function pageListSb(query?: Object) { return request({ url: "/hard/hard-total/page-list-sb", diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue index 89c6243..a6aae9d 100644 --- a/src/views/hard/hard-after-sale/order-refund.vue +++ b/src/views/hard/hard-after-sale/order-refund.vue @@ -105,9 +105,12 @@ {{ globalData.afterSaleData.applyReason }} - + {{ globalData.afterSaleData.applyDescription }} + + + diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue new file mode 100644 index 0000000..2f7b54c --- /dev/null +++ b/src/views/hard/hard-dept-total/index.vue @@ -0,0 +1,157 @@ + + + diff --git a/src/views/hard/hard-order/admin-refund-dialog.vue b/src/views/hard/hard-order/admin-refund-dialog.vue new file mode 100644 index 0000000..d61f26d --- /dev/null +++ b/src/views/hard/hard-order/admin-refund-dialog.vue @@ -0,0 +1,139 @@ + + + diff --git a/src/views/hard/hard-order/form.vue b/src/views/hard/hard-order/form.vue index a02e4e5..264e733 100644 --- a/src/views/hard/hard-order/form.vue +++ b/src/views/hard/hard-order/form.vue @@ -1,120 +1,121 @@ \ No newline at end of file + openDialog, +}) + diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 068ace4..1092b2a 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -180,7 +180,7 @@ @@ -245,6 +256,7 @@ const { push } = useRouter() // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const AdminRefundDialog = defineAsyncComponent(() => import("./admin-refund-dialog.vue")) const ShopCar = defineAsyncComponent(() => import("../components/shop-car.vue")) const TransactionList = defineAsyncComponent(() => import("/@/views/wallet/components/transaction-list.vue")) // 定义查询字典 @@ -260,6 +272,7 @@ const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refun const formDialogRef = ref() const shopCarDialogRef = ref() const transactionListRef = ref() +const adminRefundDailogRef = ref() const tabList = ref([{}]) const activeName = ref(null) // 搜索变量 @@ -318,6 +331,23 @@ const print = async (row: any) => { } } +const adminRefund = async (row: any) => { + let loading: any = null + try { + await useMessage().delConfirm("是否同意退款?") + loading = ElLoading.service({ + lock: true, + text: "提交中", + background: "rgba(0, 0, 0, 0.7)", + }) + await hardInvoice.adminRefund({ id: row.id }) + useMessage().success("操作成功") + getDataList() + } finally { + setTimeout(() => loading.close(), 500) + } +} + // 导出excel const exportExcel = () => { downBlobFile("/hard/hardwareOrder/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardwareOrder.xlsx") diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue index 94b29cc..6f89a8b 100644 --- a/src/views/wallet/wallet-cz/index.vue +++ b/src/views/wallet/wallet-cz/index.vue @@ -136,7 +136,11 @@ const resetQuery = () => { // 导出excel const exportExcel = () => { - downBlobFile("/wallet/wallet-transaction/export-cz", Object.assign(state.queryForm), "walletRecharge.xlsx") + downBlobFile( + "/wallet/wallet-transaction/export-cz", + Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }), + "walletRecharge.xlsx", + ) } // 多选事件 diff --git a/src/views/wallet/wallet-manage/change-balance.vue b/src/views/wallet/wallet-manage/change-balance.vue index fa6c2dd..12fef1a 100644 --- a/src/views/wallet/wallet-manage/change-balance.vue +++ b/src/views/wallet/wallet-manage/change-balance.vue @@ -1,165 +1,162 @@ \ No newline at end of file + openDialog, +}) + diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue index 18b2ab1..a7c8901 100644 --- a/src/views/wallet/wallet-manage/index.vue +++ b/src/views/wallet/wallet-manage/index.vue @@ -13,6 +13,11 @@ + + + + + {{ $t("common.queryBtn") }} {{ $t("common.resetBtn") }} @@ -51,7 +56,7 @@ @sort-change="sortChangeHandle" > - +