Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

src/views/hard/hard-after-sale/order-refund.vue

@@ -105,9 +105,12 @@
 				<el-descriptions-item label="退款原因: ">
 					{{ globalData.afterSaleData.applyReason }}
 				</el-descriptions-item>
-				<el-descriptions-item label="补充描述: ">
+				<el-descriptions-item :span="2" label="补充描述: ">
 					{{ globalData.afterSaleData.applyDescription }}
 				</el-descriptions-item>
+				<el-descriptions-item :span="3" label="补充凭证图片: ">
+					<preview-image :src="globalData.afterSaleData.applyPicUrls" />
+				</el-descriptions-item>
 			</el-descriptions>
 
 			<el-descriptions v-if="globalData.log && globalData.log.length" title="售后日志">

src/views/hard/hard-dept-total/index.vue

@@ -0,0 +1,157 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row :gutter="24">
+					<el-col :span="8">
+						<el-form-item class="w100" label="时间" prop="createTimeList">
+							<el-date-picker
+								v-model="state.queryForm.createTimeList"
+								value-format="YYYY-MM-DD HH:mm:ss"
+								type="datetimerange"
+							/>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<right-toolbar
+						:search="false"
+						v-model:showSearch="showSearch"
+						:export="'hard_hardTotal_export_dept'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				:summary-method="getSummaries"
+				show-summary
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column prop="deptName" min-width="150" label="部门" />
+				<el-table-column prop="walletPrice" label="充值金额" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-success': row.walletPrice != 0 }">{{ displayPrice(row.walletPrice) }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="walletCount" label="充值次数" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-success': row.walletCount != 0 }">{{ row.walletCount }}次</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="orderPayPrice" label="消费金额" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-primary': row.orderPayPrice != 0 }">{{ displayPrice(row.orderPayPrice) }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="orderPayCount" label="消费次数" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-primary': row.orderPayCount != 0 }">{{ row.orderPayCount }}次</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="orderRefundPrice" label="退款金额" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-danger': row.orderRefundPrice != 0 }">
+							{{ displayPrice(row.orderRefundPrice) }}
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="orderRefundCont" label="退款次数" align="center">
+					<template #default="{ row }">
+						<div :class="{ 'color-danger': row.orderRefundCont != 0 }">{{ row.orderRefundCont }}次</div>
+					</template>
+				</el-table-column>
+				<el-table-column v-if="false" label="操作" width="300"> </el-table-column>
+			</el-table>
+		</div>
+	</div>
+</template>
+
+<script setup lang="ts" name="hard-dept-total">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+// 表格变量
+const state: BasicTableProps = reactive<BasicTableProps>({
+	isPage: false,
+	queryForm: {},
+	pageList: hardTotalApi.pageListDept,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
+	useTable(state)
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/hard/hard-total/export-dept", Object.assign(state.queryForm), "部门交易记录导出.xlsx")
+}
+
+const getSummaries = (param: any) => {
+	const { columns, data } = param
+	const totalColumns = [
+		"walletPrice",
+		"walletCount",
+		"orderPayPrice",
+		"orderPayCount",
+		"orderRefundPrice",
+		"orderRefundCont",
+	]
+	const totalRow = Array.from({ length: columns.length })
+	columns.forEach((i: any, index: number) => {
+		if (totalColumns.includes(i.property)) {
+			const total = data
+				.filter((v: any) => v[i.property] != null)
+				.map((v: any) => Number(v[i.property]))
+				.reduce((pren: number, next: number) => pren + next, 0)
+			if (i.property.includes("Price")) {
+				totalRow[index] = displayPrice(total)
+			} else {
+				totalRow[index] = total + "次"
+			}
+		}
+	})
+	return totalRow
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+</script>

src/views/hard/hard-order/admin-refund-dialog.vue

@@ -0,0 +1,139 @@
+<template>
+	<el-dialog title="后台退款" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="售后方式" prop="way">
+						<dict-select disabled v-model="form.way" dict-code="hard_after_sale_way" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="退款原因" prop="applyReason">
+						<el-select v-model="form.applyReason">
+							<el-option
+								v-for="reason in state.setting.afterSaleRefundReasons"
+								:key="reason"
+								:label="reason"
+								:value="reason"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="补充凭证图片" prop="applyPicUrls">
+						<upload-imgs v-model:imageUrls="form.applyPicUrls" />
+					</el-form-item>
+				</el-col>
+
+				<el-col :span="24" class="mb20">
+					<el-form-item label="相关描述" prop="applyDescription">
+						<el-input
+							v-model="form.applyDescription"
+							placeholder="请输入备注"
+							type="textarea"
+							:autosize="{ minRows: 6 }"
+						/>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="admin-refund-dialog">
+import { useMessage } from "/@/hooks/message"
+import * as hardAfterSaleApi from "/@/api/hard/hard-after-sale"
+import * as walletSettingApi from "/@/api/wallet/wallet-setting"
+
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+	orderId: "",
+	way: "10",
+	applyReason: "",
+	applyPicUrls: "",
+	applyDescription: "",
+})
+
+const state = reactive<any>({
+	setting: {},
+})
+
+// 定义校验规则
+const dataRules = ref({
+	way: [{ required: true, message: "请选择售后方式", trigger: "change" }],
+	applyReason: [{ required: true, message: "请选择退款原因", trigger: "change" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+	visible.value = true
+	form.orderId = ""
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
+	// 获取hardwareOrder信息
+	if (id) {
+		form.orderId = id
+		gethardwareOrderData(id)
+	}
+}
+
+// 初始化表单数据
+const gethardwareOrderData = async (id: string) => {
+	// 获取数据
+	loading.value = true
+	try {
+		const { data } = await walletSettingApi.getObj()
+		if (data.afterSaleRefundReasons) {
+			data.afterSaleRefundReasons = data.afterSaleRefundReasons?.split(",")
+		}
+		if (data.afterSaleReturnReasons) {
+			data.afterSaleReturnReasons = data.afterSaleReturnReasons?.split(",")
+		}
+		state.setting = data
+	} finally {
+		loading.value = false
+	}
+}
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+
+	try {
+		loading.value = true
+		await hardAfterSaleApi.adminRefund(form)
+		useMessage().success("退款成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>

src/views/hard/hard-order/form.vue

@@ -1,120 +1,121 @@
 <template>
-  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
-    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-      <el-row :gutter="24">
-        <el-col :span="12" class="mb20">
-          <el-form-item label="用户id" prop="userId">
-            <el-input v-model="form.userId" placeholder="请输入用户id" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="visible = false">取消</el-button>
-        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-      </span>
-    </template>
-  </el-dialog>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="12" class="mb20">
+					<el-form-item label="用户id" prop="userId">
+						<el-input v-model="form.userId" placeholder="请输入用户id" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="HardwareOrderDialog">
-import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import * as hardOrder from "/@/api/hard/hard-order";
-import * as hardCar from "/@/api/hard/hard-car";
-import { rule } from '/@/utils/validate';
-const emit = defineEmits(['refresh']);
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import * as hardOrder from "/@/api/hard/hard-order"
+import * as hardCar from "/@/api/hard/hard-car"
+import { rule } from "/@/utils/validate"
+const emit = defineEmits(["refresh"])
 
 // 定义变量内容
-const dataFormRef = ref();
+const dataFormRef = ref()
 const visible = ref(false)
 const loading = ref(false)
 // 定义字典
 
 // 提交表单数据
 const form = reactive({
-  id: '',
-  userId: '',
-  merchantId: '',
-  hardId: '',
-  deptId: '',
-  walletId: '',
-  parentCarId: '',
-  orderSourceTypeId: '',
-  orderType: '',
-  orderStatus: '',
-  payType: '',
-  hourType: '',
-  sysType: '',
-  totalPrice: '',
-  extraPrice: '',
-  payPrice: '',
-  payTime: '',
-  payRefundId: '',
-  refundPrice: '',
-  refundTime: '',
-  refundStatus: '',
-  applyCancelTime: '',
-  androidOrderCode: '',
-  isOfflineOrder: '',
-  productDesc: '',
-  offlinePaySuccess: '',
-});
+	id: "",
+	userId: "",
+	merchantId: "",
+	hardId: "",
+	deptId: "",
+	walletId: "",
+	parentCarId: "",
+	orderSourceTypeId: "",
+	orderType: "",
+	orderStatus: "",
+	payType: "",
+	hourType: "",
+	sysType: "",
+	totalPrice: "",
+	extraPrice: "",
+	payPrice: "",
+	payTime: "",
+	payRefundId: "",
+	refundPrice: "",
+	refundTime: "",
+	refundStatus: "",
+	applyCancelTime: "",
+	androidOrderCode: "",
+	isOfflineOrder: "",
+	productDesc: "",
+	offlinePaySuccess: "",
+})
 
 // 定义校验规则
-const dataRules = ref({
-})
+const dataRules = ref({})
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true
+	form.id = ""
 
-  // 重置表单数据
-  nextTick(() => {
-    dataFormRef.value?.resetFields();
-  });
+	// 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields()
+	})
 
-  // 获取hardwareOrder信息
-  if (id) {
-    form.id = id
-    gethardwareOrderData(id)
-  }
-};
+	// 获取hardwareOrder信息
+	if (id) {
+		form.id = id
+		gethardwareOrderData(id)
+	}
+}
 
 // 提交
 const onSubmit = async () => {
-  const valid = await dataFormRef.value.validate().catch(() => { });
-  if (!valid) return false;
-
-  try {
-    loading.value = true;
-    form.id ? await hardOrder.putObj(form) : await hardOrder.addObj(form);
-    useMessage().success(form.id ? '修改成功' : '添加成功');
-    visible.value = false;
-    emit('refresh');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  } finally {
-    loading.value = false;
-  }
-};
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
 
+	try {
+		loading.value = true
+		form.id ? await hardOrder.putObj(form) : await hardOrder.addObj(form)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
 
 // 初始化表单数据
 const gethardwareOrderData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  hardOrder.getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
-};
+	// 获取数据
+	loading.value = true
+	hardOrder
+		.getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data)
+		})
+		.finally(() => {
+			loading.value = false
+		})
+}
 
 // 暴露变量
 defineExpose({
-  openDialog
-});
-</script>
+	openDialog,
+})
+</script>

src/views/hard/hard-order/index.vue

@@ -180,7 +180,7 @@
 				</el-table-column>
 				<el-table-column fixed="right" label="操作" width="200">
 					<template #default="{ row }">
-						<div class="grid grid-cols-2">
+						<div class="grid grid-cols-2 justify-between">
 							<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
 								打印发票
 							</el-button>
@@ -207,8 +207,18 @@
 							type="primary"
 							v-auth="'hard_hardwareOrder_edit'"
 							@click="formDialogRef.openDialog(row.id)"
-							>编辑</el-button
+							>编辑
+						</el-button>
+						<el-button
+							v-if="!row.payRefundId"
+							icon="stamp"
+							text
+							type="primary"
+							v-auth="'hard_hardAfterSale_adminRefund'"
+							@click="adminRefundDailogRef.openDialog(row.id)"
 						>
+							退款
+						</el-button>
 						<el-button
 							v-if="false"
 							icon="delete"
@@ -226,6 +236,7 @@
 		<!-- 编辑、新增  -->
 		<transaction-list ref="transactionListRef" @refresh="getDataList(false)" />
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<admin-refund-dialog ref="adminRefundDailogRef" @refresh="getDataList(false)" />
 		<shop-car ref="shopCarDialogRef" />
 	</div>
 </template>
@@ -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<any>([{}])
 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")