diff --git a/pages/Initiate-application.vue b/pages/Initiate-application.vue index 2d6a572..23a6672 100644 --- a/pages/Initiate-application.vue +++ b/pages/Initiate-application.vue @@ -52,18 +52,18 @@
备注
- - - + + +
@@ -209,8 +209,8 @@ v-model="applyDepartment" is-link readonly - label="申请类型" - placeholder="请选择申请类型" + label="所属部门" + placeholder="请选择所属部门" @click="showDepartment = true" required input-align="right" @@ -231,7 +231,7 @@ 历史申请
- +
暂无历史记录 @@ -315,7 +315,7 @@ const applyData = ref([ } ]); // 申请的记录 const isSuccess = ref(false) // 上传票据是否成功 -const name = ref('黛西') // 提交人的姓名 +const name = ref('') // 提交人的姓名 const applyMoney = ref(5000) // 手动输入时输入的申请的金额 const titleHidden = ref(true) // 上传提示语隐藏 const currentPage = ref(0) //当前显示页数 diff --git a/pages/applicant.vue b/pages/applicant.vue index 2555ddb..284af91 100644 --- a/pages/applicant.vue +++ b/pages/applicant.vue @@ -13,7 +13,7 @@ 历史申请
-
+
暂无历史记录 @@ -27,7 +27,27 @@
- 我的奖金 + +
+
奖金领取记录
+ + +
+
+
待领取奖金
+
可领取:
+
+ 暂无可领取的奖金 +
+
+ 500元 +
+
+ 立即领取 +
+ +
+
@@ -39,45 +59,7 @@ import {ref} from 'vue' const active = ref(0); const isShow = ref(true); -const currentPage = ref(1) -const applyData = ref([ - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 1 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 2 - }, - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 3 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 3 - }, - { - applicant:'代用名1', - money:100, - time:'2021/12/31 12:31', - type: 1 - }, - { - applicant:'代用名2', - money:100, - time:'2021/12/31 12:31', - type: 2 - } -]); +const isBonus =ref(true) function onClickLeft(){ console.log('返回上一页') diff --git a/pages/application-details.vue b/pages/application-details.vue index 28b5fa4..c9caab5 100644 --- a/pages/application-details.vue +++ b/pages/application-details.vue @@ -7,17 +7,61 @@ @click-left="onClickLeft" /> -
-
审核结果
-
- +
+
审核结果
+
+
+
{{item.name}}
+
{{item.advice}}
+
{{item.checkedTime}}
+
+
+
+ {{item.status === '1' ? '已通过' : item.status === '2' ? '已驳回' : '待审批'}} +
+
+ +
+
+
+
+ +
+
发票信息
+
+
{{item.name}}
+
{{item.value}}
+
+
+ +
+
其他信息
+
+
{{item.name}}
+
{{item.value}}
+
+
+ +
+
提交人信息
+
+
{{item.name}}
+
{{item.value}}
+ + diff --git a/plugins/vant.js b/plugins/vant.js index 463abbb..5787054 100644 --- a/plugins/vant.js +++ b/plugins/vant.js @@ -19,6 +19,7 @@ import { Form, Popup, Cascader, + Circle, } from 'vant'; import { defineNuxtPlugin } from '#app'; @@ -41,5 +42,6 @@ export default defineNuxtPlugin(nuxtApp => { .use(Form) .use(Cascader) .use(Popup) + .use(Circle) .use(Tabs); });