Merge remote-tracking branch 'origin/master'

.env.dev-local

@@ -9,7 +9,7 @@ ENV = 'local'
 
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+VITE_ADMIN_PROXY_PATH = http://localhost:9999
 
 
 # 图片访问基础地址

package.json

@@ -119,4 +119,4 @@
 		"type": "git",
 		"url": "https://gitee.com/log4j/pig"
 	}
-}
+}

src/api/act/act-coupon-record.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act-coupon-record/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon-record",
+		method: "put",
+		data: obj,
+	})
+}

src/api/act/act-coupon.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/wallet/act-coupon/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/wallet/act-coupon/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/wallet/act-coupon",
+		method: "put",
+		data: obj,
+	})
+}

src/api/hard/hard-third-mi-order.ts

@@ -1,5 +1,13 @@
 import request from "/@/utils/request"
 
+export function refundOrder(params: any) {
+	return request({
+		url: "/hard/hard-third-mi-order/refund",
+		method: "get",
+		params,
+	})
+}
+
 export function refreshOrder(params: any) {
 	return request({
 		url: "/hard/hard-third-mi-order/refresh",

src/api/hard/hard-total.ts

@@ -27,7 +27,7 @@ export function productTotalByDept(query: any) {
 }
 
 /**
- * 食堂统计
+ * 食堂统计(按天)
  */
 export function canteenProudctTotal(query: any) {
 	return request({
@@ -41,6 +41,21 @@ export function canteenProudctTotal(query: any) {
 	})
 }
 
+/**
+ * 食堂统计(按月)
+ */
+export function canteenProudctTotalByMonth(query: any) {
+	return request({
+		url: "/hard/hard-canteen-total-log/proudct-total-by-month",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}
+
 /**
  * 食堂统计
  */
@@ -99,3 +114,15 @@ export function pageListCs(query?: any) {
 		data: query,
 	})
 }
+
+export function pageListCsByMonth(query?: any) {
+	return request({
+		url: "/hard/hard-total/page-list-cs-by-month",
+		method: "post",
+		params: {
+			current: query.current,
+			size: query.size,
+		},
+		data: query,
+	})
+}

src/api/integrated/app-version.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/integrated/app-version/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/integrated/app-version/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/integrated/app-version",
+		method: "put",
+		data: obj,
+	})
+}

src/components/Material/index.vue

@@ -4,35 +4,20 @@
       <div class="flex-1 min-h-0">
         <el-scrollbar>
           <div class="pt-4 material-left__content p-b-4">
-            <el-tree
-                ref="treeRef"
-                node-key="id"
-                :data="cateLists"
-                empty-text="''"
-                :highlight-current="true"
-                :expand-on-click-node="false"
-                :current-node-key="cateId"
-                @node-click="handleCatSelect"
-            >
+            <el-tree ref="treeRef" node-key="id" :data="cateLists" empty-text="''" :highlight-current="true"
+              :expand-on-click-node="false" :current-node-key="cateId" @node-click="handleCatSelect">
               <template v-slot="{ data }">
                 <div class="flex items-center flex-1 min-w-0 pr-4">
-                  <img class="w-[20px] h-[16px] mr-3" src="/@/assets/icon_folder.png"/>
+                  <img class="w-[20px] h-[16px] mr-3" src="/@/assets/icon_folder.png" />
                   <span class="flex-1 mr-2 truncate">
-										{{ data.name }}
-									</span>
+                    {{ data.name }}
+                  </span>
                   <el-dropdown v-if="data.id > 0" :hide-on-click="false">
                     <span class="muted m-r-10">···</span>
                     <template #dropdown>
                       <el-dropdown-menu>
-                        <popover-input
-                            @confirm="handleEditCate($event, data.id)"
-                            size="default"
-                            :value="data.name"
-                            width="400px"
-                            :limit="20"
-                            show-limit
-                            teleported
-                        >
+                        <popover-input @confirm="handleEditCate($event, data.id)" size="default" :value="data.name"
+                          width="400px" :limit="20" show-limit teleported>
                           <div>
                             <el-dropdown-item> {{ $t('material.editGroup') }}</el-dropdown-item>
                           </div>
@@ -59,8 +44,9 @@
     <div class="flex flex-col material__center">
       <div class="flex operate-btn">
         <div class="flex flex-1">
-          <el-button icon="folder-add" type="primary" class="ml10" v-auth="'sys_file_del'" @click="visibleUpload = true"
-          >{{ $t('material.uploadFileTip') }}
+          <el-button icon="folder-add" type="primary" class="ml10" v-auth="'sys_file_del'"
+            @click="visibleUpload = true">{{
+              $t('material.uploadFileTip') }}
           </el-button>
 
           <el-button v-if="mode == 'page'" :disabled="!select.length" @click.stop="batchFileDelete()">
@@ -68,7 +54,7 @@
           </el-button>
 
           <popup v-if="mode == 'page'" class="ml-3" @confirm="batchFileMove" :disabled="!select.length"
-                 :title="$t('material.moveBtn')">
+            :title="$t('material.moveBtn')">
             <template #trigger>
               <el-button :disabled="!select.length">{{ $t('material.moveBtn') }}</el-button>
             </template>
@@ -84,12 +70,12 @@
           </popup>
         </div>
         <el-input class="mr-16 ml-80" :placeholder="$t('file.inputfileNameTip')" v-model="fileParams.original"
-                  @keyup.enter="refresh">
+          @keyup.enter="refresh">
           <template #append>
             <el-button @click="refresh">
               <template #icon>
                 <el-icon>
-                  <Search/>
+                  <Search />
                 </el-icon>
               </template>
             </el-button>
@@ -97,28 +83,20 @@
         </el-input>
         <div class="flex items-center ml-2">
           <el-tooltip :content="$t('material.list')" placement="top">
-            <div
-                class="list-icon"
-                :class="{
-								select: listShowType == 'table',
-							}"
-                @click="listShowType = 'table'"
-            >
+            <div class="list-icon" :class="{
+              select: listShowType == 'table',
+            }" @click="listShowType = 'table'">
               <el-icon>
-                <Expand/>
+                <Expand />
               </el-icon>
             </div>
           </el-tooltip>
           <el-tooltip :content="$t('material.grid')" placement="top">
-            <div
-                class="list-icon"
-                :class="{
-								select: listShowType == 'normal',
-							}"
-                @click="listShowType = 'normal'"
-            >
+            <div class="list-icon" :class="{
+              select: listShowType == 'normal',
+            }" @click="listShowType = 'normal'">
               <el-icon>
-                <Menu/>
+                <Menu />
               </el-icon>
             </div>
           </el-tooltip>
@@ -126,7 +104,7 @@
       </div>
       <div class="mt-3" v-if="mode == 'page'">
         <el-checkbox :disabled="!pager.lists.length" v-model="isCheckAll" @change="selectAll"
-                     :indeterminate="isIndeterminate">
+          :indeterminate="isIndeterminate">
           {{ $t('material.allCheck') }}
         </el-checkbox>
       </div>
@@ -138,7 +116,7 @@
                 <file-item :uri="getFileUri(item)" :file-size="fileSize" :type="type" @click="selectFile(item)">
                   <div class="item-selected" v-if="isSelect(item.id)">
                     <el-icon class="el-input__icon">
-                      <Check/>
+                      <Check />
                     </el-icon>
                   </div>
                 </file-item>
@@ -147,15 +125,8 @@
                 {{ item.original }}
               </div>
               <div class="flex items-center justify-center operation-btns">
-                <popover-input
-                    @confirm="handleFileRename($event, item.id)"
-                    size="default"
-                    :value="item.name"
-                    width="400px"
-                    :limit="50"
-                    show-limit
-                    teleported
-                >
+                <popover-input @confirm="handleFileRename($event, item.id)" size="default" :value="item.name"
+                  width="400px" :limit="50" show-limit teleported>
                   <el-button type="primary" link> {{ $t('material.rename') }}</el-button>
                 </popover-input>
                 <el-button type="primary" link @click="handleDownFile(item)"> {{ $t('material.download') }}</el-button>
@@ -165,19 +136,11 @@
           </ul>
         </el-scrollbar>
 
-        <el-table
-            ref="tableRef"
-            class="mt-4"
-            v-show="listShowType == 'table'"
-            :data="pager.lists"
-            width="100%"
-            height="100%"
-            size="large"
-            @row-click="selectFile"
-        >
+        <el-table ref="tableRef" class="mt-4" v-show="listShowType == 'table'" :data="pager.lists" width="100%"
+          height="100%" size="large" @row-click="selectFile">
           <el-table-column width="55">
             <template #default="{ row }">
-              <el-checkbox :modelValue="isSelect(row.id)" @change="selectFile(row)"/>
+              <el-checkbox :modelValue="isSelect(row.id)" @change="selectFile(row)" />
             </template>
           </el-table-column>
           <el-table-column label="图片" width="100">
@@ -192,19 +155,12 @@
               </el-link>
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="上传时间" min-width="100"/>
+          <el-table-column prop="createTime" label="上传时间" min-width="100" />
           <el-table-column label="操作" width="150" fixed="right">
             <template #default="{ row }">
               <div class="inline-block">
-                <popover-input
-                    @confirm="handleFileRename($event, row.id)"
-                    size="default"
-                    :value="row.name"
-                    width="400px"
-                    :limit="50"
-                    show-limit
-                    teleported
-                >
+                <popover-input @confirm="handleFileRename($event, row.id)" size="default" :value="row.name"
+                  width="400px" :limit="50" show-limit teleported>
                   <el-button type="primary" link> 重命名</el-button>
                 </popover-input>
               </div>
@@ -219,12 +175,12 @@
         </el-table>
 
         <div class="flex items-center justify-center flex-1" v-if="!pager.lists.length">{{
-            $t('el.transfer.noData')
+          $t('el.transfer.noData')
           }}~
         </div>
       </div>
       <div>
-        <pagination v-bind="pager" @change="getFileList" layout="total, prev, pager, next, jumper"/>
+        <pagination v-bind="pager" @change="getFileList" layout="total, prev, pager, next, jumper" />
       </div>
     </div>
     <div class="material__right" v-if="mode == 'picker'">
@@ -249,35 +205,31 @@
         </el-scrollbar>
       </div>
     </div>
-    <preview v-model="showPreview" :url="previewUrl" :type="type" :fileName="fileName"/>
+    <preview v-model="showPreview" :url="previewUrl" :type="type" :fileName="fileName" />
   </div>
 
   <el-dialog :title="$t('material.uploadFileTip')" v-model="visibleUpload" :destroy-on-close="true" draggable>
     <upload-file @change="refresh" v-if="props.type === 'image'" :data="{ groupId: cateId, type: typeValue }"
-                 :fileType="['png', 'jpg', 'jpeg']"/>
+      :fileType="['png', 'jpg', 'jpeg']" />
 
     <upload-file @change="refresh" v-if="props.type === 'video'" :data="{ groupId: cateId, type: typeValue }"
-                 :fileType="['mp4']"/>
+      :fileType="['mp4']" />
 
-    <upload-file
-        @change="refresh"
-        v-if="props.type === 'file'"
-        :data="{ cid: cateId, type: typeValue }"
-        :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'docx', 'xlsx', 'pptx']"
-    />
+    <upload-file @change="refresh" v-if="props.type === 'file'" :data="{ cid: cateId, type: typeValue }"
+      :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'docx', 'xlsx', 'pptx', 'apk']" />
   </el-dialog>
 </template>
 
 <script lang="ts" setup>
 const Popup = defineAsyncComponent(() => import('/@/components/Popup/index.vue'));
 const PopoverInput = defineAsyncComponent(() => import('/@/components/PopoverInput/index.vue'));
-import {useCate, useFile} from './hook';
+import { useCate, useFile } from './hook';
 import FileItem from './file.vue';
 import Preview from './preview.vue';
-import type {Ref} from 'vue';
+import type { Ref } from 'vue';
 import other from '/@/utils/other';
 
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 const kkServerURL = import.meta.env.VITE_KK_SERVER_URL
 const props = defineProps({
   fileSize: {
@@ -302,7 +254,7 @@ const props = defineProps({
   },
 });
 const emit = defineEmits(['change']);
-const {limit} = toRefs(props);
+const { limit } = toRefs(props);
 const typeValue = computed<number>(() => {
   switch (props.type) {
     case 'image':
@@ -382,15 +334,15 @@ const handleDownFile = (item: any) => {
 };
 
 watch(
-    visible,
-    async (val: boolean) => {
-      if (val) {
-        getData();
-      }
-    },
-    {
-      immediate: true,
+  visible,
+  async (val: boolean) => {
+    if (val) {
+      getData();
     }
+  },
+  {
+    immediate: true,
+  }
 );
 watch(cateId, () => {
   fileParams.name = '';
@@ -398,24 +350,24 @@ watch(cateId, () => {
 });
 
 watch(
-    select,
-    (val: any[]) => {
-      emit('change', val);
-      if (val.length == pager.lists.length && val.length !== 0) {
-        isIndeterminate.value = false;
-        isCheckAll.value = true;
-        return;
-      }
-      if (val.length > 0) {
-        isIndeterminate.value = true;
-      } else {
-        isCheckAll.value = false;
-        isIndeterminate.value = false;
-      }
-    },
-    {
-      deep: true,
+  select,
+  (val: any[]) => {
+    emit('change', val);
+    if (val.length == pager.lists.length && val.length !== 0) {
+      isIndeterminate.value = false;
+      isCheckAll.value = true;
+      return;
     }
+    if (val.length > 0) {
+      isIndeterminate.value = true;
+    } else {
+      isCheckAll.value = false;
+      isIndeterminate.value = false;
+    }
+  },
+  {
+    deep: true,
+  }
 );
 
 const getFileUri = (item: any) => {
@@ -434,8 +386,10 @@ defineExpose({
 <style scoped lang="scss">
 .material {
   @apply h-full min-h-0 flex flex-1;
+
   &__left {
     @apply border-r border-br flex flex-col w-[200px];
+
     :deep(.el-tree-node__content) {
       height: 36px;
     }

src/components/Upload/index.vue

@@ -1,25 +1,11 @@
 <!--文件上传组件-->
 <template>
 	<div class="w-full upload-file">
-		<el-upload
-			ref="fileUpload"
-			v-if="props.type === 'default'"
-			:action="baseURL + other.adaptationUrl(props.uploadFileUrl)"
-			:before-upload="handleBeforeUpload"
-			:file-list="fileList"
-			:headers="headers"
-			:limit="limit"
-			:on-error="handleUploadError"
-			:on-remove="handleRemove"
-			:on-preview="handlePreview"
-      :on-exceed="handleExceed"
-			:data="formData"
-			:auto-upload="autoUpload"
-			:on-success="handleUploadSuccess"
-			class="upload-file-uploader"
-			drag
-			multiple
-		>
+		<el-upload ref="fileUpload" v-if="props.type === 'default'"
+			:action="baseURL + other.adaptationUrl(props.uploadFileUrl)" :before-upload="handleBeforeUpload"
+			:file-list="fileList" :headers="headers" :limit="limit" :on-error="handleUploadError"
+			:on-remove="handleRemove" :on-preview="handlePreview" :on-exceed="handleExceed" :data="formData"
+			:auto-upload="autoUpload" :on-success="handleUploadSuccess" class="upload-file-uploader" drag multiple>
 			<i class="el-icon-upload"></i>
 			<div class="el-upload__text">
 				{{ $t('excel.operationNotice') }}
@@ -29,8 +15,7 @@
 				<div class="el-upload__tip" v-if="props.isShowTip">
 					{{ $t('excel.pleaseUpload') }}
 					<template v-if="props.fileSize">
-						{{ $t('excel.size') }} <b style="color: #f56c6c">{{ props.fileSize }}MB</b></template
-					>
+						{{ $t('excel.size') }} <b style="color: #f56c6c">{{ props.fileSize }}MB</b></template>
 					<template v-if="props.fileType">
 						{{ $t('excel.format') }} <b style="color: #f56c6c">{{ props.fileType.join('/') }}</b>
 					</template>
@@ -38,23 +23,11 @@
 				</div>
 			</template>
 		</el-upload>
-		<el-upload
-			ref="fileUpload"
-			v-if="props.type === 'simple'"
-			:action="baseURL + other.adaptationUrl(props.uploadFileUrl)"
-			:before-upload="handleBeforeUpload"
-			:file-list="fileList"
-			:headers="headers"
-			:limit="limit"
-			:auto-upload="autoUpload"
-			:on-error="handleUploadError"
-			:on-remove="handleRemove"
-      :on-exceed="handleExceed"
-      :data="formData"
-			:on-success="handleUploadSuccess"
-			class="upload-file-uploader"
-			multiple
-		>
+		<el-upload ref="fileUpload" v-if="props.type === 'simple'"
+			:action="baseURL + other.adaptationUrl(props.uploadFileUrl)" :before-upload="handleBeforeUpload"
+			:file-list="fileList" :headers="headers" :limit="limit" :auto-upload="autoUpload"
+			:on-error="handleUploadError" :on-remove="handleRemove" :on-exceed="handleExceed" :data="formData"
+			:on-success="handleUploadSuccess" class="upload-file-uploader" multiple>
 			<el-button type="primary" link>{{ $t('excel.clickUpload') }}</el-button>
 		</el-upload>
 	</div>
@@ -76,11 +49,11 @@ const props = defineProps({
 	// 大小限制(MB)
 	fileSize: {
 		type: Number,
-		default: 5,
+		default: 100,
 	},
 	fileType: {
 		type: Array,
-		default: () => ['png', 'jpg', 'jpeg', 'doc', 'xls', 'ppt', 'txt', 'pdf', 'docx', 'xlsx', 'pptx'],
+		default: () => ['png', 'jpg', 'jpeg', 'doc', 'xls', 'ppt', 'txt', 'pdf', 'docx', 'xlsx', 'pptx', 'apk'],
 	},
 	// 是否显示提示
 	isShowTip: {
@@ -135,7 +108,7 @@ const formData = computed(() => {
 
 // 上传前校检格式和大小
 const handleBeforeUpload = (file: File) => {
-  // 校检文件类型
+	// 校检文件类型
 	if (props.fileType.length) {
 		const fileName = file.name.split('.');
 		const fileExt = fileName[fileName.length - 1];
@@ -200,7 +173,7 @@ const handlePreview = (file: any) => {
 
 // 添加 handleExceed 函数
 const handleExceed = (files: File[]) => {
-  useMessage().warning(`${t('excel.uploadLimit')} ${props.limit} ${t('excel.files')}`);
+	useMessage().warning(`${t('excel.uploadLimit')} ${props.limit} ${t('excel.files')}`);
 };
 
 /**

src/hooks/dict.ts

@@ -1,29 +1,35 @@
-import { dict } from '/@/stores/dict';
-import { getDicts } from '/@/api/admin/dict';
-import { ref, toRefs } from 'vue';
+import { dict } from "/@/stores/dict"
+import { getDicts } from "/@/api/admin/dict"
+import { ref, toRefs } from "vue"
 
 /**
  * 获取字典数据
  */
 export function useDict(...args: any): any {
-	const res = ref({});
+	const res = ref({})
 	return (() => {
 		args.forEach((dictType: String) => {
 			// @ts-ignore
-			res.value[dictType] = [];
-			const dicts = dict().getDict(dictType);
+			res.value[dictType] = []
+			const dicts = dict().getDict(dictType)
 			if (dicts) {
 				// @ts-ignore
-				res.value[dictType] = dicts;
+				res.value[dictType] = dicts
 			} else {
 				getDicts(dictType).then((resp) => {
 					// @ts-ignore
-					res.value[dictType] = resp.data.map((p: any) => ({ label: p.label, value: p.value, elTagType: p.listClass, elTagClass: p.cssClass }));
+					res.value[dictType] = resp.data.map((p: any) => ({
+						label: p.label,
+						value: p.value,
+						elTagType: p.listClass,
+						elTagClass: p.cssClass,
+						remarks: p.remarks,
+					}))
 					// @ts-ignore
-					dict().setDict(dictType, res.value[dictType]);
-				});
+					dict().setDict(dictType, res.value[dictType])
+				})
 			}
-		});
-		return toRefs(res.value);
-	})();
+		})
+		return toRefs(res.value)
+	})()
 }

src/utils/other.ts

@@ -265,8 +265,26 @@ export function downBlobFile(url: any, query: any, fileName: string) {
 		.then((response) => {
 			handleBlobFile(response, fileName)
 		})
-		.catch((error) => {
-			useMessage().error(error.msg || "下载失败")
+		.catch(async (error) => {
+			let msg = "下载失败"
+			try {
+				if (error instanceof Blob) {
+					const text = typeof (error as any).text === "function" ? await (error as any).text() : ""
+					if (text) {
+						try {
+							const json = JSON.parse(text)
+							msg = json.msg || json.message || msg
+						} catch {
+							msg = text || msg
+						}
+					}
+				} else if (typeof error === "object") {
+					msg = (error as any).msg || (error as any).message || msg
+				}
+			} catch {
+				msg = "下载失败"
+			}
+			useMessage().error(msg)
 		})
 }
 
@@ -286,8 +304,26 @@ export function postDownBlobFile(url: any, data: any, fileName: string) {
 		.then((response) => {
 			handleBlobFile(response, fileName)
 		})
-		.catch((error) => {
-			useMessage().error(error.msg || "下载失败")
+		.catch(async (error) => {
+			let msg = "下载失败"
+			try {
+				if (error instanceof Blob) {
+					const text = typeof (error as any).text === "function" ? await (error as any).text() : ""
+					if (text) {
+						try {
+							const json = JSON.parse(text)
+							msg = json.msg || json.message || msg
+						} catch {
+							msg = text || msg
+						}
+					}
+				} else if (typeof error === "object") {
+					msg = (error as any).msg || (error as any).message || msg
+				}
+			} catch {
+				msg = "下载失败"
+			}
+			useMessage().error(msg)
 		})
 }
 
@@ -334,7 +370,6 @@ export function handleBlobFile(response: any, fileName: string) {
 		} else if (response.data && response.data instanceof Blob) {
 			blob = response.data
 		} else {
-			// 尝试构造安全的blob
 			const safeData = Array.isArray(response) ? response : [response]
 			blob = new Blob(safeData, { type: "application/octet-stream" })
 		}
@@ -344,6 +379,29 @@ export function handleBlobFile(response: any, fileName: string) {
 		return
 	}
 
+	if (blob.type === "application/json" || blob.type === "text/plain") {
+		try {
+			const handleText = (t: string) => {
+				try {
+					const json = JSON.parse(t)
+					useMessage().error(json.msg || json.message || "下载失败")
+				} catch {
+					useMessage().error(t || "下载失败")
+				}
+			}
+			if (typeof (blob as any).text === "function") {
+				(blob as any).text().then((t: string) => handleText(t))
+			} else {
+				const reader = new FileReader()
+				reader.onload = () => handleText(String(reader.result || ""))
+				reader.readAsText(blob)
+			}
+		} catch {
+			useMessage().error("下载失败")
+		}
+		return
+	}
+
 	// 3. 验证文件大小 (防止过大文件)
 	const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100MB限制
 	if (blob.size > MAX_FILE_SIZE) {

src/views/act/act-cancel/form.vue

@@ -1,6 +1,7 @@
 <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-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="活动商户" prop="mchId">
@@ -28,13 +29,15 @@
 
 				<el-col :span="12" class="mb20">
 					<el-form-item label="开始时间" prop="startTime">
-						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择开始时间" v-model="form.startTime" />
+						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择开始时间"
+							v-model="form.startTime" />
 					</el-form-item>
 				</el-col>
 
 				<el-col :span="12" class="mb20">
 					<el-form-item label="到期时间" prop="expireTime">
-						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择到期时间" v-model="form.expireTime" />
+						<el-date-picker value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择到期时间"
+							v-model="form.expireTime" />
 					</el-form-item>
 				</el-col>
 
@@ -124,7 +127,7 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 
 	try {

src/views/act/act-cancel/index.vue

@@ -24,38 +24,22 @@
 			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_actCancel_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+						v-auth="'wallet_actCancel_add'">
 						新 增
 					</el-button>
-					<el-button
-						plain
-						:disabled="multiple"
-						icon="Delete"
-						type="primary"
-						v-auth="'wallet_actCancel_del'"
-						@click="handleDelete(selectObjs)"
-					>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_actCancel_del'"
+						@click="handleDelete(selectObjs)">
 						删除
 					</el-button>
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						:export="'wallet_actCancel_export'"
-						@exportExcel="exportExcel"
-						class="ml10 mr20"
-						style="float: right"
-						@queryTable="getDataList"
-					></right-toolbar>
+					<right-toolbar v-model:showSearch="showSearch" :export="'wallet_actCancel_export'"
+						@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"
-				@selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle"
-			>
+			<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle">
 				<el-table-column type="selection" width="40" align="center" />
 				<el-table-column type="index" label="#" width="40" />
 				<el-table-column prop="merchantName" label="活动商户" show-overflow-tooltip />
@@ -68,14 +52,8 @@
 				</el-table-column>
 				<el-table-column prop="actStatus" label="活动状态" min-width="120" align="center">
 					<template #default="{ row }">
-						<el-switch
-							active-value="1"
-							inactive-value="2"
-							active-text="开启活动"
-							inactive-text="关闭活动"
-							v-model="row.actStatus"
-							@change="updateActStatusChange(row)"
-						/>
+						<el-switch active-value="1" inactive-value="2" active-text="开启活动" inactive-text="关闭活动"
+							v-model="row.actStatus" @change="updateActStatusChange(row)" />
 					</template>
 				</el-table-column>
 				<el-table-column prop="actStatus" label="预约总数" show-overflow-tooltip>
@@ -95,14 +73,17 @@
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="{ row }">
-						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancel_edit'" @click="formDialogRef.openDialog(row.id)">
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCancel_edit'"
+							@click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'wallet_actCancel_del'" @click="handleDelete([row.id])"> 删除 </el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_actCancel_del'"
+							@click="handleDelete([row.id])"> 删除 </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+				v-bind="state.pagination" />
 		</div>
 
 		<!-- 编辑、新增  -->

src/views/act/act-coupon-record/index.vue

@@ -0,0 +1,218 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row class="ml10" v-show="showSearch">
+        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+          <el-form-item style="width: 250px" label="领取用户" prop="userId">
+            <select-user v-model="state.queryForm.userId" />
+          </el-form-item>
+          <el-form-item style="width: 250px" label="使用状态" prop="status">
+            <dict-select v-model="state.queryForm.status" dict-code="act_coupon_record_status" />
+          </el-form-item>
+          <el-form-item style="width: 450px" 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-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_actCouponRecord_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <!-- :export="'wallet_actCouponRecord_export'" -->
+          <right-toolbar v-model:showSearch="showSearch" :export="false" @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" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="60" />
+        <el-table-column label="领取用户">
+          <el-table-column prop="username" width="120" label="用户名称" show-overflow-tooltip />
+          <el-table-column prop="userDeptName" width="120" label="用户部门" show-overflow-tooltip />
+          <el-table-column prop="userMobile" width="120" label="用户手机号" show-overflow-tooltip />
+        </el-table-column>
+        <el-table-column label="优惠券">
+          <el-table-column prop="couponCode" width="300" show-overflow-tooltip label="券码" />
+          <el-table-column prop="couponName" width="100" label="名称" show-overflow-tooltip />
+          <el-table-column prop="couponType" label="类型" width="160" show-overflow-tooltip>
+            <template #default="{ row }">
+              <dict-tag :options="act_coupon_type" :value="row.couponType" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="faceValue" label="面额/折扣" width="100" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.couponType === '2'">{{ Number(row.faceValue) }}%</span>
+              <span v-else>¥{{ displayPrice(row.faceValue) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="minPoint" label="使用门槛" width="100" show-overflow-tooltip>
+            <template #default="{ row }">
+              {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+                displayPrice(row.minPoint) }}
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column prop="status" label="使用状态" width="140" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="act_coupon_record_status" :value="row.status" />
+          </template>
+        </el-table-column>
+
+        <el-table-column width="340" prop="startTime" label="有效期">
+          <template #default="{ row }">
+            <view>
+              <span>{{ row.startTime }}</span>
+              <span>至</span>
+              <span>{{ row.endTime }}</span>
+            </view>
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="使用信息">
+          <el-table-column prop="useTime" label="使用时间" width="180" show-overflow-tooltip />
+          <el-table-column prop="useAmount" label="抵扣金额" width="100" show-overflow-tooltip>
+            <template #default="{ row }">¥{{ displayPrice(row.useAmount) }}</template>
+          </el-table-column>
+        </el-table-column>
+
+
+        <el-table-column label="操作" fixed="right" width="220">
+          <template #default="{ row }">
+            <el-button icon="delete" text type="primary" v-auth="'wallet_actCouponRecord_del'"
+              @click="handleDelete([row.id])">删除</el-button>
+            <el-button icon="Clock" text type="primary" :disabled="row.status !== '0'"
+              @click="openExtend(row)">延长有效期</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 延长期对话框 -->
+    <el-dialog v-model="extendVisible" title="延长优惠券有效期" width="480px" :close-on-click-modal="false" draggable>
+      <el-form label-width="100px">
+        <el-form-item label="当前结束时间">
+          <el-input v-model="extendForm.currentEnd" disabled />
+        </el-form-item>
+        <el-form-item label="新的结束时间">
+          <el-date-picker v-model="extendForm.newEnd" type="datetime" style="width: 100%" placeholder="选择新的结束时间" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="extendVisible = false">取消</el-button>
+          <el-button type="primary" @click="submitExtend">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemActCouponRecord">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as actCouponRecordApi from '/@/api/act/act-coupon-record'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+
+// 定义查询字典
+const { act_coupon_type, act_coupon_record_status }
+  = useDict("act_coupon_type", "act_coupon_record_status")
+// 定义变量内容
+
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: actCouponRecordApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/act-coupon-record/export', Object.assign(state.queryForm, { ids: selectObjs }), 'actCouponRecord.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await actCouponRecordApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+
+
+const extendVisible = ref(false)
+const extendForm = reactive({ id: '', currentEnd: '', newEnd: '' })
+const openExtend = (row: any) => {
+  extendForm.id = row.id
+  extendForm.currentEnd = row.endTime
+  extendForm.newEnd = row.endTime
+  extendVisible.value = true
+}
+const submitExtend = async () => {
+  if (!extendForm.id || !extendForm.newEnd) {
+    useMessage().warning('请选择新的结束时间')
+    return
+  }
+  try {
+    await actCouponRecordApi.putObj({ id: extendForm.id, endTime: extendForm.newEnd })
+    useMessage().success('延长成功')
+    extendVisible.value = false
+    getDataList()
+  } catch (err: any) {
+    useMessage().error(err.msg || '延长失败')
+  }
+}
+</script>

src/views/act/act-coupon/form.vue

@@ -0,0 +1,251 @@
+<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="120px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="优惠券名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入优惠券名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="状态" prop="status">
+            <dict-select v-model="form.status" dict-code="act_coupon_status" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="优惠券类型" prop="type">
+            <dict-select v-model="form.type" dict-code="act_coupon_type" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="面额/折扣" prop="faceValue">
+            <el-input v-model="form.faceValue" placeholder="请输入面额/折扣">
+              <template #append>
+                {{ form.type == '2' ? '%' : '元' }}
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="使用门槛" prop="minPoint">
+            <el-input v-model="form.minPoint" placeholder="不填表示无门槛" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="发行总量" prop="totalCount">
+            <el-input v-model="form.totalCount" placeholder="不填表示不限量" />
+          </el-form-item>
+        </el-col>
+        <el-alert class="mb20 ml20 mr20" v-if="typeInfo.title" :title="typeInfo.title" :description="typeInfo.desc"
+          type="info" show-icon />
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="使用说明" prop="description">
+            <el-input v-model="form.description" type="textarea" :rows="3" placeholder="请输入使用说明" />
+          </el-form-item>
+        </el-col>
+
+        <el-divider>限领</el-divider>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="限领类型" prop="limitType">
+            <dict-select v-model="form.limitType" dict-code="act_coupon_limit_type" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="每人限领数量" prop="limitCount">
+            <el-input v-model="form.limitCount" placeholder="请输入每人限领数量">
+              <template #append>
+                次
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-divider>有效期</el-divider>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="有效期类型" prop="validType">
+            <dict-select v-model="form.validType" dict-code="act_coupon_valid_type" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20" v-if="form.validType === '1'">
+          <el-form-item label="有效期" prop="validRange">
+            <el-date-picker v-model="validRange" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
+              style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20" v-if="form.validType === '2'">
+          <el-form-item label="领取后有效天数" prop="validDays">
+            <el-input v-model="form.validDays" placeholder="请输入天数">
+              <template #append>
+                天
+              </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-divider>使用范围</el-divider>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="适用范围" prop="useScopeType">
+            <dict-select v-model="form.useScopeType" dict-code="act_coupon_use_scope_type" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" class="mb20" v-if="form.useScopeType !== '0'">
+          <el-form-item v-if="form.useScopeType === '2'" label="指定商户" prop="scopeId">
+            <select-mch v-model="form.scopeId" />
+          </el-form-item>
+          <el-form-item v-if="form.useScopeType === '3'" label="指定商户分类" prop="scopeId">
+            <dict-select v-model="form.scopeId" dict-code="merchant_type" />
+          </el-form-item>
+        </el-col>
+        <el-divider>营销相关</el-divider>
+        <el-col :span="24" class="mb20">
+          <el-form-item label="绑定公告" prop="bindNotifyId">
+            <select-notice v-model="form.bindNotifyId" />
+          </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="ActCouponDialog">
+import { useMessage } from "/@/hooks/message";
+import * as actCouponApi from '/@/api/act/act-coupon'
+import { rule } from '/@/utils/validate';
+import { useDict } from "/@/hooks/dict"
+
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { act_coupon_type } = useDict("act_coupon_type")
+// 提交表单数据
+const defaultForm = {
+  id: '',
+  name: '',
+  type: '1',
+  faceValue: '',
+  minPoint: '',
+  totalCount: '',
+  surplusCount: '',
+  limitCount: '1',
+  limitType: '1',
+  validType: '1',
+  validStartTime: '',
+  validEndTime: '',
+  validDays: '',
+  useScopeType: '1',
+  scopeId: '',
+  status: '1',
+  description: '',
+  bindNotifyId: '',
+};
+const form = reactive({ ...defaultForm });
+
+// 定义校验规则
+const dataRules = ref({
+  name: [{ required: true, message: '请输入优惠券名称', trigger: 'blur' }, { validator: rule.overLength, trigger: 'blur' }],
+  type: [{ required: true, message: '请选择优惠券类型', trigger: 'change' }],
+  faceValue: [{ required: true, message: '请输入面额/折扣', trigger: 'blur' }],
+  limitType: [{ required: true, message: '请选择限领类型', trigger: 'change' }],
+  validType: [{ required: true, message: '请选择有效期类型', trigger: 'change' }],
+  validDays: [{ required: () => form.validType === '2', message: '请输入有效天数', trigger: 'blur' }],
+  useScopeType: [{ required: true, message: '请选择适用范围', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+  description: [{ validator: rule.overLength, trigger: 'blur' }]
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取actCoupon信息
+  if (id) {
+    form.id = id
+    getactCouponData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await actCouponApi.putObj(form) : await actCouponApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getactCouponData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  actCouponApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+
+
+
+const typeInfo = computed(() => {
+  if (!act_coupon_type.value?.length) return { title: '', desc: '' }
+  const type = act_coupon_type.value.find((v: any) => v.value == form.type) || {}
+  return { title: type?.label ?? "", desc: type?.remarks ?? "" }
+})
+
+const validRange = ref<any>()
+watch(
+  () => form.validType,
+  () => {
+    if (form.validType === '1') {
+      validRange.value = form.validStartTime && form.validEndTime ? [form.validStartTime, form.validEndTime] : null
+    } else {
+      validRange.value = null
+    }
+  },
+  { immediate: true }
+)
+watch(
+  validRange,
+  (range) => {
+    if (Array.isArray(range) && range.length === 2) {
+      form.validStartTime = range[0]
+      form.validEndTime = range[1]
+    } else {
+      form.validStartTime = ''
+      form.validEndTime = ''
+    }
+  }
+)
+</script>

src/views/act/act-coupon/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row class="ml10" v-show="showSearch">
+        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+          <el-form-item label="优惠券名称" prop="name">
+            <el-input placeholder="输入优惠券名称" style="max-width: 200px" v-model="state.queryForm.name" />
+          </el-form-item>
+          <el-form-item label="优惠券类型" prop="type">
+            <dict-select style="width: 200px" v-model="state.queryForm.type" dict-code="act_coupon_type" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <dict-select style="width: 200px" v-model="state.queryForm.status" dict-code="act_coupon_status" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'wallet_actCoupon_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_actCoupon_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <!-- :export="'wallet_actCoupon_export'" -->
+          <right-toolbar v-model:showSearch="showSearch" :export="false" @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" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="60" />
+        <el-table-column label="优惠券基础信息">
+          <el-table-column prop="uniqueCode" label="唯一编码" width="100" />
+          <el-table-column prop="name" label="名称" width="160" show-overflow-tooltip />
+          <el-table-column prop="type" label="类型" width="100">
+            <template #default="{ row }">
+              <dict-tag :options="act_coupon_type" :value="row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="faceValue" label="面额/折扣" width="150" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.type === '2'">{{ Number(row.faceValue) }}%</span>
+              <span v-else>¥{{ formatFenToYuan(row.faceValue) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="minPoint" label="使用门槛" width="140" show-overflow-tooltip>
+            <template #default="{ row }">{{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+              formatFenToYuan(row.minPoint) }}</template>
+          </el-table-column>
+          <el-table-column prop="totalCount" label="发行总量" width="120" show-overflow-tooltip>
+            <template #default="{ row }">{{ Number(row.totalCount) === -1 ? '不限量' : row.totalCount }}</template>
+          </el-table-column>
+          <el-table-column prop="surplusCount" label="剩余数量" width="120" show-overflow-tooltip />
+          <el-table-column prop="status" label="状态" width="140" show-overflow-tooltip>
+            <template #default="{ row }">
+              <dict-tag :options="act_coupon_status" :value="row.status" />
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="优惠券限领">
+          <el-table-column prop="limitType" label="限领类型" width="180" show-overflow-tooltip>
+            <template #default="{ row }">
+              <dict-tag :options="act_coupon_limit_type" :value="row.limitType" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="limitCount" label="每人限领" width="120" show-overflow-tooltip />
+        </el-table-column>
+        <el-table-column label="优惠券有效期">
+          <el-table-column prop="validType" label="有效期类型" width="160" show-overflow-tooltip>
+            <template #default="{ row }">
+              <dict-tag :options="act_coupon_valid_type" :value="row.validType" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="validType" label="有效期" width="160" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span v-if="row.validType === '2'">领取后{{ row.validDays }}天</span>
+              <span v-else>
+                <span v-if="row.validStartTime">{{ formatDate(row.validStartTime, "YYYY-mm-dd HH:MM:SS") }}</span>
+                至
+                <span v-if="row.validEndTime">{{ formatDate(row.validEndTime, "YYYY-mm-dd HH:MM:SS") }}</span>
+              </span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+
+        <el-table-column prop="useScopeType" label="适用范围" width="180" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="act_coupon_use_scope_type" :value="row.useScopeType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_actCoupon_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_actCoupon_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemActCoupon">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as actCouponApi from '/@/api/act/act-coupon'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { formatDate } from '/@/utils/formatTime';
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { act_coupon_type, act_coupon_limit_type, act_coupon_status, act_coupon_use_scope_type, act_coupon_valid_type }
+  = useDict("act_coupon_type", "act_coupon_limit_type", "act_coupon_status", "act_coupon_use_scope_type", "act_coupon_valid_type")
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: actCouponApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/act-coupon/export', Object.assign(state.queryForm, { ids: selectObjs }), '优惠券活动.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await actCouponApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+
+function formatFenToYuan(val: number | string) {
+  const n = Number(val)
+  if (isNaN(n)) return val as any
+  return (n / 100).toFixed(2)
+}
+
+function parseIds(ids: string | number) {
+  if (!ids && ids !== 0) return []
+  return String(ids)
+    .split(',')
+    .map((v) => v.trim())
+    .filter((v) => v)
+}
+</script>

src/views/admin/file/index.vue

@@ -3,7 +3,8 @@
 		<div class="material-index">
 			<el-card class="!border-none" shadow="never">
 				<el-tabs v-model="activeTab">
-					<el-tab-pane v-for="item in tabsMap" :label="item.name" :name="item.type" :index="item.type" :key="item.type" lazy>
+					<el-tab-pane v-for="item in tabsMap" :label="item.name" :name="item.type" :index="item.type"
+						:key="item.type" lazy>
 						<material :type="item.type" mode="page" file-size="120px" :limit="-1" :page-size="20" />
 					</el-tab-pane>
 				</el-tabs>
@@ -37,13 +38,16 @@ const activeTab = ref('image');
 <style lang="scss" scoped>
 .material-index {
 	min-width: 700px;
+
 	:deep(.el-tabs) {
 		height: calc(100vh - 180px);
 		display: flex;
 		flex-direction: column;
+
 		.el-tabs__header {
 			margin-bottom: 0 !important;
 		}
+
 		.el-tabs__content,
 		.el-tab-pane {
 			min-height: 0;

src/views/canteenDailyDishes/index.vue

@@ -1,10 +1,8 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-view">
-			<div
-				ref="containerRef"
-				class="relative h-full w-full overflow-y-scroll scrollbar-hidden bg-gradient-to-br from-[#232e55] to-[#040a1b] py-2"
-			>
+			<div ref="containerRef"
+				class="relative h-full w-full overflow-y-scroll scrollbar-hidden bg-gradient-to-br from-[#232e55] to-[#040a1b] py-2">
 				<!-- 背景圆点 -->
 				<div class="pointer-events-none absolute inset-0 pattern-dots opacity-[0.08]"></div>
 
@@ -24,16 +22,17 @@
 				<div class="h-8 relative mx-4 flex items-center justify-between">
 					<div class="flex items-center">
 						<h1 class="text-4xl text-[#b0bfff] font-bold tracking-wider">今日午餐菜品</h1>
-						<div class="text-xl text-blue-400 drop-shadow-lg ml-5">{{ currentDate }}&nbsp;&nbsp;&nbsp;{{ currentTime }}</div>
+						<div class="text-xl text-blue-400 drop-shadow-lg ml-5">{{ currentDate }}&nbsp;&nbsp;&nbsp;{{
+							currentTime }}</div>
 					</div>
 
 					<!-- 全屏按钮 -->
 					<el-tooltip :content="isFullscreen ? '退出全屏' : '全屏'" placement="left" effect="dark">
-						<button
-							@click="toggleFullScreen"
-							class="flex h-8 w-8 items-center justify-center rounded-xl bg-[#F7D6C3]/20 transition-all hover:scale-110 hover:bg-[#F7D6C3]/40"
-						>
-							<el-icon class="icon h-10 w-10 font-bold bg-contain bg-center bg-no-repeat"><FullScreen /></el-icon>
+						<button @click="toggleFullScreen"
+							class="flex h-8 w-8 items-center justify-center rounded-xl bg-[#F7D6C3]/20 transition-all hover:scale-110 hover:bg-[#F7D6C3]/40">
+							<el-icon class="icon h-10 w-10 font-bold bg-contain bg-center bg-no-repeat">
+								<FullScreen />
+							</el-icon>
 						</button>
 					</el-tooltip>
 				</div>
@@ -42,17 +41,21 @@
 				<div class="w-full flex flex-wrap items-center" v-for="(hourType, index) in foodData" :key="index">
 					<div v-for="dish in hourType" :key="dish.id" class="p-2" :style="cardStyle">
 						<div class="relative overflow-hidden rounded-tl rounded-tr" :style="foodCardStyle">
-							<img :src="imageBaseUrl + dish.picUrl" :alt="dish.name" class="h-full w-full object-cover" />
+							<img :src="imageBaseUrl + dish.picUrl" :alt="dish.name"
+								class="h-full w-full object-cover" />
 							<div class="ribbon">午餐</div>
 							<div class="absolute left-1 top-1">
-								<star-medal :text="canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.name" />
+								<star-medal
+									:text="canteenCategoryOption?.find((v: any) => v.id == dish.categoryId)?.name" />
 							</div>
 						</div>
-						<div class="w-full flex items-center justify-between bg-[#AEBBF9]/40 px-2 py-2 backdrop-blur-sm rounded-bl rounded-br">
+						<div
+							class="w-full flex items-center justify-between bg-[#AEBBF9]/40 px-2 py-2 backdrop-blur-sm rounded-bl rounded-br">
 							<h3 class="text-2xl font-bold text-[#7cacff] drop-shadow-lg line-clamp-1 whitespace-nowrap">
 								{{ dish.name }}
 							</h3>
-							<p class="text-3xl font-bold text-[#a9c7ff] drop-shadow-lg whitespace-nowrap">¥{{ displayPrice(dish.price) }}</p>
+							<p class="text-3xl font-bold text-[#a9c7ff] drop-shadow-lg whitespace-nowrap">¥{{
+								displayPrice(dish.price) }}</p>
 						</div>
 					</div>
 				</div>
@@ -218,23 +221,28 @@ const getCanteenDishesCategory = async () => {
 	background-image: radial-gradient(#eff4ee 1px, transparent 10px);
 	background-size: 10px 10px;
 }
+
 .ink-cloud {
 	background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23F7D6C3' d='M50,0C36.7,0,25,11.7,25,25c0,13.3,11.7,25,25,25s25-11.7,25-25C75,11.7,63.3,0,50,0z M50,40c-8.3,0-15-6.7-15-15s6.7-15,15-15s15,6.7,15,15S58.3,40,50,40z'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='20s' repeatCount='indefinite'/%3E%3C/path%3E%3C/svg%3E");
 	background-size: contain;
 	background-repeat: no-repeat;
 	background-position: center;
 }
+
 .scrollbar-hidden::-webkit-scrollbar {
 	display: none;
 }
+
 .scrollbar-hidden {
 	scrollbar-width: none;
 	-ms-overflow-style: none;
 }
+
 ::selection {
 	background: #1879ff;
 	color: #fff;
 }
+
 .ribbon {
 	width: 80px;
 	height: 20px;

src/views/hard/canteen-product-total/components/product-total-table-by-day.vue

@@ -0,0 +1,181 @@
+<template>
+    <div class="w-full">
+        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+            :header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" :show-summary="true"
+            row-class-name="success-row" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"
+            @expand-change="tableExpandChange">
+            <el-table-column type="expand" width="60">
+                <template #default="{ row }">
+                    <div class="ml-[60px] my-2">
+                        <el-table :data="getTableChildrenMap(row.uniqueCode)" border :cell-style="tableStyle.cellStyle"
+                            :header-cell-style="tableStyle.headerCellStyle" row-class-name="warning-row">
+                            <el-table-column type="index" label="#" width="50" />
+                            <el-table-column prop="userDeptName" align="center" label="部门" width="200" />
+                            <el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
+                                <template #default="{ row }">
+                                    <dict-tag :options="daily_menu" :value="row.hourType" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+                                <template #default="{ row }">
+                                    <span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="交易次数" width="150" align="center" prop="timeCount">
+                                <template #default="{ row }">
+                                    <span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
+                                <template #default="{ row }">
+                                    <span class="color-success"> {{ row.payCount || 0 }}份 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="总价" width="150" prop="totalPrice" align="center">
+                                <template #default="{ row }">
+                                    <span>{{ displayPrice(row.totalPrice) }}</span>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
+            </el-table-column>
+
+            <el-table-column type="index" label="#" width="50" />
+            <el-table-column label="用餐时间(天)" align="center" width="200" prop="createTime">
+                <template #default="{ row }">
+                    <span>{{ parseTime(row.createTime, "{y}-{m}-{d}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
+                <template #default="{ row }">
+                    <dict-tag :options="daily_menu" :value="row.hourType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="交易次数" width="150" align="center" prop="timeCount">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
+                <template #default="{ row }">
+                    <span class="color-success"> {{ row.payCount || 0 }}份 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="总价" width="150" prop="totalPrice" align="center">
+                <template #default="{ row }">
+                    <span>{{ displayPrice(row.totalPrice) }}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column fixed="right" label="操作">
+                <template #default="{ row }">
+                    <el-button icon="Tickets" text type="primary"
+                        @click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType, '0')">
+                        菜品详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+        <product-total-table ref="productTotalTableRef" />
+    </div>
+</template>
+
+<script setup lang="ts" name="product-total-table-by-day">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+import { parseTime } from "/@/utils/formatTime"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 定义查询字典
+const { daily_menu } = useDict("daily_menu")
+
+const ProductTotalTable = defineAsyncComponent(() => import("./product-total-table.vue"))
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: hardTotalApi.canteenProudctTotal,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const productTotalTableRef = ref()
+const tableChildrenMap = ref(new Map<string, any>())
+
+const getTableChildrenMap = (key: string) => {
+    return tableChildrenMap.value.get(key)
+}
+
+const getSummaries = (param: any) => {
+    const { columns, data } = param
+    const totalColumns = ["payUserCount", "timeCount", "payCount", "totalPrice"]
+    const totalRow = Array.from({ length: columns.length })
+    totalRow[0] = "合计"
+    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
+}
+
+// 点击table展开行
+const tableExpandChange = async (e: any) => {
+    try {
+        const { data } = await hardTotalApi.productTotalByDept({
+            hourType: e.hourType,
+            createTimeType: '0',
+            createTimeStr: parseTime(e.createTime, '{y}-{m}-{d}'),
+        })
+        if (data && data.length) {
+            tableChildrenMap.value.set(e.uniqueCode, data)
+        }
+    } catch (error: any) {
+        console.error(error);
+    }
+}
+
+const doSearch = (params: any) => {
+    state.queryForm = params
+    getDataList()
+}
+
+const doCancel = (params: any) => {
+    state.queryForm = params
+    selectObjs.value = []
+    getDataList()
+}
+
+defineExpose({
+    doSearch,
+    doCancel
+})
+</script>

src/views/hard/canteen-product-total/components/product-total-table-by-month.vue

@@ -0,0 +1,181 @@
+<template>
+    <div class="w-full">
+        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+            :header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" :show-summary="true"
+            row-class-name="success-row" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle"
+            @expand-change="tableExpandChange">
+            <el-table-column type="expand" width="60">
+                <template #default="{ row }">
+                    <div class="ml-[60px] my-2">
+                        <el-table :data="getTableChildrenMap(row.uniqueCode)" border :cell-style="tableStyle.cellStyle"
+                            :header-cell-style="tableStyle.headerCellStyle" row-class-name="warning-row">
+                            <el-table-column type="index" label="#" width="50" />
+                            <el-table-column prop="userDeptName" align="center" label="部门" width="200" />
+                            <el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
+                                <template #default="{ row }">
+                                    <dict-tag :options="daily_menu" :value="row.hourType" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+                                <template #default="{ row }">
+                                    <span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="交易次数" width="150" align="center" prop="timeCount">
+                                <template #default="{ row }">
+                                    <span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
+                                <template #default="{ row }">
+                                    <span class="color-success"> {{ row.payCount || 0 }}份 </span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="总价" width="150" prop="totalPrice" align="center">
+                                <template #default="{ row }">
+                                    <span>{{ displayPrice(row.totalPrice) }}</span>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
+            </el-table-column>
+
+            <el-table-column type="index" label="#" width="50" />
+            <el-table-column label="用餐时间(月)" align="center" width="200" prop="createTime">
+                <template #default="{ row }">
+                    <span>{{ row.createTimeStr }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
+                <template #default="{ row }">
+                    <dict-tag :options="daily_menu" :value="row.hourType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="交易次数" width="150" align="center" prop="timeCount">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
+                <template #default="{ row }">
+                    <span class="color-success"> {{ row.payCount || 0 }}份 </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="总价" width="150" prop="totalPrice" align="center">
+                <template #default="{ row }">
+                    <span>{{ displayPrice(row.totalPrice) }}</span>
+                </template>
+            </el-table-column>
+
+            <el-table-column fixed="right" label="操作">
+                <template #default="{ row }">
+                    <el-button icon="Tickets" text type="primary"
+                        @click="productTotalTableRef.openDialog(row.createTimeStr, row.hourType, '1')">
+                        菜品详情
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+        <product-total-table ref="productTotalTableRef" />
+    </div>
+</template>
+
+<script setup lang="ts" name="product-total-table-by-day">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+import { parseTime } from "/@/utils/formatTime"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+// 定义查询字典
+const { daily_menu } = useDict("daily_menu")
+
+const ProductTotalTable = defineAsyncComponent(() => import("./product-total-table.vue"))
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: hardTotalApi.canteenProudctTotalByMonth,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const productTotalTableRef = ref()
+const tableChildrenMap = ref(new Map<string, any>())
+
+const getTableChildrenMap = (key: string) => {
+    return tableChildrenMap.value.get(key)
+}
+
+const getSummaries = (param: any) => {
+    const { columns, data } = param
+    const totalColumns = ["payUserCount", "timeCount", "payCount", "totalPrice"]
+    const totalRow = Array.from({ length: columns.length })
+    totalRow[0] = "合计"
+    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
+}
+
+// 点击table展开行
+const tableExpandChange = async (e: any) => {
+    try {
+        const { data } = await hardTotalApi.productTotalByDept({
+            hourType: e.hourType,
+            createTimeType: '1',
+            createTimeStr: parseTime(e.createTime, '{y}-{m}'),
+        })
+        if (data && data.length) {
+            tableChildrenMap.value.set(e.uniqueCode, data)
+        }
+    } catch (error: any) {
+        console.error(error);
+    }
+}
+
+const doSearch = (params: any) => {
+    state.queryForm = params
+    getDataList()
+}
+
+const doCancel = (params: any) => {
+    state.queryForm = params
+    selectObjs.value = []
+    getDataList()
+}
+
+defineExpose({
+    doSearch,
+    doCancel
+})
+</script>

src/views/hard/canteen-product-total/components/product-total-table.vue

@@ -83,10 +83,11 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 	multiple.value = !objs.length
 }
 
-const openDialog = (createTimeStr: any, hourType: any) => {
+const openDialog = (createTimeStr: any, hourType: any, createTimeType: any) => {
 	visible.value = true
 	state.queryForm.createTimeStr = createTimeStr
 	state.queryForm.hourType = hourType
+	state.queryForm.createTimeType = createTimeType ?? ""
 	getDataList()
 }
 

src/views/hard/canteen-product-total/index.vue

@@ -5,7 +5,7 @@
 				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
 				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
-					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="search">
 						<el-row>
 							<el-form-item style="width: 250px" label="用餐时间段" prop="hourType">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
@@ -14,218 +14,123 @@
 								<select-mch v-model="state.queryForm.merchantId"
 									:apiParams="{ parentIsNull: false, types: '1' }" />
 							</el-form-item>
-							<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
-								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
-									type="daterange" />
+							<el-form-item v-if="activeTab === 'DAY'" style="width: 450px" label="创建时间(天)"
+								prop="createTimeList">
+								<el-date-picker v-model="state.queryForm.createTimeList"
+									value-format="YYYY-MM-DD HH:mm:ss" type="daterange" />
+							</el-form-item>
+							<el-form-item v-if="activeTab === 'MONTH'" style="width: 450px" label="创建时间(年)"
+								prop="createTimeYearStr">
+								<el-date-picker value-format="YYYY" v-model="state.queryForm.createTimeYearStr"
+									type="year" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="doSearch">{{ $t("common.queryBtn")
-								}}</el-button>
+								<el-button icon="Search" type="primary" @click="search">
+									{{ $t("common.queryBtn") }}
+								</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
 					</el-form>
-					<el-row>
-						<div class="mb8" style="width: 100%">
+					<el-row class="flex">
+						<el-tabs class="flex-1" v-model="activeTab" @tab-click="tabClick">
+							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name" />
+						</el-tabs>
+						<div class="mb8">
 							<right-toolbar :search="false" v-model:showSearch="showSearch"
 								:export="'wallet_walletTransaction_export'" @exportExcel="exportExcel" class="ml10 mr20"
-								style="float: right" @queryTable="getDataList"></right-toolbar>
+								style="float: right" @queryTable="search"></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="true" row-class-name="success-row" @selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle" @expand-change="tableExpandChange">
-						<el-table-column v-if="false" type="selection" width="80" align="center" />
-
-						<el-table-column type="expand" width="50">
-							<template #default="{ row }">
-								<div class="ml-[50px] my-2">
-									<el-table :data="getTableChildrenMap(row.uniqueCode)" border
-										:cell-style="tableStyle.cellStyle"
-										:header-cell-style="tableStyle.headerCellStyle" row-class-name="warning-row">
-										<el-table-column type="index" label="#" width="50" />
-										<el-table-column prop="userDeptName" align="center" label="部门" width="200" />
-										<el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
-											<template #default="{ row }">
-												<dict-tag :options="daily_menu" :value="row.hourType" />
-											</template>
-										</el-table-column>
-										<el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
-											<template #default="{ row }">
-												<span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
-											</template>
-										</el-table-column>
-										<el-table-column label="交易次数" width="150" align="center" prop="timeCount">
-											<template #default="{ row }">
-												<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
-											</template>
-										</el-table-column>
-										<el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
-											<template #default="{ row }">
-												<span class="color-success"> {{ row.payCount || 0 }}份 </span>
-											</template>
-										</el-table-column>
-										<el-table-column label="总价" width="150" prop="totalPrice" align="center">
-											<template #default="{ row }">
-												<span>{{ displayPrice(row.totalPrice) }}</span>
-											</template>
-										</el-table-column>
-									</el-table>
-								</div>
-							</template>
-						</el-table-column>
-
-						<el-table-column type="index" label="#" width="50" />
-						<el-table-column label="用餐时间" align="center" width="200" prop="createTime">
-							<template #default="{ row }">
-								<span>{{ parseTime(row.createTime, "{y}-{m}-{d}") }}</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="用餐时间段" width="100" align="center" prop="hourType">
-							<template #default="{ row }">
-								<dict-tag :options="daily_menu" :value="row.hourType" />
-							</template>
-						</el-table-column>
-						<el-table-column label="交易人数" width="150" align="center" prop="payUserCount">
-							<template #default="{ row }">
-								<span class="color-primary"> {{ row.payUserCount || 0 }}人 </span>
-							</template>
-						</el-table-column>
-						<el-table-column label="交易次数" width="150" align="center" prop="timeCount">
-							<template #default="{ row }">
-								<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
-							</template>
-						</el-table-column>
-						<el-table-column label="售出商品数量" width="150" align="center" prop="payCount">
-							<template #default="{ row }">
-								<span class="color-success"> {{ row.payCount || 0 }}份 </span>
-							</template>
-						</el-table-column>
-						<el-table-column label="总价" width="150" prop="totalPrice" align="center">
-							<template #default="{ row }">
-								<span>{{ displayPrice(row.totalPrice) }}</span>
-							</template>
-						</el-table-column>
-
-						<el-table-column fixed="right" label="操作">
-							<template #default="{ row }">
-								<el-button icon="Tickets" text type="primary"
-									@click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType)">
-									菜品详情
-								</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-						v-bind="state.pagination" />
+					<product-total-table-by-day v-if="activeTab === 'DAY'" ref="productTotalTableByDayRef" />
+					<product-total-table-by-month v-if="activeTab === 'MONTH'" ref="productTotalTableByMonthRef" />
 				</template>
 			</DraggableDepTree>
 		</div>
-		<product-total-table ref="productTotalTableRef" />
+
 	</div>
 </template>
 
 <script setup lang="ts" name="hard-sb">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { displayPrice } from "/@/utils/formatMoney"
-import { useDict } from "/@/hooks/dict"
-import { parseTime } from "/@/utils/formatTime"
+import { ElMessage } from "element-plus"
+import dayjs from "dayjs"
 
-import * as hardTotalApi from "/@/api/hard/hard-total"
+import other from "/@/utils/other"
+import { formatDate } from '/@/utils/formatTime';
 
-const ProductTotalTable = defineAsyncComponent(() => import("./components/product-total-table.vue"))
+const ProductTotalTableByDay = defineAsyncComponent(() => import("./components/product-total-table-by-day.vue"))
+const ProductTotalTableByMonth = defineAsyncComponent(() => import("./components/product-total-table-by-month.vue"))
+
+// 组件变量
+const productTotalTableByDayRef = ref()
+const productTotalTableByMonthRef = ref()
 
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
-const productTotalTableRef = ref()
 
 // 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
 const draggableDepTreeRef = ref() // 树组件ref引用
 
-const tableChildrenMap = ref(new Map<string, any>())
+// tab变量
+const tabPane = ref([
+	{
+		label: "按天统计",
+		name: "DAY"
+	},
+	{
+		label: "按月统计",
+		name: "MONTH"
+	}
+])
+const activeTab = ref("DAY")
 
-// 定义查询字典
-const { daily_menu } = useDict("daily_menu")
-
-const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
-	pageList: hardTotalApi.canteenProudctTotal,
+const defaultQueryForm = {
+	hourType: "",
+	merchantId: "",
+	createTimeList: [],
+	createTimeYearStr: dayjs().format("YYYY"),
+}
+const state = reactive<any>({
+	queryForm: { ...defaultQueryForm }
 })
 
-//  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
-
-// 导出excel
-const exportExcel = () => {
-	postDownBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx")
-}
-
-// 点击table展开行
-const tableExpandChange = async (e: any) => {
-	try {
-		const { data } = await hardTotalApi.productTotalByDept({
-			hourType: e.hourType,
-			createTimeStr: parseTime(e.createTime, '{y}-{m}-{d}'),
-		})
-		if (data && data.length) {
-			tableChildrenMap.value.set(e.uniqueCode, data)
-		}
-	} catch (error: any) {
-		console.error(error);
+watch(() => [activeTab.value, productTotalTableByDayRef.value, productTotalTableByMonthRef.value], () => {
+	if (activeTab.value === "DAY" && productTotalTableByDayRef.value?.doSearch) {
+		search()
 	}
-}
+	if (activeTab.value === "MONTH" && productTotalTableByMonthRef.value?.doSearch) {
+		search()
+	}
+})
 
-const getTableChildrenMap = (key: string) => {
-	return tableChildrenMap.value.get(key)
-}
-
-const getSummaries = (param: any) => {
-	const { columns, data } = param
-	const totalColumns = ["payUserCount", "timeCount", "payCount", "totalPrice"]
-	const totalRow = Array.from({ length: columns.length })
-	totalRow[0] = "合计"
-	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
-			}
-		}
+onMounted(() => {
+	nextTick(() => {
+		search()
 	})
-	return totalRow
-}
+})
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
 	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
+	state.queryForm = { ...defaultQueryForm }
 	state.queryForm.deptId = ""
 	state.queryForm.userDeptIds = []
 	draggableDepTreeRef.value.resetData()
-	getDataList()
+	cancel()
 }
 
-// 多选事件
-const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id)
-	multiple.value = !objs.length
-}
-
-// 搜索
-const doSearch = () => {
-	productTotalTableRef.value.updateQueryParams(state.queryForm)
-	getDataList()
+const exportExcel = () => {
+	ElMessage.info("下载中，请稍后")
+	switch (activeTab.value) {
+		case "DAY":
+			other.postDownBlobFile("/hard/hard-canteen-total-log/proudct-total-export-by-day", state.queryForm, formatDate(new Date(), "YYYY年mm月dd日 HH时MM分SS秒 ") + "食堂菜品购买统计(按天).xlsx")
+			break;
+		case "MONTH":
+			other.postDownBlobFile("/hard/hard-canteen-total-log/proudct-total-export-by-month", state.queryForm, formatDate(new Date(), "YYYY年mm月dd日 HH时MM分SS秒 ") + "食堂菜品购买统计(按月).xlsx")
+			break;
+	}
 }
 
 // 树节点选择时
@@ -233,7 +138,41 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
-	getDataList()
+	search()
+}
+
+const tabClick = () => {
+	cancel()
+}
+
+const search = () => {
+	if (activeTab.value === "DAY") {
+		state.queryForm.createTimeYearStr = ""
+	}
+	if (activeTab.value === "MONTH") {
+		state.queryForm.createTimeList = []
+	}
+	console.log("queryForm:", state.queryForm);
+	switch (activeTab.value) {
+		case "DAY":
+			productTotalTableByDayRef.value.doSearch(state.queryForm)
+			break;
+		case "MONTH":
+			productTotalTableByMonthRef.value.doSearch(state.queryForm)
+			break;
+	}
+}
+
+const cancel = () => {
+	state.queryForm = { ...defaultQueryForm }
+	switch (activeTab.value) {
+		case "DAY":
+			productTotalTableByDayRef.value.doCancel(state.queryForm)
+			break;
+		case "MONTH":
+			productTotalTableByMonthRef.value.doCancel(state.queryForm)
+			break;
+	}
 }
 </script>
 

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

@@ -238,7 +238,7 @@
 										编辑
 									</el-button>
 									<el-button
-										v-if="row.orderType !== '5' && !['5', '6', '8'].includes(row.payType) && row.refundPrice != row.payPrice"
+										v-if="row.orderType !== '5' && !['5', '6', '8', '50'].includes(row.payType) && row.refundPrice != row.payPrice"
 										icon="stamp" text type="primary" v-auth="'hard_hardAfterSale_adminRefund'"
 										@click="adminRefundDailogRef.openDialog(row.id)">
 										退款

src/views/hard/hard-sh/components/hard-sh-by-day.vue

@@ -0,0 +1,140 @@
+<template>
+    <div class="w-full">
+        <el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries" show-summary
+            :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+            @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+            <el-table-column type="selection" width="80" align="center" />
+            <el-table-column type="index" label="#" width="50" />
+            <el-table-column label="商户" width="200" align="center" prop="merchantName" />
+            <el-table-column label="流水金额" min-width="120" align="center" prop="totalPayPrice">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ displayPrice(row.totalPayPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="流水次数" min-width="120" align="center" prop="totalPayCount">
+                <template #default="{ row }">
+                    <span class="color-primary">
+                        {{ row.totalPayCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款金额" min-width="120" align="center" prop="totalRefundPrice">
+                <template #default="{ row }">
+                    <span class="color-danger">
+                        {{ displayPrice(row.totalRefundPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款次数" min-width="120" align="center" prop="totalRefundCount">
+                <template #default="{ row }">
+                    <span class="color-danger">
+                        {{ row.totalRefundCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="消费净金额" min-width="120" align="center" prop="totalProfitPrice" min-min-width="120">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ displayPrice(row.totalProfitPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="消费净次数" min-width="120" align="center" prop="totalProfitCount" min-min-width="120">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ row.totalProfitCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" fixed="right" align="center" width="220">
+                <template #default="{ row }">
+                    <el-tooltip class="box-item" effect="dark" content="只有合作商家能结账" placement="top">
+                        <el-button icon="Tickets" text :disabled="row.merchantType != 2" type="primary"
+                            @click="doCheckout(row)">
+                            商户结账
+                        </el-button>
+                    </el-tooltip>
+                    <el-button icon="Tickets" type="primary" text @click="exportMchExcel(row)">
+                        导出商户流水
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
+</template>
+
+<script setup lang="ts" name="hard-sh-by-day">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+const { push } = useRouter()
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    isPage: false,
+    queryForm: {},
+    pageList: hardTotalApi.pageListCs,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const doCheckout = (row: any) => {
+    push({ path: "/mch/mch-checkout/index", query: { mchId: row.merchantId } })
+}
+
+const exportMchExcel = (row: any) => {
+    postDownBlobFile("/hard/hard-total/export-mch-cs", { ...state.queryForm, merchantId: row.merchantId }, "商户流水.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id)
+    multiple.value = !objs.length
+}
+
+const getSummaries = (param: any) => {
+    const { columns, data } = param
+    const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
+    const totalRow = Array.from({ length: columns.length })
+    totalRow[0] = "合计"
+    columns.forEach((i: any, index: number) => {
+        if (totalColumns.includes(i.property)) {
+            const total = data
+                .filter((v: any) => v[i.property] != null)
+                .map((v: any) => 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 doSearch = (params: any) => {
+    state.queryForm = params
+    getDataList()
+}
+
+const doCancel = (params: any) => {
+    state.queryForm = params
+    selectObjs.value = []
+    getDataList()
+}
+
+defineExpose({
+    doSearch,
+    doCancel
+})
+</script>

src/views/hard/hard-sh/components/hard-sh-by-month.vue

@@ -0,0 +1,122 @@
+<template>
+    <div class="w-full">
+        <el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries" show-summary
+            :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+            @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+            <el-table-column type="selection" width="80" align="center" />
+            <el-table-column type="index" label="#" width="50" />
+            <el-table-column label="商户" width="200" align="center" prop="merchantName">
+                <template #default="{ row }">
+                    {{ row.merchantName || row.merchantId }}
+                </template>
+            </el-table-column>
+            <el-table-column label="月份" width="100" align="center" prop="day" />
+            <el-table-column label="流水金额" min-width="120" align="center" prop="totalPayPrice">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ displayPrice(row.totalPayPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="流水次数" min-width="120" align="center" prop="totalPayCount">
+                <template #default="{ row }">
+                    <span class="color-primary">
+                        {{ row.totalPayCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款金额" min-width="120" align="center" prop="totalRefundPrice">
+                <template #default="{ row }">
+                    <span class="color-danger">
+                        {{ displayPrice(row.totalRefundPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="退款次数" min-width="120" align="center" prop="totalRefundCount">
+                <template #default="{ row }">
+                    <span class="color-danger">
+                        {{ row.totalRefundCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="消费净金额" min-width="120" align="center" prop="totalProfitPrice" min-min-width="120">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ displayPrice(row.totalProfitPrice) }}
+                    </span>
+                </template>
+            </el-table-column>
+            <el-table-column label="消费净次数" min-width="120" align="center" prop="totalProfitCount" min-min-width="120">
+                <template #default="{ row }">
+                    <span class="color-success">
+                        {{ row.totalProfitCount || 0 }}
+                    </span>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+</template>
+
+<script setup lang="ts" name="hard-sh-by-month">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { displayPrice } from "/@/utils/formatMoney"
+
+import * as hardTotalApi from "/@/api/hard/hard-total"
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: hardTotalApi.pageListCsByMonth,
+})
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id)
+    multiple.value = !objs.length
+}
+
+const getSummaries = (param: any) => {
+    const { columns, data } = param
+    const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
+    const totalRow = Array.from({ length: columns.length })
+    totalRow[0] = "合计"
+    columns.forEach((i: any, index: number) => {
+        if (totalColumns.includes(i.property)) {
+            const total = data
+                .filter((v: any) => v[i.property] != null)
+                .map((v: any) => 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 doSearch = (params: any) => {
+    state.queryForm = params
+    getDataList()
+}
+
+const doCancel = (params: any) => {
+    state.queryForm = params
+    selectObjs.value = []
+    getDataList()
+}
+
+defineExpose({
+    doSearch,
+    doCancel
+})
+</script>

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

@@ -10,7 +10,7 @@
 					disabled: 'isLockNone',
 				}">
 				<template #default>
-					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="search">
 						<el-row>
 							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
@@ -21,86 +21,35 @@
 							<el-form-item style="width: 250px" label="商户" prop="merchantId">
 								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false }" />
 							</el-form-item>
-							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
+							<el-form-item v-if="activeTab === 'MCH'" style="width: 450px" label="创建时间(天)"
+								prop="payTimeList">
 								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss"
 									type="datetimerange" />
 							</el-form-item>
+							<el-form-item v-if="activeTab === 'MONTH'" style="width: 450px" label="创建时间(年)"
+								prop="payTimeYearStr">
+								<el-date-picker value-format="YYYY" v-model="state.queryForm.payTimeYearStr"
+									type="year" />
+							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+								<el-button icon="Search" type="primary" @click="search">{{ $t("common.queryBtn")
 								}}</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
 					</el-form>
-					<el-row>
-						<div class="mb8" style="width: 100%">
+					<el-row class="flex">
+						<el-tabs class="flex-1" v-model="activeTab" @tab-click="tabClick">
+							<el-tab-pane v-for="(v) in tabPane" :key="v.name" :label="v.label" :name="v.name" />
+						</el-tabs>
+						<div class="mb8">
 							<right-toolbar :search="false" v-model:showSearch="showSearch"
 								:export="'wallet_walletTransaction_export'" @exportExcel="exportExcel" class="ml10 mr20"
-								style="float: right" @queryTable="getDataList"></right-toolbar>
+								style="float: right" @queryTable="search"></right-toolbar>
 						</div>
 					</el-row>
-					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
-						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="80" align="center" />
-						<el-table-column type="index" label="#" width="50" />
-						<el-table-column label="商户" align="center" prop="merchantName" />
-						<el-table-column label="流水金额" align="center" prop="totalPayPrice">
-							<template #default="{ row }">
-								<span class="color-success">
-									{{ displayPrice(row.totalPayPrice) }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="流水次数" align="center" prop="totalPayCount">
-							<template #default="{ row }">
-								<span class="color-primary">
-									{{ row.totalPayCount || 0 }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="退款金额" align="center" prop="totalRefundPrice">
-							<template #default="{ row }">
-								<span class="color-danger">
-									{{ displayPrice(row.totalRefundPrice) }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="退款次数" align="center" prop="totalRefundCount">
-							<template #default="{ row }">
-								<span class="color-danger">
-									{{ row.totalRefundCount || 0 }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="消费净金额" align="center" prop="totalProfitPrice" min-width="120">
-							<template #default="{ row }">
-								<span class="color-success">
-									{{ displayPrice(row.totalProfitPrice) }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="消费净次数" align="center" prop="totalProfitCount" min-width="120">
-							<template #default="{ row }">
-								<span class="color-success">
-									{{ row.totalProfitCount || 0 }}
-								</span>
-							</template>
-						</el-table-column>
-						<el-table-column label="操作" align="center" width="250">
-							<template #default="{ row }">
-								<el-tooltip class="box-item" effect="dark" content="只有合作商家能结账" placement="top">
-									<el-button icon="Tickets" text :disabled="row.merchantType != 2" type="primary"
-										@click="doCheckout(row)">
-										商户结账
-									</el-button>
-								</el-tooltip>
-								<el-button icon="Tickets" type="primary" text @click="exportMchExcel(row)">
-									导出商户流水
-								</el-button>
-							</template>
-						</el-table-column>
-					</el-table>
+					<hard-sh-by-day v-if="activeTab === 'MCH'" ref="hardShByDayRef" />
+					<hard-sh-by-month v-if="activeTab === 'MONTH'" ref="hardShByMonthRef" />
 				</template>
 			</DraggableDepTree>
 		</div>
@@ -108,80 +57,118 @@
 </template>
 
 <script setup lang="ts" name="hard-sb">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { displayPrice } from "/@/utils/formatMoney"
-import * as hardTotalApi from "/@/api/hard/hard-total"
+import { ElMessage } from "element-plus"
+import dayjs from "dayjs"
 
-const { push } = useRouter()
+import other from "/@/utils/other"
+import { formatDate } from '/@/utils/formatTime';
+
+const HardShByDay = defineAsyncComponent(() => import("./components/hard-sh-by-day.vue"))
+const HardShByMonth = defineAsyncComponent(() => import("./components/hard-sh-by-month.vue"))
+
+// 组件变量
+const hardShByDayRef = ref()
+const hardShByMonthRef = ref()
 
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
 
-// 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
-const draggableDepTreeRef = ref() // 树组件ref引用
+const draggableDepTreeRef = ref()
 
-const state: BasicTableProps = reactive<BasicTableProps>({
-	isPage: false,
-	queryForm: {},
-	pageList: hardTotalApi.pageListCs,
+// tab变量
+const tabPane = ref([
+	{
+		label: "按商户统计",
+		name: "MCH"
+	},
+	{
+		label: "按月统计",
+		name: "MONTH"
+	}
+])
+const activeTab = ref("MCH")
+
+const defaultQueryForm = {
+	payTimeYearStr: dayjs().format("YYYY"),
+}
+const state = reactive<any>({
+	queryForm: { ...defaultQueryForm },
 })
 
-//  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
+watch(() => [activeTab.value, hardShByDayRef.value, hardShByMonthRef.value], () => {
+	if (activeTab.value === "MCH" && hardShByDayRef.value?.doSearch) {
+		search()
+	}
+	if (activeTab.value === "MONTH" && hardShByMonthRef.value?.doSearch) {
+		search()
+	}
+})
 
-// 导出excel
-const exportExcel = () => {
-	postDownBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx")
-}
-
-const doCheckout = (row: any) => {
-	push({ path: "/mch/mch-checkout/index", query: { mchId: row.merchantId } })
-}
-
-const exportMchExcel = (row: any) => {
-	postDownBlobFile("/hard/hard-total/export-mch-cs", { ...state.queryForm, merchantId: row.merchantId }, "商户流水.xlsx")
-}
-
-const getSummaries = (param: any) => {
-	const { columns, data } = param
-	const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
-	const totalRow = Array.from({ length: columns.length })
-	totalRow[0] = "合计"
-	columns.forEach((i: any, index: number) => {
-		if (totalColumns.includes(i.property)) {
-			const total = data
-				.filter((v: any) => v[i.property] != null)
-				.map((v: any) => v[i.property])
-				.reduce((pren: number, next: number) => pren + next, 0)
-			if (i.property.includes("Price")) {
-				totalRow[index] = displayPrice(total)
-			} else {
-				totalRow[index] = total
-			}
-		}
+onMounted(() => {
+	nextTick(() => {
+		search()
 	})
-	return totalRow
+})
+
+const exportExcel = () => {
+	ElMessage.info("下载中，请稍后")
+	switch (activeTab.value) {
+		case "MCH":
+			other.postDownBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), formatDate(new Date(), "YYYY年mm月dd日 HH时MM分SS秒 ") + "商户交易记录.xlsx")
+			break;
+		case "MONTH":
+			other.postDownBlobFile("/hard/hard-total/export-cs-by-month", Object.assign(state.queryForm), formatDate(new Date(), "YYYY年mm月dd日 HH时MM分SS秒 ") + "商户交易记录(按月).xlsx")
+			break;
+	}
 }
 
-// 多选事件
-const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id)
-	multiple.value = !objs.length
+const tabClick = () => {
+	console.log(123123);
+
+	cancel()
+}
+
+const search = () => {
+	if (activeTab.value === "MCH") {
+		state.queryForm.payTimeYearStr = ""
+	}
+	if (activeTab.value === "MONTH") {
+		state.queryForm.createTimeList = []
+	}
+	switch (activeTab.value) {
+		case "MCH":
+			hardShByDayRef.value.doSearch(state.queryForm)
+			break;
+		case "MONTH":
+			hardShByMonthRef.value.doSearch(state.queryForm)
+			break;
+	}
+}
+
+const cancel = () => {
+	state.queryForm = { ...defaultQueryForm }
+	console.log("state.queryForm:", state.queryForm);
+
+	switch (activeTab.value) {
+		case "MCH":
+			hardShByDayRef.value.doCancel(state.queryForm)
+			break;
+		case "MONTH":
+			hardShByMonthRef.value.doCancel(state.queryForm)
+			break;
+	}
 }
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
 	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
+	state.queryForm = { ...defaultQueryForm }
 	state.queryForm.deptId = ""
 	state.queryForm.userDeptIds = []
 	draggableDepTreeRef.value.resetData()
-	getDataList()
+	cancel()
 }
 
 // 树节点选择时
@@ -189,6 +176,6 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
 	state.queryForm.deptId = curClickedNode.id
 	state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
 	state.queryForm.isInclude = !isDeepTree
-	getDataList()
+	search()
 }
 </script>

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

@@ -1,36 +1,67 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'thirdmi_hardThirdMiOrder_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'thirdmi_hardThirdMiOrder_del'"
-            @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'thirdmi_hardThirdMiOrder_export'"
-            @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-            @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row>
+          <el-form-item style="width: 250px" label="支付类型" prop="bizType">
+            <dict-select v-model="state.queryForm.bizType" dict-code="hard_third_mi_type" />
+          </el-form-item>
+          <el-form-item style="width: 250px" label="订单状态" prop="orderStatus">
+            <dict-select v-model="state.queryForm.orderStatus" dict-code="hard_third_mi_status" />
+          </el-form-item>
+          <el-form-item style="width: 450px" label="授权时间" prop="createOrderTimeList">
+            <el-date-picker v-model="state.queryForm.createOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+              type="datetimerange" />
+          </el-form-item>
+          <el-form-item style="width: 450px" label="下单时间" prop="payOrderTimeList">
+            <el-date-picker v-model="state.queryForm.payOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+              type="datetimerange" />
+          </el-form-item>
+          <el-form-item style="width: 450px" label="退款时间" prop="refundOrderTimeList">
+            <el-date-picker v-model="state.queryForm.refundOrderTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+              type="datetimerange" />
+          </el-form-item>
+          <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-row>
+      </el-form>
       <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
         :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
-        <el-table-column label="上架类型" width="150">
+        <el-table-column width="150" label="用户">
           <template #default="{ row }">
-            <dict-tag :options="mi_type" :value="row.bizType" />
+            <dict-tag :options="hard_third_mi_type" :value="row.bizType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="userId" width="350" label="订单号">
+          <template #default="{ row }">
+            <div class="status">
+              <span>外部订单号:</span>
+              <span v-if="row.thirdOrderNo" style="text-align: left;">{{ row.thirdOrderNo }} </span>
+              <span class="color-danger" v-else>未授权</span>
+            </div>
+            <div class="status">
+              <span>内部订单号:</span>
+              <span v-if="row.outOrderNo" style="text-align: left;">{{ row.outOrderNo }} </span>
+              <span class="color-danger" v-else>未授权</span>
+            </div>
+            <div class="status">
+              <span>授权id:</span>
+              <span v-if="row.authId" style="text-align: left;">{{ row.authId }} </span>
+              <span class="color-danger" v-else>未授权</span>
+            </div>
+            <div class="status">
+              <span>流程id:</span>
+              <span v-if="row.flowId" style="text-align: left;">{{ row.flowId }} </span>
+              <span class="color-danger" v-else>未授权</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
-        <el-table-column prop="authId" label="授权id" show-overflow-tooltip />
-        <el-table-column prop="flowId" label="流程id" show-overflow-tooltip />
-        <el-table-column prop="orderId" label="订单id" show-overflow-tooltip />
-        <el-table-column prop="outOrderNo" label="外部订单号" show-overflow-tooltip />
-        <el-table-column prop="thirdOrderNo" label="第三方订单号" show-overflow-tooltip />
         <el-table-column label="时间" width="250">
           <template #default="{ row }">
             <div class="status">
@@ -49,19 +80,70 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="orderStatus" label="订单状态" show-overflow-tooltip />
-        <el-table-column prop="orgJson" label="原始json数据" show-overflow-tooltip />
-        <el-table-column label="操作" fixed="right" width="250">
+        <el-table-column prop="orderStatus" width="150" label="金额">
           <template #default="{ row }">
-            <el-button icon="Refresh" text type="primary" @click="refreshOrder(row)">
-              同步
-            </el-button>
-            <el-button icon="Refresh" text type="primary" @click="payOrder(row)">
-              支付
-            </el-button>
-            <el-button icon="delete" text type="primary" @click="handleDelete([row.id])">
-              取消
-            </el-button>
+            <div class="status">
+              <span>押金:</span>
+              <span class="color-success">
+                {{ displayPrice(row.depositPrice, "元", 2) }}
+              </span>
+            </div>
+            <div class="status">
+              <span>订单金额:</span>
+              <span class="color-success">
+                {{ displayPrice(row.orderPrice, "元", 2) }}
+              </span>
+            </div>
+            <div class="status">
+              <span>支付金额:</span>
+              <span class="color-success">
+                {{ displayPrice(row.payPrice, "元", 2) }}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderStatus" width="250" label="设备信息">
+          <template #default="{ row }">
+            <div class="status">
+              <span>设备名</span>
+              <span>
+                {{ row.hardName }}
+              </span>
+            </div>
+            <div class="status">
+              <span>设备类型</span>
+              <span>
+                <dict-tag :options="hard_type" :value="row.hardType" />
+              </span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderStatus" width="100" label="订单状态">
+          <template #default="{ row }">
+            <dict-tag :options="hard_third_mi_status" :value="row.orderStatus" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="orgOrderJson" label="第三方订单json" width="180">
+          <template #default="{ row }">
+            <preview-json :json="row.orgOrderJson" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="150">
+          <template #default="{ row }">
+            <div class="grid grid-cols-2 justify-evenly">
+              <el-button style="margin: 0px;" icon="Refresh" text type="primary" @click="refreshOrder(row)">
+                同步
+              </el-button>
+              <el-button style="margin: 0px;" icon="Goods" text type="primary" @click="payOrder(row)">
+                支付
+              </el-button>
+              <el-button style="margin: 0px;" icon="Stamp" text type="primary" @click="refund(row)">
+                退款
+              </el-button>
+              <el-button style="margin: 0px;" icon="delete" text type="primary" @click="handleDelete([row.id])">
+                取消
+              </el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -79,11 +161,12 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
 import * as thirdMiOrderApi from '/@/api/hard/hard-third-mi-order'
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-const { mi_type } = useDict("mi_type")
+const { hard_third_mi_type, hard_third_mi_status, hard_type } = useDict("hard_third_mi_type", "hard_third_mi_status", "hard_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -141,12 +224,35 @@ const refreshOrder = async (row: any) => {
 
 // 支付
 const payOrder = async (row: any) => {
+  try {
+    await useMessage().delConfirm("是否直接支付?")
+  } finally {
+    //
+  }
   try {
     await thirdMiOrderApi.payOrder({ id: row.id });
     getDataList();
     useMessage().success('支付成功');
   } catch (err: any) {
-    useMessage().error(err.msg);
+    console.log("|支付|意外的错误:", err);
+    useMessage().error("支付失败");
+  }
+}
+
+// 退款
+const refund = async (row: any) => {
+  try {
+    await useMessage().delConfirm("是否全额退款?")
+  } finally {
+    //
+  }
+  try {
+    await thirdMiOrderApi.refundOrder({ id: row.id });
+    getDataList();
+    useMessage().success('退款成功');
+  } catch (err: any) {
+    console.log("|退款|意外的错误:", err);
+    useMessage().error("退款失败");
   }
 }
 
@@ -172,15 +278,16 @@ const handleDelete = async (ids: string[]) => {
 .status {
   display: flex;
   align-items: center;
-  margin-bottom: 2px;
+  font-size: 12px;
+  line-height: 20px;
 
   span {
     display: inline-block;
   }
 
   span:nth-child(1) {
-    min-width: 60px;
-    max-width: 100px;
+    min-width: 80px;
+    max-width: 80px;
     text-align: left;
   }
 
@@ -190,6 +297,7 @@ const handleDelete = async (ids: string[]) => {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    text-align: left;
   }
 }
 </style>

src/views/integrated/app-version/form.vue

@@ -0,0 +1,173 @@
+<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="120px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="app唯一编码" prop="appUniqueCode">
+            <dict-select dict-code="app_unique_code" v-model="form.appUniqueCode" placeholder="请选择平台类型" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="平台类型" prop="platform">
+            <dict-select dict-code="app_platform" v-model="form.platform" placeholder="请选择平台类型" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="内部版本号" prop="versionCode">
+            <el-input-number v-model="form.versionCode" :min="1" :controls="false" placeholder="用于比较大小"
+              style="width: 100%" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="展示版本号" prop="versionName">
+            <el-input v-model="form.versionName" placeholder="如 1.2.3" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="更新内容/日志" prop="updateContent">
+            <el-input v-model="form.updateContent" type="textarea" :rows="4" placeholder="本次版本更新内容" show-word-limit
+              maxlength="1000" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="安装包下载地址" prop="downloadUrl">
+            <el-input v-model="form.downloadUrl" placeholder="https://..." />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="是否强制更新" prop="isForce">
+            <el-switch v-model="form.isForce" active-value="1" inactive-value="0" active-text="是" inactive-text="否" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="是否静默更新" prop="isSilent">
+            <el-switch v-model="form.isSilent" active-value="1" inactive-value="0" active-text="是" inactive-text="否" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="状态" prop="status">
+            <dict-select dict-code="app_version_status" v-model="form.status" placeholder="请选择状态" />
+          </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="AppVersionDialog">
+import { useMessage } from "/@/hooks/message";
+import * as appVersionApi from "/@/api/integrated/app-version";
+import { useDict } from "/@/hooks/dict"
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const defaultForm = {
+  id: '',
+  appUniqueCode: '',
+  platform: '1',
+  versionCode: '',
+  versionName: '',
+  updateContent: '',
+  downloadUrl: '',
+  isForce: '0',
+  isSilent: '1',
+  status: '2',
+}
+const form = reactive({ ...defaultForm });
+
+// 定义校验规则
+const dataRules = ref({
+  appUniqueCode: [{ required: true, message: '请输入app唯一编码', trigger: 'blur' }, { validator: rule.overLength, trigger: 'blur' }],
+  platform: [{ required: true, message: '请选择平台类型', trigger: 'change' }],
+  versionCode: [{ required: true, message: '请输入内部版本号', trigger: 'blur' }, { validator: rule.number, trigger: 'blur' }],
+  versionName: [{ required: true, message: '请输入展示版本号', trigger: 'blur' }, { validator: rule.overLength, trigger: 'blur' }],
+  updateContent: [{ validator: rule.overLength, trigger: 'blur' }],
+  downloadUrl: [{ required: true, message: '请输入下载地址', trigger: 'blur' }],
+  isForce: [{ required: true, message: '请选择是否强制更新', trigger: 'change' }],
+  isSilent: [{ required: true, message: '请选择是否静默更新', trigger: 'change' }],
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取appVersion信息
+  if (id) {
+    form.id = id
+    getappVersionData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await appVersionApi.putObj(form) : await appVersionApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getappVersionData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  appVersionApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+
+const platformOptions = [
+  { label: 'Android', value: 'android' },
+  { label: 'iOS', value: 'ios' },
+]
+
+const statusOptions = [
+  { label: '已发布', value: '已发布' },
+  { label: '未发布', value: '未发布' },
+  { label: '已下架', value: '已下架' },
+]
+</script>

src/views/integrated/app-version/index.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row class="ml10" v-show="showSearch">
+        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+          <el-form-item label="app唯一编码" prop="appUniqueCode">
+            <el-input placeholder="输入app唯一编码" style="max-width: 200px" v-model="state.queryForm.appUniqueCode" />
+          </el-form-item>
+          <el-form-item label="平台类型" prop="platform">
+            <dict-select style="width: 200px;" dict-code="app_platform" v-model="state.queryForm.platform" />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <dict-select style="width: 200px;" dict-code="app_version_status" v-model="state.queryForm.status" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_appVersion_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'integrated_appVersion_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="false" 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" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="appUniqueCode" label="app唯一编码" show-overflow-tooltip />
+        <el-table-column prop="platform" label="平台类型" width="140" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="app_platform" :value="row.platform" />
+          </template>
+        </el-table-column>
+
+        <el-table-column label="版本号">
+          <el-table-column prop="versionCode" label="内部版本号" show-overflow-tooltip />
+          <el-table-column prop="versionName" label="展示版本号" show-overflow-tooltip />
+        </el-table-column>
+        <el-table-column prop="downloadUrl" label="下载地址" width="220" show-overflow-tooltip>
+          <template #default="{ row }">
+            <el-link :href="row.downloadUrl" target="_blank" :underline="false">打开</el-link>
+            <el-divider direction="vertical" />
+            <el-button text type="primary" icon="CopyDocument" @click="copyUrl(row.downloadUrl)">复制</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isForce" label="是否强制更新" width="140" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="yes_no_type" :value="row.isForce" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="isSilent" label="是否静默更新" width="140" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="yes_no_type" :value="row.isSilent" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="140" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="app_version_status" :value="row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right" width="180">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_appVersion_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_appVersion_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemAppVersion">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as appVersionApi from "/@/api/integrated/app-version";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from "/@/hooks/dict"
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { app_version_status, app_platform, yes_no_type } = useDict("app_version_status", "app_platform", "yes_no_type")
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: appVersionApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await appVersionApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+
+const copyUrl = async (url: string) => {
+  try {
+    await navigator.clipboard.writeText(url || '')
+    useMessage().success('已复制下载链接')
+  } catch (e) {
+    useMessage().error('复制失败')
+  }
+}
+</script>

src/views/wallet/wallet-recharge-apply/index.vue

@@ -209,7 +209,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -222,7 +222,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
+	postDownBlobFile("/wallet/wallet-recharge-apply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
 }
 
 const doApply = async (row: any) => {

src/views/wallet/wallet-recharge-invoice/index.vue

@@ -13,6 +13,9 @@
 					<el-form-item style="width: 350px" label="发票状态" prop="userIds">
 						<dict-select v-model="state.queryForm.status" dict-code="recharge_invoice_status" />
 					</el-form-item>
+					<el-form-item style="width: 350px" label="发票号" prop="code">
+						<el-input v-model="state.queryForm.code" />
+					</el-form-item>
 					<el-form-item style="width: 350px" label="备注" prop="remark">
 						<el-input v-model="state.queryForm.remark" />
 					</el-form-item>
@@ -58,6 +61,7 @@
 						{{ parseTime(row.time, "{y}-{m}-{d}") }}
 					</template>
 				</el-table-column>
+				<el-table-column prop="applyUsername" min-width="120" label="申请人" />
 				<el-table-column prop="deptOrUser" min-width="140" label="交款单位或个人" />
 				<el-table-column prop="totalPrice" min-width="120" label="合计人民币">
 					<template #default="{ row }">

src/views/wallet/wallet-recharge-water/index.vue

@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
@@ -24,47 +17,38 @@
 								<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
 							</el-form-item>
 							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
 							</el-form-item>
 							<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
-								<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+								<el-date-picker v-model="state.queryForm.processTimeList"
+									value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+								<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-row>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<right-toolbar
-								v-model:showSearch="showSearch"
-								:export="'wallet_walletRechargeApply_export'"
-								@exportExcel="exportExcel"
-								class="ml10 mr20"
-								style="float: right"
-								@queryTable="getDataList"
-							></right-toolbar>
+							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletRechargeApply_export'"
+								@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 :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 width="200" label="用户">
 							<template #default="{ row }">
 								<div class="flex flex-row items-center justify-center">
 									<preview-image width="50px" height="50px" :src="row.userAvatar" />
-									<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+									<div
+										class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
 										<span> {{ row.username }} </span>
 										<span> {{ row.userMobile }} </span>
 										<span> {{ row.userDeptName }} </span>
@@ -106,19 +90,15 @@
 						</el-table-column>
 						<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="200">
 							<template #default="{ row }">
-								<el-button
-									v-auth="'wallet_walletRechargeImport_recover'"
-									icon="RefreshRight"
-									text
-									type="primary"
-									@click="handleRecover(row.id)"
-								>
+								<el-button v-auth="'wallet_walletRechargeImport_recover'" icon="RefreshRight" text
+									type="primary" @click="handleRecover(row.id)">
 									恢复
 								</el-button>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+						v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>