Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
9b888601 by lttnew
Options

Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

2 parents 94f120e1 e92d0a31
Expand all
Inline Side-by-side
Showing 5 changed files with 90 additions and 40 deletions
common/api.js
...@@ -416,6 +416,16 @@ export function audit(data) { ...@@ -416,6 +416,16 @@ export function audit(data) {
416 }) 416 })
417 } 417 }
418 418
419 // 个人会员新版本审核
420 export function auditApi(data) {
421 return request({
422 url: `/person/paymentRangeNew/audit/${data.ids}?reason=${data.reason}&flag=${data.flag}`,
423 method: 'post',
424 params: data
425 })
426 }
427
428
419 // 审核详情 429 // 审核详情
420 export function getHistoryByRelateId(rId) { 430 export function getHistoryByRelateId(rId) {
421 return request({ 431 return request({
...@@ -1950,3 +1960,12 @@ export function GroupGetLogs(id) { ...@@ -1950,3 +1960,12 @@ export function GroupGetLogs(id) {
1950 }) 1960 })
1951 } 1961 }
1952 1962
1963
1964 // 新个人会员审批
1965 export function auditList(params) {
1966 return request({
1967 url: '/person/paymentRangeNew/list',
1968 method: 'get',
1969 params: params
1970 })
1971 }
......
pages/index/home.vue
This diff could not be displayed because it is too large.
pages/index/image.js 0 → 100644
This diff could not be displayed because it is too large.
personalVip/paymentDetail.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <view class="wBox"> 3 <view class="wBox">
4 <view class="tt">{{form.paymentName}}</view> 4 <view class="tt">{{ form.memName }}</view>
5 <view class="info" style="flex-wrap: wrap;">
6 <view class="w45">共
7 <text class="text-danger"> {{ form?.allCount }}</text>
8 人
9 </view>
10 <view class="w45">新会员
11 <text class="text-primary"> {{ form?.newCount }}</text>
12 人
13 </view>
14 <view class="w45">续费合计
15 <text class="text-primary"> {{ form?.oldCount }}</text>
16 人
17 </view>
18 <view class="w45">费用合计
19 <text class="text-danger">{{ form?.price }}</text>
20 元
21 </view>
22 </view>
23 </view>
24
25
26 <view class="wBox">
27 <!-- <view class="tt">{{ // form.paymentName }}</view>-->
5 <view class="info"> 28 <view class="info">
6 <view>共<text>{{list.length}}</text>人</view> 29 <view>共
30 <text>{{ list.length }}</text>
31 人
32 </view>
7 </view> 33 </view>
8 <view class="userlist"> 34 <view class="userlist">
9 <view class="item" v-for="(n,index) in list" :key="index"> 35 <view v-for="(n,index) in list" :key="index" class="item">
10 <view> 36 <view>
11 <view class="name">{{n.perName}}<text v-if="n.memberInfoName">({{n.memberInfoName || ''}})</text></view> 37 <view class="name">{{ n.perName }}
12 <view class="date">原有效期至 {{n.originValidityDate ? n.originValidityDate.slice(0,10) : '--'}}</view> 38 <text v-if="n.memberInfoName">({{ n.memberInfoName || '' }})</text>
39 </view>
40 <view class="date">原有效期至 {{ n.originValidityDate ? n.originValidityDate.slice(0, 10) : '--' }}</view>
13 </view> 41 </view>
14 <view class="nian"> 42 <view class="nian">
15 {{n.payYear}}年 43 {{ n.payYear }}年
16 </view> 44 </view>
17 </view> 45 </view>
18 </view> 46 </view>
19 </view> 47 </view>
20 48
21 <view class="h3-padding" v-if="feelList.length>0">审核流程</view> 49 <view v-if="feelList.length>0" class="h3-padding">审核流程</view>
22 <view class="wBox" v-if="feelList.length>0"> 50 <view v-if="feelList.length>0" class="wBox">
23 <view class="stepItem" v-for="(n,index) in feelList" :key="index"> 51 <view v-for="(n,index) in feelList" :key="index" class="stepItem">
24 <view class="time">{{n.auditTime || '待审批'}}</view> 52 <view class="time">{{ n.auditTime || '待审批' }}</view>
25 <view class="content"> 53 <view class="content">
26 <view class="status"> 54 <view class="status">
27 <text v-if="n.auditResult==0" class="text-primary"> 审核中</text> 55 <text v-if="n.auditResult==0" class="text-primary"> 审核中</text>
...@@ -29,9 +57,9 @@ ...@@ -29,9 +57,9 @@
29 <text v-if="n.auditResult==2" class="text-danger"> 审核拒绝</text> 57 <text v-if="n.auditResult==2" class="text-danger"> 审核拒绝</text>
30 <text v-if="n.auditResult==3" class="text-warning"> 已撤回</text> 58 <text v-if="n.auditResult==3" class="text-warning"> 已撤回</text>
31 </view> 59 </view>
32 <view class="name">第 {{index+1}} 步</view> 60 <view class="name">第 {{ index + 1 }} 步</view>
33 <view class="deptName">{{n.auditDeptName || n.auditBy}}</view> 61 <view class="deptName">{{ n.auditDeptName || n.auditBy }}</view>
34 <view>备注：{{n.auditMsg || '/' }}</view> 62 <view>备注：{{ n.auditMsg || '/' }}</view>
35 </view> 63 </view>
36 </view> 64 </view>
37 </view> 65 </view>
...@@ -39,32 +67,33 @@ ...@@ -39,32 +67,33 @@
39 </template> 67 </template>
40 68
41 <script setup> 69 <script setup>
42 import * as api from '@/common/api.js' 70 import * as api from '@/common/api.js'
43 import { ref } from 'vue' 71 import {ref} from 'vue'
44 import { onLoad } from '@dcloudio/uni-app' 72 import {onLoad} from '@dcloudio/uni-app'
45 73
46 // 查询参数（和PC保持一致） 74 // 查询参数（和PC保持一致）
47 const queryParams = ref({ 75 const queryParams = ref({
48 rangeId: '', 76 rangeId: '',
49 pageNum: 1, 77 pageNum: 1,
50 pageSize: 999 78 pageSize: 999
51 }) 79 })
52 80
53 const form = ref({}) 81 const form = ref({})
54 const list = ref([]) 82 const list = ref([])
55 const feelList = ref([]) 83 const feelList = ref([])
56 84
57 onLoad((option) => { 85 onLoad((option) => {
58 if (option.form) { 86 if (option.form) {
59 form.value = JSON.parse(decodeURIComponent(option.form)) 87 form.value = JSON.parse(decodeURIComponent(option.form))
60 queryParams.value.rangeId = form.value.rangId || form.value.rangeId 88 queryParams.value.rangeId = form.value.rangId || form.value.rangeId
61
62 getList() 89 getList()
63 getAuditLogs() 90 getAuditLogs()
64 } 91 }
65 })
66 92
67 async function getList() { 93 console.log(form.value)
94 })
95
96 async function getList() {
68 try { 97 try {
69 const res = await api.listAPI(queryParams.value) 98 const res = await api.listAPI(queryParams.value)
70 list.value = res.rows || [] 99 list.value = res.rows || []
...@@ -72,9 +101,9 @@ ...@@ -72,9 +101,9 @@
72 list.value = [] 101 list.value = []
73 console.error('获取成员失败', e) 102 console.error('获取成员失败', e)
74 } 103 }
75 } 104 }
76 105
77 function getAuditLogs() { 106 function getAuditLogs() {
78 if (form.value.auditLogs) { 107 if (form.value.auditLogs) {
79 try { 108 try {
80 feelList.value = JSON.parse(form.value.auditLogs) 109 feelList.value = JSON.parse(form.value.auditLogs)
...@@ -82,11 +111,11 @@ ...@@ -82,11 +111,11 @@
82 feelList.value = [] 111 feelList.value = []
83 } 112 }
84 } 113 }
85 } 114 }
86 </script> 115 </script>
87 116
88 <style scoped lang="scss"> 117 <style lang="scss" scoped>
89 .wBox { 118 .wBox {
90 width: 700rpx; 119 width: 700rpx;
91 padding: 30rpx; 120 padding: 30rpx;
92 margin: 20rpx auto 0; 121 margin: 20rpx auto 0;
...@@ -98,9 +127,9 @@ ...@@ -98,9 +127,9 @@
98 color: #0A1629; 127 color: #0A1629;
99 font-size: 30rpx; 128 font-size: 30rpx;
100 } 129 }
101 } 130 }
102 131
103 .userlist { 132 .userlist {
104 .item { 133 .item {
105 border-bottom: 1px dashed #e5e5e5; 134 border-bottom: 1px dashed #e5e5e5;
106 position: relative; 135 position: relative;
...@@ -114,6 +143,7 @@ ...@@ -114,6 +143,7 @@
114 143
115 .name { 144 .name {
116 font-size: 30rpx; 145 font-size: 30rpx;
146
117 text { 147 text {
118 margin-left: 1em; 148 margin-left: 1em;
119 color: #4C5359; 149 color: #4C5359;
...@@ -129,9 +159,9 @@ ...@@ -129,9 +159,9 @@
129 color: #AD181F; 159 color: #AD181F;
130 } 160 }
131 } 161 }
132 } 162 }
133 163
134 .info { 164 .info {
135 display: flex; 165 display: flex;
136 margin: 30rpx 0 20rpx; 166 margin: 30rpx 0 20rpx;
137 font-size: 28rpx; 167 font-size: 28rpx;
...@@ -139,19 +169,20 @@ ...@@ -139,19 +169,20 @@
139 view { 169 view {
140 color: #7D8592; 170 color: #7D8592;
141 margin-right: 20rpx; 171 margin-right: 20rpx;
172
142 text { 173 text {
143 color: #AD181F; 174 color: #AD181F;
144 } 175 }
145 } 176 }
146 } 177 }
147 178
148 .h3-padding { 179 .h3-padding {
149 padding: 20rpx 30rpx 0; 180 padding: 20rpx 30rpx 0;
150 font-size: 30rpx; 181 font-size: 30rpx;
151 font-weight: 500; 182 font-weight: 500;
152 } 183 }
153 184
154 .stepItem { 185 .stepItem {
155 border-left: 2rpx solid #E60012; 186 border-left: 2rpx solid #E60012;
156 padding-left: 20rpx; 187 padding-left: 20rpx;
157 position: relative; 188 position: relative;
...@@ -190,5 +221,5 @@ ...@@ -190,5 +221,5 @@
190 color: #666; 221 color: #666;
191 } 222 }
192 } 223 }
193 } 224 }
194 </style> 225 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!