Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

.env.development

@@ -8,12 +8,12 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
-#VITE_ADMIN_PROXY_PATH = http://192.168.110.156:9999
+VITE_ADMIN_PROXY_PATH = http://localhost:9999
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
-# VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://localhost:9999
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003

src/api/wallet/mch-manage.ts

@@ -0,0 +1,62 @@
+import request from "/@/utils/request"
+
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/wallet/mch-manage/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/wallet/mch-manage/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/wallet/mch-manage',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/wallet/mch-manage/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/wallet/mch-manage',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/wallet/mch-manage',
+    method: 'put',
+    data: obj
+  })
+}
+
+/**
+ * 商户下拉
+ * @param type
+ */
+export function selectMerchantList(type?: string) {
+  return request({
+    url: '/wallet/mch-manage/selectMerchantList',
+    method: 'get',
+    params: {
+      type: type
+    }
+  })
+}

src/api/wallet/wallet-active.ts

@@ -0,0 +1,57 @@
+import request from "/@/utils/request"
+
+export function fastCreateCard(data?: Object) {
+  return request({
+    url: '/wallet/wallet-active/fast-create-card',
+    method: 'post',
+    data
+  })
+}
+
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/wallet/wallet-active/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/wallet/wallet-active/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/wallet/wallet-active',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/wallet/wallet-active/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/wallet/wallet-active',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/wallet/wallet-active',
+    method: 'put',
+    data: obj
+  })
+}
+

src/api/wallet/wallet-foreign.ts

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

src/api/wallet/wallet-freeze.ts

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

src/api/wallet/wallet-recharge-apply.ts

@@ -1,5 +1,14 @@
 import request from "/@/utils/request"
 
+export function pageJoin(query?: Object) {
+  return request({
+    url: '/wallet/wallet-recharge-apply/page-join',
+    method: 'get',
+    params: query
+  })
+}
+
+
 export function fetchList(query?: Object) {
   return request({
     url: '/wallet/wallet-recharge-apply/page',

src/api/wallet/wallet-stride.ts

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

src/components/DictSelect/index.vue

@@ -34,7 +34,10 @@ watch(selectId, (newVal, oldValue) => {
 async function getDictOptions() {
     if (!props.dictCode) return []
     const dicts = dict().getDict(props.dictCode)
-    if (dicts) return dicts
+    if (dicts) {
+        state.dictList = dicts
+        return
+    }
     const res = await getDicts(props.dictCode)
     if (!res) return []
     state.dictList = res.data.map((p: any) => ({ label: p.label, value: p.value, elTagType: p.listClass, elTagClass: p.cssClass }));

src/components/Select/SelectDept.vue

@@ -0,0 +1,73 @@
+<template>
+    <el-tree-select class="w100" v-model="state.selectId" :data="state.options"
+        @visible-change="(e: boolean) => e && getOptions()"
+        :props="{ value: 'id', label: 'name', children: 'children' }" clearable check-strictly
+        :render-after-expand="false" :placeholder="props.placeholder" />
+</template>
+
+<script setup lang="ts" name="select-dept">
+import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
+import * as deptApi from "/@/api/admin/dept";
+
+const selectId = defineModel()
+
+export type Props = {
+    placeholder?: string,
+}
+const props = withDefaults(defineProps<Props>(), {
+    placeholder: "请选择",
+})
+
+const queryForm = reactive<any>({
+    name: "",
+    current: 1,
+    size: 10,
+})
+
+const state = reactive<any>({
+    loading: true,
+    selectId: selectId,
+    options: []
+})
+
+watch(selectId, (newVal, oldValue) => {
+    if (newVal == oldValue) return
+    state.selectId = newVal
+    getOptions()
+}, { immediate: true })
+
+async function getOptions() {
+    try {
+        state.loading = true
+        const _pa = {
+            ...queryForm
+        }
+        const { data } = await deptApi.deptTree()
+        state.options = filterTreeData(data ?? [])
+    } finally {
+        setTimeout(() => state.loading = false, 500);
+    }
+}
+
+function remoteSearch(params: string) {
+    if (params != queryForm.name) {
+        queryForm.name = params
+        getOptions()
+    }
+}
+
+function filterTreeData(treeData: Array<any>) {
+    return treeData.filter(item => {
+        if (item.children && item.children.length) {
+            item.disabled = true;
+            item.children = filterTreeData(item.children)
+        }
+        return item
+    })
+}
+
+function clear() {
+    state.selectId = null
+    getOptions()
+}
+</script>

src/components/Select/SelectMch.vue

@@ -0,0 +1,73 @@
+<template>
+    <el-select style="width: 100%;" v-model="state.selectId" :placeholder="props.placeholder" clearable
+        remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
+        @visible-change="(e: boolean) => e && getOptions()">
+        <el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
+            <div class="flex items-center">
+                <div class="color-primary">{{ v.name }}</div>
+                <div class="flex items-center just ml5">
+                    <el-tag size="small">
+                        {{ v.deptName }}
+                    </el-tag>
+                </div>
+            </div>
+        </el-option>
+    </el-select>
+</template>
+
+<script setup lang="ts" name="select-merchant">
+import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue'
+import * as mchApi from '/@/api/wallet/mch-manage'
+
+const selectId = defineModel()
+
+export type Props = {
+    placeholder?: string,
+}
+const props = withDefaults(defineProps<Props>(), {
+    placeholder: "请选择",
+})
+
+const queryForm = reactive<any>({
+    name: "",
+    current: 1,
+    size: 10,
+})
+
+const state = reactive<any>({
+    loading: true,
+    selectId: selectId,
+    options: []
+})
+
+watch(selectId, (newVal, oldValue) => {
+    if (newVal == oldValue) return
+    state.selectId = newVal
+    getOptions()
+}, { immediate: true })
+
+async function getOptions() {
+    try {
+        state.loading = true
+        const _pa = {
+            ...queryForm
+        }
+        const { data } = await mchApi.pageJoin(_pa)
+        state.options = data.records ?? []
+    } finally {
+        setTimeout(() => state.loading = false, 500);
+    }
+}
+
+function remoteSearch(params: string) {
+    if (params != queryForm.name) {
+        queryForm.name = params
+        getOptions()
+    }
+}
+
+function clear() {
+    state.selectId = null
+    getOptions()
+}
+</script>

src/components/Select/SelectWalletType.vue

@@ -3,10 +3,12 @@
         remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
         @visible-change="(e: boolean) => e && getOptions()">
         <el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
-            <div class="flex items-center justify-center">
+            <div class="flex items-center">
                 <div class="color-primary">{{ v.name }}</div>
                 <div class="flex items-center just ml5">
-                    <el-tag size="small">{{ state.walletType.find((i: any) => i.value == v.uniqueCode).label }}</el-tag>
+                    <el-tag size="small">
+                        {{ state.walletType.find((i: any) => i.value == v.uniqueCode)?.label }}
+                    </el-tag>
                 </div>
             </div>
         </el-option>

src/components/Upload/Excel.vue

@@ -1,19 +1,10 @@
 <!-- excel 导入组件 -->
 <template>
   <el-dialog :title="prop.title" v-model="state.upload.open" :close-on-click-modal="false" draggable>
-    <el-upload
+    <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="headers"
-        ref="uploadRef"
+      :action="baseURL + other.adaptationUrl(url)" :disabled="state.upload.isUploading"
-        :limit="1"
+      :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :on-error="handleFileError"
-        accept=".xlsx, .xls"
+      :auto-upload="false" drag>
-        :headers="headers"
-        :action="baseURL + other.adaptationUrl(url)"
-        :disabled="state.upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :on-error="handleFileError"
-        :auto-upload="false"
-        drag
-    >
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">
         {{ $t('excel.operationNotice') }}
@@ -23,8 +14,7 @@
         <div class="el-upload__tip text-center">
           <span>{{ $t('excel.fileFormat') }}</span>
           <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
-                   @click="downExcelTemp" v-if="tempUrl"
+            @click="downExcelTemp" v-if="tempUrl">{{ $t('excel.downloadTemplate') }}
-          >{{ $t('excel.downloadTemplate') }}
           </el-link>
         </div>
       </template>
@@ -38,8 +28,8 @@
   <!--校验失败错误数据-->
   <el-dialog :title="$t('excel.validationFailureData')" v-model="state.errorVisible">
     <el-table :data="state.errorData">
-      <el-table-column property="lineNum" :label="$t('excel.lineNumbers')" width="100"></el-table-column>
+      <el-table-column property="lineNum" align="center" :label="$t('excel.lineNumbers')" width="100"></el-table-column>
-      <el-table-column property="errors" :label="$t('excel.misDescription')" show-overflow-tooltip>
+      <el-table-column property="errors" align="center" :label="$t('excel.misDescription')" show-overflow-tooltip>
         <template v-slot="scope">
           <el-tag type="danger" v-for="error in scope.row.errors" :key="error">{{ error }}</el-tag>
         </template>
@@ -49,9 +39,9 @@
 </template>
 
 <script setup lang="ts" name="upload-excel">
-import {useMessage} from '/@/hooks/message';
+import { useMessage } from '/@/hooks/message';
 import other from '/@/utils/other';
-import {Session} from '/@/utils/storage';
+import { Session } from '/@/utils/storage';
 
 const emit = defineEmits(['sizeChange', 'refreshDataList']);
 const prop = defineProps({

src/components/index.ts

@@ -16,6 +16,8 @@ import PreviewImage from "/@/components/PreviewImage/index.vue"
 // 业务组件
 import SelectUser from '/@/components/Select/SelectUser.vue'
 import SelectWalletType from '/@/components/Select/SelectWalletType.vue'
+import SelectMch from '/@/components/Select/SelectMch.vue'
+import SelectDept from '/@/components/Select/SelectDept.vue'
 
 
 // 第三方组件
@@ -54,6 +56,8 @@ export default {
 		app.component('PreviewImage', PreviewImage)
 		app.component('SelectUser', SelectUser)
 		app.component('SelectWalletType', SelectWalletType)
+		app.component('SelectMch', SelectMch)
+		app.component('SelectDept', SelectDept)
 
 		// 导入全部的elmenet-plus的图标
 		for (const [key, component] of Object.entries(ElementPlusIconsVue)) {

src/views/canteen/merchantInfo/form.vue

@@ -1,83 +1,69 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+  <el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-      :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-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="绑定部门" prop="parentId">
-        <el-tree-select
-            v-model="form.deptId"
-            :data="parentData"
-            :props="{ value: 'id', label: 'name', children: 'children' }"
-            class="w100"
-            clearable
-            check-strictly
-            :render-after-expand="false"
-            placeholder="请选择要绑定的部门"
-        />
-      </el-form-item>
-      </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-      <el-form-item label="商户名" prop="name">
+          <el-form-item label="商户名" prop="name">
-        <el-input v-model="form.name" placeholder="请输入商户名"/>
+            <el-input v-model="form.name" placeholder="请输入商户名" />
-      </el-form-item>
+          </el-form-item>
-      </el-col>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-      <el-form-item label="商户类型" prop="merchantType">
+          <el-form-item label="部门" prop="deptId">
+            <select-dept v-model="form.deptId" placeholder="请选择部门" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="商户类型" prop="merchantType">
             <el-radio-group v-model="form.merchantType">
-             <el-radio :label="item.value" v-for="(item, index) in merchant_type" border :key="index">{{ item.label }}
+              <el-radio :label="item.value" v-for="(item, index) in merchant_type" border :key="index">{{ item.label }}
-            </el-radio>
+              </el-radio>
             </el-radio-group>
-        </el-form-item>
+          </el-form-item>
-      </el-col>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-  <el-form-item label="商户logo" prop="logo">
+          <el-form-item label="商户logo" prop="logo">
-    <upload-img v-model:imageUrl="form.logo"></upload-img>
+            <upload-img v-model:imageUrl="form.logo"></upload-img>
-  </el-form-item>
+          </el-form-item>
-  </el-col>
+        </el-col>
 
-<!--    <el-col :span="12" class="mb20">-->
+        <el-col :span="24" class="mb20">
-<!--  <el-form-item label="商户收款二维码" prop="collectMoneyCode">-->
+          <el-form-item label="轮播图" prop="swiper">
-<!--    <upload-img v-model:imageUrl="form.collectMoneyCode"></upload-img>-->
+            <upload-imgs v-model:imageUrl="form.swiper" />
-<!--  </el-form-item>-->
+          </el-form-item>
-<!--  </el-col>-->
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-  <el-form-item label="轮播图" prop="swiper">
+          <el-form-item label="联系电话" prop="phone">
-    <upload-img v-model:imageUrl="form.swiper"></upload-img>
+            <el-input v-model="form.phone" placeholder="请输入联系电话" />
-  </el-form-item>
+          </el-form-item>
-  </el-col>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-      <el-form-item label="联系电话" prop="phone">
+          <el-form-item label="营业时间" prop="rangeDate">
-        <el-input v-model="form.phone" placeholder="请输入联系电话"/>
+            <el-time-picker v-model="form.rangeDate" placeholder="请选择营业时间" is-range range-separator="至"
-      </el-form-item>
+              start-placeholder="开始日期" end-placeholder="结束日期" value-format="HH:mm" format="HH:mm" />
-      </el-col>
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+        <el-col :span="24" class="mb20">
-      <el-form-item label="营业时间" prop="businessTime">
+          <el-form-item label="店铺地址" prop="address">
-        <el-input v-model="form.businessTime" placeholder="请输入结束营业时间"/>
+            <el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址" />
-      </el-form-item>
+          </el-form-item>
-      </el-col>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
+      </el-row>
-      <el-form-item label="店铺地址" prop="address">
+    </el-form>
-        <el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址"/>
+    <template #footer>
-      </el-form-item>
+      <span class="dialog-footer">
-      </el-col>
+        <el-button @click="visible = false">取消</el-button>
-
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-			</el-row>
+      </span>
-      </el-form>
+    </template>
-      <template #footer>
+  </el-dialog>
-        <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="MerchantInfoDialog">
@@ -85,7 +71,7 @@ import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
 import { getObj, addObj, putObj } from '/@/api/canteen/merchantInfo'
 import { rule } from '/@/utils/validate';
-import {deptTree} from "/@/api/admin/dept";
+import { deptTree } from "/@/api/admin/dept";
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
@@ -93,30 +79,35 @@ const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
 //定义业务变量内容
-const parentData = ref<any[]>([]);
+
 // 定义字典
 const { merchant_type } = useDict('merchant_type')
 
 // 提交表单数据
 const form = reactive({
-		id:'',
+  id: '',
-	  deptId: '',
+  deptId: '',
-	  name: '',
+  name: '',
-	  merchantType: '',
+  merchantType: '',
-	  logo: '',
+  logo: '',
-	  collectMoneyCode: '',
+  collectMoneyCode: '',
-	  swiper: '',
+  swiper: '',
-	  phone: '',
+  phone: '',
-	  businessTime: '',
+  businessTime: '',
-	  address: '',
+  address: '',
+  jobStartTime: '',
+  rangeDate: [],
+  jobEndTime: [],
 });
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '商户名不能为空', trigger: 'blur'}],
+  name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
-        merchantType: [{required: true, message: '商户类型(字典，1食堂 2超时)不能为空', trigger: 'blur'}],
+  type: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
-        logo: [{required: true, message: '商户logog不能为空', trigger: 'blur'}],
+  logo: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
-        swiper: [{required: true, message: '轮播图不能为空', trigger: 'blur'}],
+  swiper: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
+  rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
+  deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
 })
 
 // 打开弹窗
@@ -125,32 +116,35 @@ const openDialog = (id: string) => {
   form.id = ''
 
   // 重置表单数据
-	nextTick(() => {
+  nextTick(() => {
-		dataFormRef.value?.resetFields();
+    dataFormRef.value?.resetFields();
-	});
+  });
 
   // 获取merchantInfo信息
   if (id) {
     form.id = id
     getmerchantInfoData(id)
   }
-  getDeptData()
 };
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
+  const valid = await dataFormRef.value.validate().catch(() => { });
-	if (!valid) return false;
+  if (!valid) return false;
-
+  const _pa = { ...form }
-	try {
+  if (_pa.rangeDate && _pa.rangeDate.length) {
+    _pa.jobStartTime = _pa.rangeDate[0]
+    _pa.jobEndTime = _pa.rangeDate[1]
+  }
+  try {
     loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
+    form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
+    useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
+    visible.value = false;
-		emit('refresh');
+    emit('refresh');
-	} catch (err: any) {
+  } catch (err: any) {
-		useMessage().error(err.msg);
+    useMessage().error(err.msg);
-	} finally {
+  } finally {
     loading.value = false;
   }
 };
@@ -171,10 +165,4 @@ const getmerchantInfoData = (id: string) => {
 defineExpose({
   openDialog
 });
-// 从后端获取菜单信息
-const getDeptData = async () => {
-  deptTree().then((res) => {
-    parentData.value=res.data;
-  });
-};
 </script>

src/views/canteen/merchantInfo/index.vue

@@ -7,39 +7,46 @@
             v-auth="'canteen_merchantInfo_add'">
             新 增
           </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_merchantInfo_del'"
-            v-auth="'canteen_merchantInfo_del'" @click="handleDelete(selectObjs)">
+            @click="handleDelete(selectObjs)">
             删除
           </el-button>
           <right-toolbar v-model:showSearch="showSearch" :export="'canteen_merchantInfo_export'"
-                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @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
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
-				@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="deptName" label="部门"  show-overflow-tooltip/>
+        <!-- <el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
-          <el-table-column prop="name" label="商户名"  show-overflow-tooltip/>
+          <template #default="scope">
-          <el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
+            <dict-tag :options="merchant_type" :value="scope.row.merchantType"></dict-tag>
-      <template #default="scope">
+          </template>
-                <dict-tag :options="merchant_type" :value="scope.row.merchantType"></dict-tag>
+</el-table-column> -->
-            </template>
+        <el-table-column prop="name" label="商户名" />
-          </el-table-column>
+        <el-table-column prop="logo" label="log">
-          <el-table-column prop="logo" label="商户logog"  show-overflow-tooltip/>
+          <template #default="{ row }">
-          <el-table-column prop="collectMoneyCode" label="商户收款二维码"  show-overflow-tooltip/>
+            <preview-image :src="row.logo" />
-          <el-table-column prop="phone" label="联系电话"  show-overflow-tooltip/>
+          </template>
-          <el-table-column prop="businessTime" label="结束营业时间"  show-overflow-tooltip/>
+        </el-table-column>
-          <el-table-column prop="address" label="店铺地址"  show-overflow-tooltip/>
+        <el-table-column prop="deptName" label="部门" />
-          <el-table-column prop="createTime" label="创建时间"  show-overflow-tooltip/>
+        <el-table-column prop="collectMoneyCode" label="商户收款二维码" show-overflow-tooltip>
+          <template #default="{ row }">
+            <preview-image :src="row.logo" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
+        <el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip />
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
         <el-table-column label="操作" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'canteen_merchantInfo_edit'"
               @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'canteen_merchantInfo_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'canteen_merchantInfo_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -84,7 +91,7 @@ const {
   sizeChangeHandle,
   sortChangeHandle,
   downBlobFile,
-	tableStyle
+  tableStyle
 } = useTable(state)
 
 // 清空搜索条件

src/views/wallet/mch-manage/form.vue

@@ -0,0 +1,180 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+
+        <el-col :span="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="deptId">
+            <select-dept v-model="form.deptId" placeholder="请选择部门" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="商户类型" prop="merchantType">
+            <el-checkbox-group v-model="form.merchantType">
+              <el-checkbox :label="item.value" v-for="(item, index) in merchant_type" border :key="index">
+                {{ item.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="商户logo" prop="logoPic">
+            <upload-img v-model:imageUrl="form.logoPic"></upload-img>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="轮播图" prop="swiperPic">
+            <upload-imgs v-model:imageUrls="form.swiperPic" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="联系电话" prop="phone">
+            <el-input v-model="form.phone" placeholder="请输入联系电话" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="营业时间" prop="rangeDate">
+            <el-time-picker v-model="form.rangeDate" placeholder="请选择营业时间" is-range range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" value-format="HH:mm" format="HH:mm" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="店铺地址" prop="address">
+            <el-input type="textarea" v-model="form.address" 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="MerchantInfoDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/wallet/mch-manage'
+import { rule } from '/@/utils/validate';
+import { parseTime } from '/@/utils/formatTime'
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+//定义业务变量内容
+
+// 定义字典
+const { merchant_type } = useDict('merchant_type')
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  deptId: '',
+  name: '',
+  merchantType: [],
+  logoPic: '',
+  collectMoneyCode: '',
+  swiperPic: [],
+  phone: '',
+  businessTime: '',
+  address: '',
+  jobStartTime: '',
+  jobEndTime: '',
+  rangeDate: [],
+});
+
+// 定义校验规则
+const dataRules = ref({
+  name: [{ required: true, message: '商户名不能为空', trigger: 'blur' }],
+  types: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
+  logoPic: [{ required: true, message: '请上传商户logo', trigger: 'change' }],
+  swiperPic: [{ required: true, message: '请上传商户轮播图', trigger: 'change' }],
+  rangeDate: [{ required: true, message: '请选择营业时间', trigger: 'change' }],
+  deptId: [{ required: true, message: '请选择部门', trigger: 'change' }],
+  merchantType: [{ required: true, message: '请选择商户类型', trigger: 'change' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取merchantInfo信息
+  if (id) {
+    form.id = id
+    getmerchantInfoData(id)
+  }
+};
+
+const parseDate = (timeString: string) => {
+  const now = new Date();
+  const [hours, minutes] = timeString.split(":").map(Number)
+  now.setHours(hours)
+  now.setMinutes(minutes)
+  now.setSeconds(0)
+  now.setMilliseconds(0)
+  return parseTime(now, "{h}:{i}:{s}")
+}
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+  const _pa = { ...form, types: form.merchantType.join(",") }
+  if (_pa.rangeDate && _pa.rangeDate.length) {
+    _pa.jobStartTime = parseDate(_pa.rangeDate[0])
+    _pa.jobEndTime = parseDate(_pa.rangeDate[1])
+  }
+  try {
+    loading.value = true;
+    form.id ? await putObj(form) : await addObj(_pa);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getmerchantInfoData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/mch-manage/index.vue

@@ -0,0 +1,145 @@
+<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="'wallet_mchManage_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_mchManage_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'wallet_mchManage_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-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="name" label="商户名" />
+        <el-table-column prop="logoPic" label="log">
+          <template #default="{ row }">
+            <preview-image :src="row.logoPic" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="collectionCode" label="商户收款二维码" show-overflow-tooltip>
+          <template #default="{ row }">
+            <preview-image :src="row.collectionCode" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
+          <template #default="{ row }">
+            <div class="flex justify-center items-center">
+              <div v-for="(v, i) in row.types.split(',')" :key="i" class="mr-1">
+                <dict-tag :options="merchant_type" :value="v" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deptName" label="部门" />
+        <el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
+        <el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip>
+          <template #default="{ row }">
+            <div>
+              <span>{{ row.jobStartTime }}</span>
+              <span class="mx-1">-</span>
+              <span>{{ row.jobStartTime }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_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="MchManage">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { pageJoin, delObjs } from '/@/api/wallet/mch-manage'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+import { parseDate } from '/@/utils/formatTime'
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { merchant_type } = useDict('merchant_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: pageJoin
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/canteen/merchantInfo/export', Object.assign(state.queryForm, { ids: selectObjs }), 'merchantInfo.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-active/form.vue

@@ -0,0 +1,107 @@
+<template>
+  <el-dialog title="开卡" width="30%" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="商户" prop="merchantId">
+            <select-mch v-model="form.merchantId" placeholder="请选择商户" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="生成数量" prop="count">
+            <el-input-number style="width: 100%" v-model="form.count" :max="200" placeholder="请输入生成数量" :min="0"
+              controls-position="right" />
+          </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="WalletActiveDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj, fastCreateCard } from '/@/api/wallet/wallet-active'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  merchantId: '',
+  count: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+  merchantId: [{ required: true, message: '请选择商户', trigger: 'change' }],
+  count: [{ required: true, message: '生成数量不能为空', trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取walletActive信息
+  if (id) {
+    form.id = id
+    getwalletActiveData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    fastCreateCard(form)
+    useMessage().success("开卡成功");
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getwalletActiveData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/wallet-active/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="是否激活" prop="isActiveHardware">
+              <dict-select v-model="state.queryForm.isActiveHardware" dict-code="yes_no_type" placeholder="是否激活" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="卡号" prop="cardNumber">
+              <el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+            </el-form-item>
+          </el-col>
+          <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-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'wallet_walletActive_add'">
+            开 卡
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletActive_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletActive_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-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="usernaem" label="用户" show-overflow-tooltip />
+        <el-table-column prop="deptName" label="部门" show-overflow-tooltip />
+        <el-table-column prop="merchantName" label="商户" show-overflow-tooltip />
+        <el-table-column prop="cardNumber" label="用户卡号" show-overflow-tooltip />
+        <el-table-column prop="isActiveHardware" label="是否激活" show-overflow-tooltip>
+          <template #default="{ row }">
+            <dict-tag :options="yes_no_type" :value="row.isActiveHardware" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'wallet_walletActive_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_walletActive_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="systemWalletActive">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-active";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { wallet_type, yes_no_type } = useDict('wallet_type', '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: pageJoin
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/walletActive/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletActive.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-foreign/form.vue

@@ -0,0 +1,103 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="部门id" prop="deptId">
+            <el-input v-model="form.deptId" placeholder="请输入部门id" />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="WalletForeignDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '../../../api/wallet/wallet-foreign'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  userId: '',
+  deptId: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取walletForeign信息
+  if (id) {
+    form.id = id
+    getwalletForeignData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await putObj(form) : await addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getwalletForeignData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/wallet-foreign/index.vue

@@ -0,0 +1,118 @@
+<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="'wallet_walletForeign_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletForeign_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletForeign_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-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+        <el-table-column prop="deptId" label="部门id" show-overflow-tooltip />
+        <el-table-column prop="applyStartTime" label="申请使用开始时间" show-overflow-tooltip />
+        <el-table-column prop="applyEndTime" label="申请使用结束时间" show-overflow-tooltip />
+        <el-table-column prop="count" label="申请数量" show-overflow-tooltip />
+        <el-table-column prop="useCount" label="使用数量" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletForeign_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_walletForeign_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="systemWalletForeign">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "../../../api/wallet/wallet-foreign";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+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: 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/walletForeign/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletForeign.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-freeze/form.vue

@@ -0,0 +1,117 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="12" class="mb20">
+          <el-form-item label="钱包id" prop="walletId">
+            <el-input v-model="form.walletId" placeholder="请输入钱包id" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="冻结状态" prop="freeStatus">
+            <el-input v-model="form.freeStatus" placeholder="请输入冻结状态" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" 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="WalletFreezeDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/wallet/wallet-freeze'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  walletId: '',
+  userId: '',
+  freeStatus: '',
+  remark: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取walletFreeze信息
+  if (id) {
+    form.id = id
+    getwalletFreezeData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await putObj(form) : await addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getwalletFreezeData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/wallet-freeze/index.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="申请人" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="饭卡卡号" prop="cardNumber">
+              <el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+            </el-form-item>
+          </el-col>
+          <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-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'wallet_walletFreeze_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletFreeze_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletFreeze_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-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="walletId" label="钱包id" show-overflow-tooltip />
+        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+        <el-table-column prop="freeStatus" label="冻结状态" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletFreeze_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'wallet_walletFreeze_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="systemWalletFreeze">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { getObj, addObj, putObj, fetchList, pageJoin } from '/@/api/wallet/wallet-freeze'
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+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: pageJoin
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/wallet/walletFreeze/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletFreeze.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-manage/index.vue

@@ -44,9 +44,14 @@
         </el-table-column>
         <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
         <el-table-column prop="deptName" label="部门" show-overflow-tooltip />
-        <el-table-column prop="walletTypeUniqueCode" label="饭卡类型" show-overflow-tooltip>
+        <el-table-column prop="walletTypeUniqueCode" width="150" label="饭卡类型" show-overflow-tooltip>
           <template #default="{ row }">
-            <dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+            <div class="flex items-center justify-center">
+              <div class="color-primary">{{ row.walletTypeName }}</div>
+              <div class="flex items-center just ml5">
+                <dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+              </div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="cardNumber" label="饭卡卡号" show-overflow-tooltip />

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

@@ -4,7 +4,7 @@
       <el-row :gutter="24">
         <el-col :span="24" class="mb20">
           <el-form-item label="充值时间" prop="importTime">
-            <el-date-picker v-model="form.importTime" type="month" value-format="x" placeholder="请选择充值时间" />
+            <el-date-picker v-model="form.importTime" type="month" value-format="YYYY-MM-DD" placeholder="请选择充值时间" />
           </el-form-item>
         </el-col>
 

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

@@ -1,11 +1,30 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" placeholder="用户" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+            </el-form-item>
+          </el-col>
+          <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-row>
         <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+          <el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
             v-auth="'wallet_walletRechargeApply_add'">
-            申 请
+            导 入
           </el-button>
           <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletRechargeApply_del'"
             @click="handleDelete(selectObjs)">
@@ -21,13 +40,31 @@
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="userId" label="申请人ID" show-overflow-tooltip />
+        <el-table-column prop="username" label="申请人" show-overflow-tooltip />
-        <el-table-column prop="bizType" label="充值类型" show-overflow-tooltip />
+        <el-table-column prop="bizType" label="充值类型" show-overflow-tooltip>
-        <el-table-column prop="walletTypeId" label="饭卡类型id" show-overflow-tooltip />
+          <template #default="{ row }">
-        <el-table-column prop="deptId" label="部门ID" show-overflow-tooltip />
+            <dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
-        <el-table-column prop="importTime" label="导入时间(手动选择)" show-overflow-tooltip />
+          </template>
-        <el-table-column label="操作" width="150">
+        </el-table-column>
+        <el-table-column prop="walletTypeId" widht="150" label="饭卡类型" show-overflow-tooltip>
+          <template #default="{ row }">
+            <div class="flex items-center justify-center">
+              <div class="color-primary">{{ row.walletTypeName }}</div>
+              <div class="flex items-center just ml5">
+                <dict-tag :options="wallet_type" :value="row.uniqueCode" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deptName" label="部门" show-overflow-tooltip />
+        <el-table-column prop="importTime" label="充值时间" show-overflow-tooltip />
+        <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+        <el-table-column label="操作" width="300">
           <template #default="scope">
+            <el-button icon="Document" text type="primary" v-auth="'wallet_walletRechargeApply_edit'"
+              @click="doInfo(scope.row)">数据</el-button>
+            <el-button icon="Connection" text type="primary" v-auth="'wallet_walletRechargeApply_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">申请</el-button>
             <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRechargeApply_edit'"
               @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
             <el-button icon="delete" text type="primary" v-auth="'wallet_walletRechargeApply_del'"
@@ -41,21 +78,27 @@
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
+    <upload-excel ref="uploadExcelRef" title="用户信息导入" url="/wallet/wallet-recharge-apply/read-excel"
+      temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
   </div>
 </template>
 
 <script setup lang="ts" name="systemWalletRechargeApply">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/wallet/wallet-recharge-apply";
+import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 
+const { push } = useRouter()
+
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
+const { wallet_biz_recharge, wallet_type } = useDict('wallet_biz_recharge', 'wallet_type');
 
 // 定义变量内容
 const formDialogRef = ref()
+const uploadExcelRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -65,7 +108,7 @@ const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: fetchList
+  pageList: walletRechargeApplyApi.pageJoin
 })
 
 //  table hook
@@ -98,6 +141,10 @@ const selectionChangHandle = (objs: { id: string }[]) => {
   multiple.value = !objs.length;
 };
 
+const doInfo = (row: any) => {
+  push({ path: '/wallet/wallet-recharge-apply/preview-excel', query: { id: row.id } })
+}
+
 // 删除操作
 const handleDelete = async (ids: string[]) => {
   try {
@@ -107,7 +154,7 @@ const handleDelete = async (ids: string[]) => {
   }
 
   try {
-    await delObjs(ids);
+    await walletRechargeApplyApi.delObjs(ids);
     getDataList();
     useMessage().success('删除成功');
   } catch (err: any) {

src/views/wallet/wallet-recharge-apply/preview-excel.vue

@@ -0,0 +1,46 @@
+<template>
+    <div class="layout-padding">
+        <div class="layout-padding-auto layout-padding-view">
+            <el-row>
+                <div class="mb8" style="width: 100%">
+                    <right-toolbar class="ml10 mr20" style="float: right;" :search="false" @queryTable="getDataList" />
+                </div>
+            </el-row>
+            <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+                :header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
+                <el-table-column type="index" label="#" width="40" />
+                <el-table-column prop="username" label="用户" show-overflow-tooltip />
+                <el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
+                    <template #default="{ row }">
+                        <preview-image :src="row.userAvatar" />
+                    </template>
+                </el-table-column>
+                <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
+                <el-table-column prop="username" label="操作金额" show-overflow-tooltip />
+            </el-table>
+            <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+                v-bind="state.pagination" />
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="preview-excel">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
+import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply";
+
+// 定义变量内容
+const dialogVisible = ref(false)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    queryForm: {},
+    pageList: walletRechargeApplyApi.pageJoin
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+
+
+</script>

src/views/wallet/wallet-stride/form.vue

@@ -0,0 +1,104 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="24" class="mb20">
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="申请人id" prop="userId">
+        <el-input v-model="form.userId" placeholder="请输入申请人id"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="WalletStrideDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/admin/walletStride'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  deptId: '',
+	  userId: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取walletStride信息
+  if (id) {
+    form.id = id
+    getwalletStrideData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getwalletStrideData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/wallet/wallet-stride/index.vue

@@ -0,0 +1,116 @@
+<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="'admin_walletStride_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'admin_walletStride_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'admin_walletStride_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-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>
+          <el-table-column prop="count" label="申请数量"  show-overflow-tooltip/>
+          <el-table-column prop="useCount" label="使用数量"  show-overflow-tooltip/>
+          <el-table-column prop="userId" label="申请人id"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'admin_walletStride_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'admin_walletStride_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="systemWalletStride">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/admin/walletStride";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+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: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/admin/walletStride/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletStride.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 delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-type/index.vue

@@ -21,17 +21,17 @@
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="icon" label="钱包图标" show-overflow-tooltip>
+          <template #default="{ row }">
+            <preview-image :src="row.icon" />
+          </template>
+        </el-table-column>
         <el-table-column prop="name" label="钱包名" show-overflow-tooltip />
         <el-table-column prop="uniqueCode" label="饭卡类型" show-overflow-tooltip>
           <template #default="{ row }">
             <dict-tag :options="wallet_type" :value="row.uniqueCode" />
           </template>
         </el-table-column>
-        <el-table-column prop="icon" label="钱包图标" show-overflow-tooltip>
-          <template #default="{ row }">
-            <preview-image :src="row.icon" />
-          </template>
-        </el-table-column>
         <el-table-column label="操作" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletType_edit'"