Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

package-lock.json

@@ -8348,7 +8348,7 @@
     },
     "node_modules/vue-simple-calendar": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmmirror.com/vue-simple-calendar/-/vue-simple-calendar-6.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/vue-simple-calendar/-/vue-simple-calendar-6.3.1.tgz",
       "integrity": "sha512-FUvFQPA9X6tuLj/8JY13HRTJQdFrKpej6B3dN6t4LCPVQUxPKu1K4URgh4cE3trpZNtepayiecehk+04nqb9BQ==",
       "dependencies": {
         "vue": "^3.2.47"

src/api/withdraw.ts

@@ -1,26 +1,26 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 // 提现申请列表
 export function apiWithdrawLists(params: any) {
-  return request.get({ url: "/withdraw/index", params });
+    return request.get({ url: '/finance.withdraw/index', params })
 }
 
 // 添加提现申请
 export function apiWithdrawAdd(params: any) {
-  return request.post({ url: "/withdraw/add", params });
+    return request.post({ url: '/finance.withdraw/add', params })
 }
 
 // 编辑提现申请
 export function apiWithdrawEdit(params: any) {
-  return request.post({ url: "/withdraw/edit", params });
+    return request.post({ url: '/finance.withdraw/edit', params })
 }
 
 // 删除提现申请
 export function apiWithdrawDelete(params: any) {
-  return request.post({ url: "/withdraw/delete", params });
+    return request.post({ url: '/finance.withdraw/delete', params })
 }
 
 // 提现申请详情
 export function apiWithdrawDetail(params: any) {
-  return request.get({ url: "/withdraw/detail", params });
+    return request.get({ url: '/finance.withdraw/detail', params })
 }

src/views/finance/Withdrawal.vue

@@ -34,10 +34,7 @@
                         placeholder="请输入提现金额"
                     />
                 </el-form-item>
-        <el-form-item
+                <el-form-item label="状态：0待审核，1通过，2拒绝，3已转账" prop="status">
-          label="状态：0待审核，1通过，2拒绝，3已转账"
-          prop="status"
-        >
                     <el-input
                         class="w-[280px]"
                         v-model="queryParams.status"
@@ -68,23 +65,10 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
-          <el-table-column
+                    <el-table-column label="订单编号" prop="order_sn" show-overflow-tooltip />
-            label="订单编号"
+                    <el-table-column label="用户" prop="user_id" show-overflow-tooltip />
-            prop="order_sn"
+                    <el-table-column label="提现金额" prop="amount" show-overflow-tooltip />
-            show-overflow-tooltip
+                    <el-table-column label="状态" prop="status" show-overflow-tooltip />
-          />
-          <el-table-column label="" prop="user_id" show-overflow-tooltip />
-          <el-table-column label="" prop="admin_id" show-overflow-tooltip />
-          <el-table-column
-            label="提现金额"
-            prop="amount"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            label="状态：0待审核，1通过，2拒绝，3已转账"
-            prop="status"
-            show-overflow-tooltip
-          />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button
@@ -122,64 +106,64 @@
 </template>
 
 <script lang="ts" setup name="withdrawLists">
-import { usePaging } from "@/hooks/usePaging";
+import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from "@/hooks/useDictOptions";
+import { useDictData } from '@/hooks/useDictOptions'
-import { apiWithdrawLists, apiWithdrawDelete } from "@/api/withdraw";
+import { apiWithdrawLists, apiWithdrawDelete } from '@/api/withdraw'
-import { timeFormat } from "@/utils/util";
+import { timeFormat } from '@/utils/util'
-import feedback from "@/utils/feedback";
+import feedback from '@/utils/feedback'
-import EditPopup from "./edit.vue";
+import EditPopup from './edit.vue'
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>();
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
-const showEdit = ref(false);
+const showEdit = ref(false)
 
 // 查询条件
 const queryParams = reactive({
-  order_sn: "",
+    order_sn: '',
-  user_id: "",
+    user_id: '',
-  admin_id: "",
+    admin_id: '',
-  amount: "",
+    amount: '',
-  status: "",
+    status: ''
-});
+})
 
 // 选中数据
-const selectData = ref<any[]>([]);
+const selectData = ref<any[]>([])
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-  selectData.value = val.map(({ id }) => id);
+    selectData.value = val.map(({ id }) => id)
-};
+}
 
 // 获取字典数据
-const { dictData } = useDictData("");
+const { dictData } = useDictData('')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
     fetchFun: apiWithdrawLists,
-  params: queryParams,
+    params: queryParams
-});
+})
 
 // 添加
 const handleAdd = async () => {
-  showEdit.value = true;
+    showEdit.value = true
-  await nextTick();
+    await nextTick()
-  editRef.value?.open("add");
+    editRef.value?.open('add')
-};
+}
 
 // 编辑
 const handleEdit = async (data: any) => {
-  showEdit.value = true;
+    showEdit.value = true
-  await nextTick();
+    await nextTick()
-  editRef.value?.open("edit");
+    editRef.value?.open('edit')
-  editRef.value?.setFormData(data);
+    editRef.value?.setFormData(data)
-};
+}
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-  await feedback.confirm("确定要删除？");
+    await feedback.confirm('确定要删除？')
-  await apiWithdrawDelete({ id });
+    await apiWithdrawDelete({ id })
-  getLists();
+    getLists()
-};
+}
 
-getLists();
+getLists()
 </script>

yarn.lock

@@ -4322,7 +4322,7 @@ vue-router@^4.0.16:
 
 vue-simple-calendar@^6.3.1:
   version "6.3.1"
-  resolved "https://registry.npmmirror.com/vue-simple-calendar/-/vue-simple-calendar-6.3.1.tgz"
+  resolved "https://registry.npmjs.org/vue-simple-calendar/-/vue-simple-calendar-6.3.1.tgz"
   integrity sha512-FUvFQPA9X6tuLj/8JY13HRTJQdFrKpej6B3dN6t4LCPVQUxPKu1K4URgh4cE3trpZNtepayiecehk+04nqb9BQ==
   dependencies:
     vue "^3.2.47"