creat：生成code

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

@@ -1,16 +1,28 @@
 <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-dialog title="申请" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="100px" 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 label="申请人" prop="userId">
+            <select-user v-model="form.userId" />
           </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 label="申请数量" prop="count">
+            <el-input-number v-model="form.count" :min="1" :max="100" />
+          </el-form-item>
+        </el-col>
+
+        <el-form-item label="申请有效期" prop="rangeDate">
+          <el-date-picker v-model="form.rangeDate" placeholder="请选择申请有效期" type="daterange" range-separator="至"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" format="YYYY-MM-DD" />
+        </el-form-item>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" placeholder="请输入备注" type="textarea" :autosize="{ minRows: 6 }" />
           </el-form-item>
         </el-col>
 
@@ -28,7 +40,7 @@
 <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 { getObj, addObj, putObj } from '/@/api/wallet/wallet-foreign'
 import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
@@ -42,11 +54,18 @@ const loading = ref(false)
 const form = reactive({
   id: '',
   userId: '',
-  deptId: '',
+  count: '',
+  remark: '',
+  applyEndTime: '',
+  applyStartTime: '',
+  rangeDate: []
 });
 
 // 定义校验规则
 const dataRules = ref({
+  count: [{ required: true, message: '申请数量不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '申请人id不能为空', trigger: 'blur' }],
+  rangeDate: [{ required: true, message: '申请人id不能为空', trigger: 'change' }],
 })
 
 // 打开弹窗
@@ -73,8 +92,13 @@ const onSubmit = async () => {
 
   try {
     loading.value = true;
-    form.id ? await putObj(form) : await addObj(form);
-    useMessage().success(form.id ? '修改成功' : '添加成功');
+    const pa: any = { ...form }
+    if (form.rangeDate && form.rangeDate.length) {
+      pa.applyStartTime = form.rangeDate[0]
+      pa.applyEndTime = form.rangeDate[1]
+    }
+    await addObj(pa);
+    useMessage().success('申请成功');
     visible.value = false;
     emit('refresh');
   } catch (err: any) {

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

@@ -1,11 +1,25 @@
 <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-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_walletForeign_add'">
-            新 增
+            申 请
           </el-button>
           <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletForeign_del'"
             @click="handleDelete(selectObjs)">
@@ -21,18 +35,36 @@
         @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>
+        <el-table-column prop="username" label="申请人" />
+        <el-table-column prop="deptName" label="部门" />
+        <el-table-column prop="applyStartTime" label="申请使用时间">
+          <template #default="{ row }">
+            <span>{{ row.applyStartTime }}</span>
+            <span class="mx-1">-</span>
+            <span>{{ row.applyEndTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="count" label="申请数量" />
+        <el-table-column prop="useCount" label="使用数量" />
+        <el-table-column prop="processStatus" label="审核状态">
+          <template #default="{ row }">
+            <el-tag v-if="row.processStatus == 1" type="success">进行中</el-tag>
+            <el-tag v-else>已结束</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column label="操作" width="200">
+          <template #default="{ row }">
+            <el-button icon="InfoFilled" text type="primary" @click="codeUseTableRef.openDialog(row.id)">
+              使用情况
+            </el-button>
+            <el-button icon="Promotion" text type="primary" v-auth="'admin_walletStride_del'" @click="doInfo(row)">
+              查看审批
+            </el-button>
+            <el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletForeign_del'"
+              @click="handleDelete([row.id])">
+              删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -41,22 +73,24 @@
 
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
+    <code-use-table ref="codeUseTableRef" />
   </div>
 </template>
 
 <script setup lang="ts" name="systemWalletForeign">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "../../../api/wallet/wallet-foreign";
+import { fetchList, pageJoin, delObjs } from "/@/api/wallet/wallet-foreign";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const CodeUseTable = defineAsyncComponent(() => import('../components/code-use-table.vue'));
 // 定义查询字典
 
 // 定义变量内容
 const formDialogRef = ref()
+const codeUseTableRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -64,9 +98,11 @@ const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 
+const { push } = useRouter()
+
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
-  pageList: fetchList
+  pageList: pageJoin
 })
 
 //  table hook
@@ -88,6 +124,11 @@ const resetQuery = () => {
   getDataList()
 }
 
+const doInfo = (row: any) => {
+  push({ path: '/flow/task/started', query: { id: row.id } })
+}
+
+
 // 导出excel
 const exportExcel = () => {
   downBlobFile('/wallet/walletForeign/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletForeign.xlsx')