Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
45081927 by 杨炀
Options

+ loading

1 parent 6becca11
Inline Side-by-side
Showing 25 changed files with 820 additions and 715 deletions
group/apply/applyDetail.vue
...@@ -149,8 +149,12 @@ ...@@ -149,8 +149,12 @@
149 reason: reason || '', 149 reason: reason || '',
150 rangeIds: rangeIds 150 rangeIds: rangeIds
151 } 151 }
152 console.log(obj) 152 console.log(obj)
153 api.mobilizeAudit(obj).then((res) => { 153 uni.showLoading({
154 title: '加载中'
155 })
156 api.mobilizeAudit(obj).then((res) => {
157 uni.hideLoading()
154 uni.showToast({ 158 uni.showToast({
155 title: '操作成功', 159 title: '操作成功',
156 icon: 'none' 160 icon: 'none'
......
group/apply/applyList.vue
...@@ -157,7 +157,8 @@ ...@@ -157,7 +157,8 @@
157 157
158 function getList() { 158 function getList() {
159 uni.showLoading({ 159 uni.showLoading({
160 title: '加载中' 160 title: '加载中',
161 mask: true
161 }) 162 })
162 if (deptType.value == 2 || deptType.value == 3) { 163 if (deptType.value == 2 || deptType.value == 3) {
163 // 省 164 // 省
...@@ -223,8 +224,13 @@ ...@@ -223,8 +224,13 @@
223 recordIds: [] 224 recordIds: []
224 } 225 }
225 obj.recordIds.push(recordId) 226 obj.recordIds.push(recordId)
226 console.log(obj) 227 console.log(obj)
227 api.groupAudit(obj).then((res) => { 228 uni.showLoading({
229 title: '加载中',
230 mask: true
231 })
232 api.groupAudit(obj).then((res) => {
233 uni.hideLoading()
228 uni.showToast({ 234 uni.showToast({
229 title: '操作成功', 235 title: '操作成功',
230 icon: 'none' 236 icon: 'none'
......
group/apply/merge.vue
...@@ -93,15 +93,17 @@ ...@@ -93,15 +93,17 @@
93 }) 93 })
94 94
95 function init() { 95 function init() {
96 uni.showLoading({ 96
97 title: '加载中'
98 })
99 deptType.value = app.globalData.deptType 97 deptType.value = app.globalData.deptType
100 getList() 98 getList()
101 } 99 }
102 100
103 101
104 function getList() { 102 function getList() {
103 uni.showLoading({
104 title: '加载中',
105 mask: true
106 })
105 api.getGroupList(queryParams.value).then(response => { 107 api.getGroupList(queryParams.value).then(response => {
106 infoList.value = response.rows 108 infoList.value = response.rows
107 infoList.value.forEach(item => { 109 infoList.value.forEach(item => {
......
group/apply/mergeUp.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <view class="text-center whitebg"> 3 <view class="text-center whitebg">
4 <view class="cardNav"> 4 <view class="cardNav">
5 <view @click="goApply">审核</view> 5 <view @click="goApply">审核</view>
6 <view @click="goMerge">合并</view> 6 <view @click="goMerge">合并</view>
7 <view class="active">提交</view> 7 <view class="active">提交</view>
8 </view> 8 </view>
9 </view> 9 </view>
10 <!-- 团队会员审核 --> 10 <!-- 团队会员审核 -->
11 <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem" 11 <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem"
12 styleType="text" activeColor="#AD181F"></uni-segmented-control> 12 styleType="text" activeColor="#AD181F"></uni-segmented-control>
13 <view class="appList"> 13 <view class="appList">
14 <view class="appItem" v-for="(item,index) in list" :key="index"> 14 <view class="appItem" v-for="(item,index) in list" :key="index">
15 <view class="status" @click="goDetail(item)"> 15 <view class="status" @click="goDetail(item)">
16 <text v-if="item.status == 0" class="text-primary">审核中</text> 16 <text v-if="item.status == 0" class="text-primary">审核中</text>
17 <text v-if="item.status == 1" class="text-success">审核通过</text> 17 <text v-if="item.status == 1" class="text-success">审核通过</text>
18 <text v-if="item.status == 2" class="text-danger">审核拒绝</text> 18 <text v-if="item.status == 2" class="text-danger">审核拒绝</text>
19 <text v-if="item.status == 3" class="text-warning">审核撤回</text> 19 <text v-if="item.status == 3" class="text-warning">审核撤回</text>
20 </view> 20 </view>
21 <view class="date">提交日期：{{item.content.commitTime}}</view> 21 <view class="date">提交日期：{{item.content.commitTime}}</view>
22 <view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}</view> 22 <view class="date" v-if="item.content.validityTime">原有效期：{{item.content.validityTime?.slice(0,10)}}
23 <view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view> 23 </view>
24 <view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view> 24 <view class="text-primary" v-if="item.content?.wfCode">{{item.content?.wfCode}}</view>
25 <view class="flexbox" @click="goDetail(item)"> 25 <view class="name mt0" style="width: 100%;" @click="goDetail(item)">{{item.content?.certName}}</view>
26 <view> 26 <view class="flexbox" @click="goDetail(item)">
27 年限 27 <view>
28 <view>{{item.content.renewYear}}</view> 28 年限
29 </view> 29 <view>{{item.content.renewYear}}</view>
30 <view> 30 </view>
31 会员/新会员 31 <view>
32 <view>{{item.content.allCount}}/<text class="text-danger">{{item.content.newCount}}</text></view> 32 会员/新会员
33 </view> 33 <view>{{item.content.allCount}}/<text class="text-danger">{{item.content.newCount}}</text>
34 <view> 34 </view>
35 费用合计 35 </view>
36 <view> {{ (item?.content?.allFee*1).toFixed(2) }}</view> 36 <view>
37 </view> 37 费用合计
38 </view> 38 <view> {{ (item?.content?.allFee*1).toFixed(2) }}</view>
39 39 </view>
40 <view class="func" v-if="item.auditStatus == 100"> 40 </view>
41 <button @click="handleAudit(item)">提交</button> 41
42 <button v-if="item.lastIds?.slice(0, 1) != '-'" @click="resolution(item)">取消合并</button> 42 <view class="func" v-if="item.auditStatus == 100">
43 </view> 43 <button @click="handleAudit(item)">提交</button>
44 <view class="func" v-if="item.auditStatus == 1 && item.isView == 1"> 44 <button v-if="item.lastIds?.slice(0, 1) != '-'" @click="resolution(item)">取消合并</button>
45 <button @click="sendBack(item)">撤回</button> 45 </view>
46 </view> 46 <view class="func" v-if="item.auditStatus == 1 && item.isView == 1">
47 </view> 47 <button @click="sendBack(item)">撤回</button>
48 </view> 48 </view>
49 49 </view>
50 <view class="nodata" v-if="list.length==0"> 50 </view>
51 <image mode="aspectFit" src="/static/nodata.png"></image> 51
52 <text>暂无数据</text> 52 <view class="nodata" v-if="list.length==0">
53 </view> 53 <image mode="aspectFit" src="/static/nodata.png"></image>
54 </view> 54 <text>暂无数据</text>
55 </view>
56 </view>
55 </template> 57 </template>
56 58
57 <script setup> 59 <script setup>
58 import * as api from '@/common/api.js' 60 import * as api from '@/common/api.js'
59 import config from '@/config.js' 61 import config from '@/config.js'
60 import { 62 import {
61 onMounted, 63 onMounted,
62 ref 64 ref
63 } from 'vue' 65 } from 'vue'
64 import { 66 import {
65 onLoad 67 onLoad
66 } from '@dcloudio/uni-app' 68 } from '@dcloudio/uni-app'
67 const app = getApp(); 69 const app = getApp();
68 const queryParams = ref({ 70 const queryParams = ref({
69 // pageNum: 1, 71 // pageNum: 1,
70 // pageSize: 10 72 // pageSize: 10
71 mergeFlag: 100, 73 mergeFlag: 100,
72 statusFlag: '101' 74 statusFlag: '101'
73 }) 75 })
74 const navs = ref(['待提交','审核中', '审核通过', '审核拒绝', '已撤回']) 76 const navs = ref(['待提交', '审核中', '审核通过', '审核拒绝', '已撤回'])
75 const current = ref() 77 const current = ref()
76 const list = ref([]) 78 const list = ref([])
77 const total = ref(0) 79 const total = ref(0)
78 const deptType = ref('') 80 const deptType = ref('')
79 const userType = ref('') 81 const userType = ref('')
80 onLoad(() => { 82 onLoad(() => {
81 if (app.globalData.isLogin) { 83 if (app.globalData.isLogin) {
82 init() 84 init()
83 } else { 85 } else {
84 86
85 app.firstLoadCallback = () => { 87 app.firstLoadCallback = () => {
86 init() 88 init()
87 }; 89 };
88 } 90 }
89 }) 91 })
90 92
91 function init() { 93 function init() {
92 deptType.value = app.globalData.deptType 94 deptType.value = app.globalData.deptType
93 userType.value = app.globalData.userType 95 userType.value = app.globalData.userType
94 // console.log(userType.value) 96 // console.log(userType.value)
95 getList() 97 getList()
96 } 98 }
97 99
98 function onClickItem(e) { 100 function onClickItem(e) {
99 console.log(e) 101 console.log(e)
100 switch(e.currentIndex){ 102 switch (e.currentIndex) {
101 case 0: 103 case 0:
102 queryParams.value.statusFlag = 101 104 queryParams.value.statusFlag = 101
103 break; 105 break;
104 case 1: 106 case 1:
105 queryParams.value.statusFlag = 102 107 queryParams.value.statusFlag = 102
106 break; 108 break;
107 case 2: 109 case 2:
108 queryParams.value.statusFlag = 103 110 queryParams.value.statusFlag = 103
109 break; 111 break;
110 case 3: 112 case 3:
111 queryParams.value.statusFlag = 104 113 queryParams.value.statusFlag = 104
112 break; 114 break;
113 case 4: 115 case 4:
114 queryParams.value.statusFlag = 105 116 queryParams.value.statusFlag = 105
115 break; 117 break;
116 } 118 }
117 getList() 119 getList()
118 } 120 }
119 121
120 function getList() { 122 function getList() {
121 uni.showLoading({ 123 uni.showLoading({
122 title:'加载中' 124 title: '加载中',
123 }) 125 mask: true
124 if (queryParams.value.statusFlag == '') { 126 })
125 queryParams.value.mergeFlag = 100 127 if (queryParams.value.statusFlag == '') {
126 queryParams.value.status = null 128 queryParams.value.mergeFlag = 100
127 } 129 queryParams.value.status = null
128 if (queryParams.value.statusFlag == 101) { 130 }
129 queryParams.value.mergeFlag = 101 131 if (queryParams.value.statusFlag == 101) {
130 queryParams.value.status = null 132 queryParams.value.mergeFlag = 101
131 } 133 queryParams.value.status = null
132 if (queryParams.value.statusFlag == 102) { 134 }
133 queryParams.value.mergeFlag = 1 135 if (queryParams.value.statusFlag == 102) {
134 queryParams.value.status = 0 136 queryParams.value.mergeFlag = 1
135 } 137 queryParams.value.status = 0
136 if (queryParams.value.statusFlag == 103) { 138 }
137 queryParams.value.mergeFlag = 1 139 if (queryParams.value.statusFlag == 103) {
138 queryParams.value.status = 1 140 queryParams.value.mergeFlag = 1
139 } 141 queryParams.value.status = 1
140 if (queryParams.value.statusFlag == 104) { 142 }
141 queryParams.value.mergeFlag = 1 143 if (queryParams.value.statusFlag == 104) {
142 queryParams.value.status = 2 144 queryParams.value.mergeFlag = 1
143 } 145 queryParams.value.status = 2
144 if (queryParams.value.statusFlag == 105) { 146 }
145 queryParams.value.mergeFlag = 100 147 if (queryParams.value.statusFlag == 105) {
146 queryParams.value.status = 3 148 queryParams.value.mergeFlag = 100
147 } 149 queryParams.value.status = 3
148 api.getGroupList(queryParams.value).then(res => { 150 }
149 uni.hideLoading() 151 api.getGroupList(queryParams.value).then(res => {
150 list.value = res.rows 152 uni.hideLoading()
151 list.value.forEach(item => { 153 list.value = res.rows
152 item.con = item.content 154 list.value.forEach(item => {
153 item.content = JSON.parse(item.content) 155 item.con = item.content
154 }) 156 item.content = JSON.parse(item.content)
155 total.value = res.total 157 })
156 }) 158 total.value = res.total
157 } 159 })
158 160 }
159 function handleAudit(item){ 161
160 uni.showModal({ 162 function handleAudit(item) {
161 title: '提示', 163 uni.showModal({
162 content: `确定提交${item.content.certName}吗`, 164 title: '提示',
163 success: function(res) { 165 content: `确定提交${item.content.certName}吗`,
164 if (res.confirm) { 166 success: function(res) {
165 api.groupAudit({ 167 if (res.confirm) {
166 flag: '1', 168 api.groupAudit({
167 recordIds: [item.recordId], 169 flag: '1',
168 reason: null 170 recordIds: [item.recordId],
169 }).then(res=>{ 171 reason: null
170 getList() 172 }).then(res => {
171 uni.showToast({ 173 getList()
172 title:`操作成功!` 174 uni.showToast({
173 }) 175 title: `操作成功!`
174 }) 176 })
175 } 177 })
176 } 178 }
177 }) 179 }
178 } 180 })
179 181 }
180 function goDetail(item) { 182
181 const form = encodeURIComponent(JSON.stringify(item)) 183 function goDetail(item) {
182 // 查看 184 const form = encodeURIComponent(JSON.stringify(item))
183 let path = `/group/apply/mergeUpDetail?&form=${form}` 185 // 查看
184 uni.navigateTo({ 186 let path = `/group/apply/mergeUpDetail?&form=${form}`
185 url: path 187 uni.navigateTo({
186 }); 188 url: path
187 } 189 });
188 function goMerge(){ 190 }
189 let path = `/group/apply/merge` 191
190 uni.redirectTo({ 192 function goMerge() {
191 url: path 193 let path = `/group/apply/merge`
192 }); 194 uni.redirectTo({
193 } 195 url: path
194 function goApply(){ 196 });
195 let path = `/group/apply/applyList` 197 }
196 uni.redirectTo({ 198
197 url: path 199 function goApply() {
198 }); 200 let path = `/group/apply/applyList`
199 } 201 uni.redirectTo({
200 function sendBack(row){ 202 url: path
201 uni.showModal({ 203 });
202 title: '提示', 204 }
203 content: `确定撤回${row.content.certName}吗`, 205
204 success: function(res) { 206 function sendBack(row) {
205 if (res.confirm) { 207 uni.showModal({
206 api.certifiedwithDraw({ 208 title: '提示',
207 recordId: row.recordId, 209 content: `确定撤回${row.content.certName}吗`,
208 reason: row.reason 210 success: function(res) {
209 }).then(res => { 211 if (res.confirm) {
210 uni.showToast({ 212 api.certifiedwithDraw({
211 title: '操作成功', 213 recordId: row.recordId,
212 icon: 'none' 214 reason: row.reason
213 }) 215 }).then(res => {
214 getList() 216 uni.showToast({
215 }) 217 title: '操作成功',
216 218 icon: 'none'
217 } 219 })
218 } 220 getList()
219 }) 221 })
220 } 222
221 function resolution(row){ 223 }
222 uni.showModal({ 224 }
223 title: '提示', 225 })
224 content: `确定拆分${row.content.certName}吗`, 226 }
225 success: function(res) { 227
226 if (res.confirm) { 228 function resolution(row) {
227 api.certifiedunMerge(row.recordId).then(res => { 229 uni.showModal({
228 uni.showToast({ 230 title: '提示',
229 title: '已拆分', 231 content: `确定拆分${row.content.certName}吗`,
230 icon: 'none' 232 success: function(res) {
231 }) 233 if (res.confirm) {
232 getList() 234 api.certifiedunMerge(row.recordId).then(res => {
233 }) 235 uni.showToast({
234 236 title: '已拆分',
235 } 237 icon: 'none'
236 } 238 })
237 }) 239 getList()
238 } 240 })
241
242 }
243 }
244 })
245 }
239 </script> 246 </script>
240 247
241 <style scoped> 248 <style scoped>
242 .mt0{margin-top: 0!important;} 249 .mt0 {
243 .appList .appItem .name{width: 80%;word-break: break-all;} 250 margin-top: 0 !important;
251 }
252
253 .appList .appItem .name {
254 width: 80%;
255 word-break: break-all;
256 }
244 </style> 257 </style>
...\ No newline at end of file ...\ No newline at end of file
......
group/apply/mergeUpDetail.vue
...@@ -217,8 +217,12 @@ ...@@ -217,8 +217,12 @@
217 reason: reason || '', 217 reason: reason || '',
218 rangeIds: rangeIds 218 rangeIds: rangeIds
219 } 219 }
220 console.log(obj) 220 console.log(obj)
221 api.mobilizeAudit(obj).then((res) => { 221 uni.showLoading({
222 title: '加载中'
223 })
224 api.mobilizeAudit(obj).then((res) => {
225 uni.hideLoading()
222 uni.showToast({ 226 uni.showToast({
223 title: '操作成功', 227 title: '操作成功',
224 icon: 'none' 228 icon: 'none'
......
group/changeGroupAudit.vue
...@@ -152,8 +152,12 @@ ...@@ -152,8 +152,12 @@
152 reason: reason || '', 152 reason: reason || '',
153 ids: [id] 153 ids: [id]
154 } 154 }
155 console.log(obj) 155 console.log(obj)
156 api.groupChangeAudit(obj).then((res) => { 156 uni.showLoading({
157 title: '加载中'
158 })
159 api.groupChangeAudit(obj).then((res) => {
160 uni.hideLoading()
157 uni.showToast({ 161 uni.showToast({
158 title: '操作成功', 162 title: '操作成功',
159 icon: 'none' 163 icon: 'none'
......
group/changeGroupChoseList.vue
1 <template> 1 <template>
2 <view class="hasfixedbottom"> 2 <view class="hasfixedbottom">
3 3
4 <view class="searchbar"> 4 <view class="searchbar">
5 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search" 5 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
6 v-model="query.name" placeholder="搜索团体会员名称" @blur="getSonList" @clear="getSonList"> 6 v-model="query.name" placeholder="搜索团体会员名称" @blur="getSonList" @clear="getSonList">
7 </uni-easyinput> 7 </uni-easyinput>
8 <view class="invertedbtn-red" @click="getSonList">搜索</view> 8 <view class="invertedbtn-red" @click="getSonList">搜索</view>
9 </view> 9 </view>
10 <view class="userlist"> 10 <view class="userlist">
11 <view class="item" v-for=" (n,index) in studentList" :key="index"> 11 <view class="item" v-for=" (n,index) in studentList" :key="index">
12 <view @click="checkThis(n)"> 12 <view @click="checkThis(n)">
13 <image class="icon" v-if="n.checked" 13 <image class="icon" v-if="n.checked" :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
14 :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" /> 14 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
15 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 15 </view>
16 </view> 16 <view class="w100">
17 <view class="w100"> 17 <view class="name">{{n.name}} <text v-if="n.memCode">({{n.memCode}})</text></view>
18 <view class="name">{{n.name}} <text v-if="n.memCode">({{n.memCode}})</text></view> 18 <view class="flexbox" style="padding: 0">
19 <view class="flexbox" style="padding: 0"> 19 <view class="date">到期时间
20 <view class="date">到期时间 20 <text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text>
21 <text v-if="n.validityDate">{{n.validityDate?.slice(0,10)}}</text> 21 <text v-else>--</text>
22 <text v-else>--</text> 22 </view>
23 </view> 23 <view class="date w50">团体类型
24 <view class="date w50">团体类型 24 <text v-if="n.deptType == 2">一级协会</text>
25 <text v-if="n.deptType == 2">一级协会</text> 25 <text v-if="n.deptType == 3">直属协会</text>
26 <text v-if="n.deptType == 3">直属协会</text> 26 <text v-if="n.deptType == 4">二级协会</text>
27 <text v-if="n.deptType == 4">二级协会</text> 27 <text v-if="n.deptType == 5">三级协会</text>
28 <text v-if="n.deptType == 5">三级协会</text> 28 <text v-if="n.deptType == 6">职业性团体会员</text>
29 <text v-if="n.deptType == 6">职业性团体会员</text> 29 </view>
30 </view> 30 </view>
31 </view> 31 </view>
32 </view> 32 </view>
33 </view> 33 <view class="nodata" v-if="studentList.length==0">
34 <view class="nodata" v-if="studentList.length==0"> 34 <image mode="aspectFit" src="/static/nodata.png"></image>
35 <image mode="aspectFit" src="/static/nodata.png"></image> 35 <text>无可变更会员</text>
36 <text>无可变更会员</text> 36 </view>
37 </view> 37 </view>
38 </view> 38 <uni-load-more @clickLoadMore="clickLoadMore" :contentText="contentText" :status="status"></uni-load-more>
39 <uni-load-more @clickLoadMore="clickLoadMore" :contentText="contentText" :status="status"></uni-load-more> 39
40 40 <view class="fixedBottom" v-if="studentList.length!=0">
41 <view class="fixedBottom" v-if="studentList.length!=0"> 41 <button class="btn-red" @click="handleImport">批量添加</button>
42 <button class="btn-red" @click="handleImport">批量添加</button> 42 </view>
43 </view> 43 </view>
44 </view>
45 </template> 44 </template>
46 45
47 <script setup> 46 <script setup>
48 import { 47 import {
49 ref 48 ref
50 } from 'vue' 49 } from 'vue'
51 import { 50 import {
52 onLoad, 51 onLoad,
53 onShow 52 onShow
54 } from '@dcloudio/uni-app' 53 } from '@dcloudio/uni-app'
55 import * as api from '@/common/api.js' 54 import * as api from '@/common/api.js'
56 import _ from 'lodash' 55 import _ from 'lodash'
57 import config from '/config.js' 56 import config from '/config.js'
58 const query = ref({ 57 const query = ref({
59 pageNum:1, 58 pageNum: 1,
60 pageSize:10, 59 pageSize: 10,
61 paymentRangeId:-1, 60 paymentRangeId: -1,
62 }) 61 })
63 const total = ref(0) 62 const total = ref(0)
64 const list = ref([]) 63 const list = ref([])
65 const studentList = ref([]) 64 const studentList = ref([])
66 const type = ref('') 65 const type = ref('')
67 const form = ref({}) 66 const form = ref({})
68 const status = ref('no-more') 67 const status = ref('no-more')
69 const contentText = ref({contentdown: "点击加载更多",contentrefresh: "正在加载...",contentnomore: "没有更多数据了"}) 68 const contentText = ref({
70 69 contentdown: "点击加载更多",
71 onLoad((option) => { 70 contentrefresh: "正在加载...",
72 if (option.rangeId) { 71 contentnomore: "没有更多数据了"
73 query.value.paymentRangeId = option.rangeId 72 })
74 } 73
75 getList() 74 onLoad((option) => {
76 }) 75 if (option.rangeId) {
77 onShow(() => {}) 76 query.value.paymentRangeId = option.rangeId
78 77 }
79 function clickLoadMore(){ 78 getList()
80 getList() 79 })
81 } 80 onShow(() => {})
82 function getList() { 81
83 if(total.value>0&&total.value>studentList.value.length){ 82 function clickLoadMore() {
84 uni.showLoading({ 83 getList()
85 title: '加载中',
86 icon: 'none'
87 })
88 status.value = 'loading'
89 query.value.pageNum += 1
90 api.getMySonList(query.value).then(res => {
91 studentList.value = _.concat(studentList.value,res.data.rows)
92 total.value = res.data.total
93 if(total.value>studentList.value.length){
94 status.value = 'more'
95 } else {
96 status.value = 'no-more'
97 }
98 uni.hideLoading()
99 })
100 }else if(total.value==0){
101 getSonList()
102 } 84 }
103 }
104 function getSonList(){
105 query.value.pageNum = 1
106 api.getMySonList(query.value).then(res => {
107 studentList.value = res.data.rows
108 total.value = res.data.total
109 if(total.value>studentList.value.length){
110 status.value = 'more'
111 } else {
112 status.value = 'no-more'
113 }
114 })
115 }
116
117 function checkThis(n) {
118 if (n.checked) {
119 n.checked = false
120 } else {
121 n.checked = true
122 }
123 }
124
125 function handleImport() {
126 var arr = []
127 for (var n of studentList.value) {
128 if (n.checked) {
129 arr.push(n.memId)
130 }
131 }
132 api.addGroupInfoModeToRange({
133 memId: arr,
134 rangeIdStr: query.value.paymentRangeId
135 }).then(res => {
136 var pages = getCurrentPages()
137 var prevPage = pages[pages.length - 2]
138 prevPage.onShow(res.data)
139 uni.navigateBack()
140 })
141 }
142 85
86 function getList() {
87 if (total.value > 0 && total.value > studentList.value.length) {
88 uni.showLoading({
89 title: '加载中',
90 mask: true
91 })
92 status.value = 'loading'
93 query.value.pageNum += 1
94 api.getMySonList(query.value).then(res => {
95 studentList.value = _.concat(studentList.value, res.data.rows)
96 total.value = res.data.total
97 if (total.value > studentList.value.length) {
98 status.value = 'more'
99 } else {
100 status.value = 'no-more'
101 }
102 uni.hideLoading()
103 })
104 } else if (total.value == 0) {
105 getSonList()
106 }
107 }
108
109 function getSonList() {
110 query.value.pageNum = 1
111 api.getMySonList(query.value).then(res => {
112 studentList.value = res.data.rows
113 total.value = res.data.total
114 if (total.value > studentList.value.length) {
115 status.value = 'more'
116 } else {
117 status.value = 'no-more'
118 }
119 })
120 }
121
122 function checkThis(n) {
123 if (n.checked) {
124 n.checked = false
125 } else {
126 n.checked = true
127 }
128 }
129
130 function handleImport() {
131 var arr = []
132 for (var n of studentList.value) {
133 if (n.checked) {
134 arr.push(n.memId)
135 }
136 }
137 api.addGroupInfoModeToRange({
138 memId: arr,
139 rangeIdStr: query.value.paymentRangeId
140 }).then(res => {
141 var pages = getCurrentPages()
142 var prevPage = pages[pages.length - 2]
143 prevPage.onShow(res.data)
144 uni.navigateBack()
145 })
146 }
143 </script> 147 </script>
144 <style scoped lang="scss"> 148 <style scoped lang="scss">
145 .searchbar { 149 .searchbar {
146 display: flex; 150 display: flex;
147 align-items: center; 151 align-items: center;
148 padding:25rpx; 152 padding: 25rpx;
149 box-sizing: border-box; 153 box-sizing: border-box;
150 154
151 :deep(.uni-easyinput .uni-easyinput__content) { 155 :deep(.uni-easyinput .uni-easyinput__content) {
152 border-radius: 35rpx; 156 border-radius: 35rpx;
153 height: 66rpx; border: 1px solid #AD181F!important; 157 height: 66rpx;
154 } 158 border: 1px solid #AD181F !important;
155 159 }
156 :deep(.uni-easyinput__content-input) { 160
157 font-size: 26rpx; 161 :deep(.uni-easyinput__content-input) {
158 } 162 font-size: 26rpx;
159 163 }
160 .invertedbtn-red { 164
161 border-radius: 50px; margin-left: 20rpx; 165 .invertedbtn-red {
162 background-color: #fff; 166 border-radius: 50px;
163 167 margin-left: 20rpx;
164 font-size: 30rpx; 168 background-color: #fff;
165 padding: 10rpx 20rpx; 169
166 } 170 font-size: 30rpx;
167 } 171 padding: 10rpx 20rpx;
168 .userlist {padding: 0 25rpx;} 172 }
173 }
174
175 .userlist {
176 padding: 0 25rpx;
177 }
178
169 .flexbox { 179 .flexbox {
170 padding: 30rpx 30rpx 0 180 padding: 30rpx 30rpx 0
171 } 181 }
...@@ -202,6 +212,9 @@ function handleImport() { ...@@ -202,6 +212,9 @@ function handleImport() {
202 .text-center .btn-red-kx { 212 .text-center .btn-red-kx {
203 border-radius: 50px; 213 border-radius: 50px;
204 font-size: 28rpx; 214 font-size: 28rpx;
205 } 215 }
206 :deep(.file-picker__progress){opacity: 0;} 216
217 :deep(.file-picker__progress) {
218 opacity: 0;
219 }
207 </style> 220 </style>
...\ No newline at end of file ...\ No newline at end of file
......
level/apply.vue
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
90 90
91 function init() { 91 function init() {
92 uni.showLoading({ 92 uni.showLoading({
93 title: '加载中' 93 title: '加载中',
94 mask: true
94 }) 95 })
95 deptType.value = app.globalData.deptType 96 deptType.value = app.globalData.deptType
96 userType.value = app.globalData.userType 97 userType.value = app.globalData.userType
......
level/approval.vue
...@@ -98,9 +98,6 @@ ...@@ -98,9 +98,6 @@
98 }) 98 })
99 99
100 function init() { 100 function init() {
101 uni.showLoading({
102 title: '加载中'
103 })
104 deptType.value = app.globalData.deptType 101 deptType.value = app.globalData.deptType
105 userType.value = app.globalData.userType 102 userType.value = app.globalData.userType
106 getList() 103 getList()
...@@ -108,6 +105,10 @@ ...@@ -108,6 +105,10 @@
108 105
109 106
110 function getList() { 107 function getList() {
108 uni.showLoading({
109 title: '加载中',
110 mask: true
111 })
111 api.getVerityList(queryParams.value).then(res => { 112 api.getVerityList(queryParams.value).then(res => {
112 uni.hideLoading() 113 uni.hideLoading()
113 const list = [] 114 const list = []
...@@ -131,9 +132,6 @@ ...@@ -131,9 +132,6 @@
131 132
132 function onClickItem(e) { 133 function onClickItem(e) {
133 console.log(e) 134 console.log(e)
134 uni.showLoading({
135 title: '加载中'
136 })
137 queryParams.value.status = e.currentIndex 135 queryParams.value.status = e.currentIndex
138 getList() 136 getList()
139 } 137 }
......
level/ztx/approval.vue
...@@ -111,7 +111,8 @@ ...@@ -111,7 +111,8 @@
111 111
112 function getList() { 112 function getList() {
113 uni.showLoading({ 113 uni.showLoading({
114 title: '加载中' 114 title: '加载中',
115 mask: true
115 }) 116 })
116 totalCost.value = 0 117 totalCost.value = 0
117 api.getVerityMergeList(queryParams.value).then(response => { 118 api.getVerityMergeList(queryParams.value).then(response => {
...@@ -138,9 +139,6 @@ ...@@ -138,9 +139,6 @@
138 139
139 function onClickItem(e) { 140 function onClickItem(e) {
140 console.log(e) 141 console.log(e)
141 uni.showLoading({
142 title: '加载中'
143 })
144 queryParams.value.status = e.currentIndex 142 queryParams.value.status = e.currentIndex
145 getList() 143 getList()
146 } 144 }
...@@ -198,7 +196,11 @@ ...@@ -198,7 +196,11 @@
198 196
199 function doApproval(obj) { 197 function doApproval(obj) {
200 console.log(obj) 198 console.log(obj)
199 uni.showLoading({
200 title: '加载中'
201 })
201 api.doMergeFlows(obj).then((res) => { 202 api.doMergeFlows(obj).then((res) => {
203 uni.hideLoading()
202 uni.showToast({ 204 uni.showToast({
203 title: '操作成功', 205 title: '操作成功',
204 icon: 'none' 206 icon: 'none'
......
pages/exam/score.vue
...@@ -95,22 +95,20 @@ ...@@ -95,22 +95,20 @@
95 }) 95 })
96 96
97 function init() { 97 function init() {
98 uni.showLoading({
99 title: '加载中'
100 })
101 deptType.value = app.globalData.deptType 98 deptType.value = app.globalData.deptType
102 getList() 99 getList()
103 } 100 }
104 101
105 function onClickItem(e) { 102 function onClickItem(e) {
106 uni.showLoading({
107 title: '加载中'
108 })
109 queryParams.value.status = e.currentIndex 103 queryParams.value.status = e.currentIndex
110 getList() 104 getList()
111 } 105 }
112 106
113 function getList() { 107 function getList() {
108 uni.showLoading({
109 title: '加载中',
110 mask: true
111 })
114 examApi.getRankScoreList(queryParams.value).then(res => { 112 examApi.getRankScoreList(queryParams.value).then(res => {
115 113
116 infoList.value = res.rows 114 infoList.value = res.rows
...@@ -162,8 +160,12 @@ ...@@ -162,8 +160,12 @@
162 } 160 }
163 } 161 }
164 162
165 function doApproval(obj) { 163 function doApproval(obj) {
166 examApi.doMergeFlows(obj).then((res) => { 164 uni.showLoading({
165 title: '加载中'
166 })
167 examApi.doMergeFlows(obj).then((res) => {
168 uni.hideLoading()
167 uni.showToast({ 169 uni.showToast({
168 title: '操作成功', 170 title: '操作成功',
169 icon: 'none' 171 icon: 'none'
......
pages/rank/approval.vue
...@@ -81,22 +81,20 @@ onShow(() => { ...@@ -81,22 +81,20 @@ onShow(() => {
81 }) 81 })
82 82
83 function init(){ 83 function init(){
84 uni.showLoading({
85 title: '加载中'
86 })
87 deptType.value = app.globalData.deptType 84 deptType.value = app.globalData.deptType
88 getList() 85 getList()
89 } 86 }
90 87
91 function onClickItem(e) { 88 function onClickItem(e) {
92 uni.showLoading({
93 title: '加载中'
94 })
95 queryParams.value.status = e.currentIndex 89 queryParams.value.status = e.currentIndex
96 getList() 90 getList()
97 } 91 }
98 92
99 function getList() { 93 function getList() {
94 uni.showLoading({
95 title: '加载中',
96 mask: true
97 })
100 examApi.getVerityList(queryParams.value).then(res => { 98 examApi.getVerityList(queryParams.value).then(res => {
101 uni.hideLoading() 99 uni.hideLoading()
102 const list = [] 100 const list = []
...@@ -165,7 +163,11 @@ function audit(item, flag) { ...@@ -165,7 +163,11 @@ function audit(item, flag) {
165 } 163 }
166 164
167 function doApproval(obj) { 165 function doApproval(obj) {
166 uni.showLoading({
167 title: '加载中'
168 })
168 examApi.doMergeFlows(obj).then((res) => { 169 examApi.doMergeFlows(obj).then((res) => {
170 uni.hideLoading()
169 uni.showToast({ 171 uni.showToast({
170 title: '操作成功', 172 title: '操作成功',
171 icon: 'none' 173 icon: 'none'
......
pages/rank/cert.vue
...@@ -77,22 +77,20 @@ onShow(() => { ...@@ -77,22 +77,20 @@ onShow(() => {
77 }) 77 })
78 78
79 function init(){ 79 function init(){
80 uni.showLoading({
81 title: '加载中'
82 })
83 deptType.value = app.globalData.deptType 80 deptType.value = app.globalData.deptType
84 getList() 81 getList()
85 } 82 }
86 83
87 function onClickItem(e) { 84 function onClickItem(e) {
88 uni.showLoading({
89 title: '加载中'
90 })
91 queryParams.value.certStatus = e.currentIndex 85 queryParams.value.certStatus = e.currentIndex
92 getList() 86 getList()
93 } 87 }
94 88
95 function getList() { 89 function getList() {
90 uni.showLoading({
91 title: '加载中',
92 mask: true
93 })
96 examApi.certsLList(queryParams.value).then(res => { 94 examApi.certsLList(queryParams.value).then(res => {
97 uni.hideLoading() 95 uni.hideLoading()
98 infoList.value = res.rows 96 infoList.value = res.rows
......
pages/rank/scoreApproval.vue
...@@ -185,8 +185,13 @@ ...@@ -185,8 +185,13 @@
185 } 185 }
186 } 186 }
187 187
188 function doApproval(obj) { 188 function doApproval(obj) {
189 examApi.doMergeFlows(obj).then((res) => { 189 uni.showLoading({
190 title: '加载中',
191 mask: true
192 })
193 examApi.doMergeFlows(obj).then((res) => {
194 uni.hideLoading()
190 uni.showToast({ 195 uni.showToast({
191 title: '操作成功', 196 title: '操作成功',
192 icon: 'none' 197 icon: 'none'
......
personalVip/audit.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <view class="text-center whitebg" v-if="userType=='2'"> 3 <view class="text-center whitebg" v-if="userType=='2'">
4 <view class="cardNav" v-if="userType=='2'"> 4 <view class="cardNav" v-if="userType=='2'">
5 <view class="active">审核</view> 5 <view class="active">审核</view>
6 <view @click="goMerge">合并</view> 6 <view @click="goMerge">合并</view>
7 <view @click="goMergeUp">提交</view> 7 <view @click="goMergeUp">提交</view>
8 </view> 8 </view>
9 </view> 9 </view>
10 <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem" 10 <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem"
11 styleType="text" activeColor="#AD181F"></uni-segmented-control> 11 styleType="text" activeColor="#AD181F"></uni-segmented-control>
12 12
13 <!-- 缴费审核 --> 13 <!-- 缴费审核 -->
14 <view v-if="total>0" class="vipData" style="flex-wrap: wrap;"> 14 <view v-if="total>0" class="vipData" style="flex-wrap: wrap;">
15 <view class="w50">人数合计 <text>{{ statistical.personCount }} 人</text></view> 15 <view class="w50">人数合计 <text>{{ statistical.personCount }} 人</text></view>
16 <view class="w50">新会员合计 <text>{{ statistical.newPersonCount }} 人</text></view> 16 <view class="w50">新会员合计 <text>{{ statistical.newPersonCount }} 人</text></view>
17 <view class="w50">续费合计 <text>{{ statistical.oldPersonCount }} 人</text></view> 17 <view class="w50">续费合计 <text>{{ statistical.oldPersonCount }} 人</text></view>
18 <view class="w50">年限合计 <text>{{ statistical.totalYear }} 年</text></view> 18 <view class="w50">年限合计 <text>{{ statistical.totalYear }} 年</text></view>
19 </view> 19 </view>
20 <view class="appList"> 20 <view class="appList">
21 <view class="appItem" v-for="(item,index) in list" :key="index"> 21 <view class="appItem" v-for="(item,index) in list" :key="index">
22 <view class="status" @click="goDetail(item)"> 22 <view class="status" @click="goDetail(item)">
23 <text v-if="item.auditStatus==0" class="text-primary">审核中</text> 23 <text v-if="item.auditStatus==0" class="text-primary">审核中</text>
24 <text v-if="item.auditStatus==1" class="text-success"> 审核通过</text> 24 <text v-if="item.auditStatus==1" class="text-success"> 审核通过</text>
25 <text v-if="item.auditStatus==2" class="text-danger"> 审核拒绝</text> 25 <text v-if="item.auditStatus==2" class="text-danger"> 审核拒绝</text>
26 <text v-if="item.auditStatus==3" class="text-warning">已撤回</text> 26 <text v-if="item.auditStatus==3" class="text-warning">已撤回</text>
27 </view> 27 </view>
28 <view class="date" @click="goDetail(item)"> 28 <view class="date" @click="goDetail(item)">
29 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons> 29 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
30 {{item.content.commitTime}} 提交 30 {{item.content.commitTime}} 提交
31 </view> 31 </view>
32 <view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}}</view> 32 <view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}}
33 <view class="name" @click="goDetail(item)">{{item.content.name}}</view> 33 </view>
34 <view class="flexbox" @click="goDetail(item)"> 34 <view class="name" @click="goDetail(item)">{{item.content.name}}</view>
35 <view> 35 <view class="flexbox" @click="goDetail(item)">
36 人数合计 36 <view>
37 <view>{{item.content.personCount}}</view> 37 人数合计
38 </view> 38 <view>{{item.content.personCount}}</view>
39 <view> 39 </view>
40 年限合计 40 <view>
41 <view>{{item.content.totalYear}}</view> 41 年限合计
42 </view> 42 <view>{{item.content.totalYear}}</view>
43 <view> 43 </view>
44 提交单位 44 <view>
45 <view>{{item.content.memberName}}</view> 45 提交单位
46 </view> 46 <view>{{item.content.memberName}}</view>
47 </view> 47 </view>
48 <view class="func" v-if="item.auditStatus==0"> 48 </view>
49 <button @click="audit(item.recordId,'0')">拒绝</button> 49 <view class="func" v-if="item.auditStatus==0">
50 <button @click="audit(item.recordId,'1')">同意</button> 50 <button @click="audit(item.recordId,'0')">拒绝</button>
51 </view> 51 <button @click="audit(item.recordId,'1')">同意</button>
52 <view class="func" v-if="item.auditStatus==1 && item.isView == 1"> 52 </view>
53 <button @click="handleDelete(item)">撤回</button> 53 <view class="func" v-if="item.auditStatus==1 && item.isView == 1">
54 </view> 54 <button @click="handleDelete(item)">撤回</button>
55 </view> 55 </view>
56 </view> 56 </view>
57 57 </view>
58 58
59 59
60 <view class="nodata" v-if="list.length==0"> 60
61 <image mode="aspectFit" src="/static/nodata.png"></image> 61 <view class="nodata" v-if="list.length==0">
62 <text>暂无数据</text> 62 <image mode="aspectFit" src="/static/nodata.png"></image>
63 </view> 63 <text>暂无数据</text>
64 <!-- <view v-if="userType=='2'" class="block-btn-box"> 64 </view>
65 <button @click="goMerge" class="btn-red-kx">前往合并 > </button> 65 <!-- <view v-if="userType=='2'" class="block-btn-box">
66 </view> --> 66 <button @click="goMerge" class="btn-red-kx">前往合并 > </button>
67 </view> 67 </view> -->
68 </template> 68 </view>
69 69 </template>
70 <script setup> 70
71 import * as api from '@/common/api.js' 71 <script setup>
72 import config from '@/config.js' 72 import * as api from '@/common/api.js'
73 import { 73 import config from '@/config.js'
74 onMounted, 74 import {
75 ref 75 onMounted,
76 } from 'vue' 76 ref
77 import { 77 } from 'vue'
78 onShow 78 import {
79 } from '@dcloudio/uni-app' 79 onShow
80 const app = getApp(); 80 } from '@dcloudio/uni-app'
81 const queryParams = ref({ 81 const app = getApp();
82 // pageNum: 1, 82 const queryParams = ref({
83 // pageSize: 10 83 // pageNum: 1,
84 auditStatus: '0' 84 // pageSize: 10
85 }) 85 auditStatus: '0'
86 const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回']) 86 })
87 const current = ref(0) 87 const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回'])
88 const list = ref([]) 88 const current = ref(0)
89 const statistical = ref({}) 89 const list = ref([])
90 const total = ref(0) 90 const statistical = ref({})
91 const deptType = ref('') 91 const total = ref(0)
92 const userType = ref('') 92 const deptType = ref('')
93 onShow(() => { 93 const userType = ref('')
94 if (app.globalData.isLogin) { 94 onShow(() => {
95 init() 95 if (app.globalData.isLogin) {
96 } else { 96 init()
97 app.firstLoadCallback = () => { 97 } else {
98 init() 98 app.firstLoadCallback = () => {
99 }; 99 init()
100 } 100 };
101 }) 101 }
102 102 })
103 function init() { 103
104 userType.value = app.globalData.userType 104 function init() {
105 deptType.value = app.globalData.deptType 105 userType.value = app.globalData.userType
106 getList() 106 deptType.value = app.globalData.deptType
107 } 107 getList()
108 108 }
109 function onClickItem(e) { 109
110 console.log(e) 110 function onClickItem(e) {
111 queryParams.value.auditStatus = e.currentIndex 111 console.log(e)
112 getList() 112 queryParams.value.auditStatus = e.currentIndex
113 } 113 getList()
114 114 }
115 function getList() { 115
116 uni.showLoading({ 116 function getList() {
117 title: `加载中` 117 uni.showLoading({
118 }) 118 title: `加载中`,
119 statistical.value = { 119 mask: true
120 personCount: 0, 120 })
121 newPersonCount: 0, 121 statistical.value = {
122 oldPersonCount: 0, 122 personCount: 0,
123 totalYear: 0 123 newPersonCount: 0,
124 } 124 oldPersonCount: 0,
125 if (deptType.value == 2 || deptType.value == 3) { 125 totalYear: 0
126 queryParams.value.mergeFlag = 0 126 }
127 } 127 if (deptType.value == 2 || deptType.value == 3) {
128 api.getVerifyList(queryParams.value).then(res => { 128 queryParams.value.mergeFlag = 0
129 list.value = res.rows 129 }
130 list.value.forEach(item => { 130 api.getVerifyList(queryParams.value).then(res => {
131 item.content = JSON.parse(item.content) 131 list.value = res.rows
132 statistical.value.personCount += (item.content.personCount * 1) 132 list.value.forEach(item => {
133 statistical.value.newPersonCount += (item.content.newPersonCount * 1) 133 item.content = JSON.parse(item.content)
134 statistical.value.oldPersonCount += (item.content.oldPersonCount * 1) 134 statistical.value.personCount += (item.content.personCount * 1)
135 statistical.value.totalYear += (item.content.totalYear * 1) 135 statistical.value.newPersonCount += (item.content.newPersonCount * 1)
136 136 statistical.value.oldPersonCount += (item.content.oldPersonCount * 1)
137 }) 137 statistical.value.totalYear += (item.content.totalYear * 1)
138 total.value = res.total 138
139 uni.hideLoading() 139 })
140 }) 140 total.value = res.total
141 } 141 uni.hideLoading()
142 function handleDelete(row){ 142 })
143 uni.showModal({ 143 }
144 title: '提示', 144
145 content: `确定撤回 ${row.content.name}？`, 145 function handleDelete(row) {
146 success: function(res) { 146 uni.showModal({
147 if (res.confirm) { 147 title: '提示',
148 api.withDraw({recordId: row.recordId, reason: row.reason}).then(res=>{ 148 content: `确定撤回 ${row.content.name}？`,
149 uni.showToast({ 149 success: function(res) {
150 title:`操作成功` 150 if (res.confirm) {
151 }) 151 api.withDraw({
152 getList() 152 recordId: row.recordId,
153 }) 153 reason: row.reason
154 } 154 }).then(res => {
155 } 155 uni.showToast({
156 }) 156 title: `操作成功`
157 } 157 })
158 function audit(recordId, flag) { 158 getList()
159 if (flag == '0') { 159 })
160 // 拒绝 160 }
161 // 弹出框填写理由 161 }
162 uni.showModal({ 162 })
163 title: '请输入拒绝理由', 163 }
164 editable: true, 164
165 success: function(res) { 165 function audit(recordId, flag) {
166 if (res.confirm) { 166 if (flag == '0') {
167 if (!res.content) { 167 // 拒绝
168 uni.showToast({ 168 // 弹出框填写理由
169 title: '请输入拒绝理由', 169 uni.showModal({
170 icon: 'none' 170 title: '请输入拒绝理由',
171 }) 171 editable: true,
172 } else { 172 success: function(res) {
173 doApproval(recordId, flag, res.content) 173 if (res.confirm) {
174 } 174 if (!res.content) {
175 } 175 uni.showToast({
176 } 176 title: '请输入拒绝理由',
177 }) 177 icon: 'none'
178 } else if (flag == '1') { 178 })
179 // 二次确认 179 } else {
180 uni.showModal({ 180 doApproval(recordId, flag, res.content)
181 title: '提示', 181 }
182 content: `确定审批通过吗`, 182 }
183 success: function(res) { 183 }
184 if (res.confirm) { 184 })
185 doApproval(recordId, flag) 185 } else if (flag == '1') {
186 } 186 // 二次确认
187 } 187 uni.showModal({
188 }) 188 title: '提示',
189 } 189 content: `确定审批通过吗`,
190 } 190 success: function(res) {
191 191 if (res.confirm) {
192 function doApproval(recordId, flag, reason) { 192 doApproval(recordId, flag)
193 var obj = { 193 }
194 flag: flag, 194 }
195 reason: reason || '', 195 })
196 recordIds: [] 196 }
197 } 197 }
198 obj.recordIds.push(recordId) 198
199 console.log(obj) 199 function doApproval(recordId, flag, reason) {
200 api.audit(obj).then((res) => { 200 var obj = {
201 uni.showToast({ 201 flag: flag,
202 title: '操作成功', 202 reason: reason || '',
203 icon: 'none' 203 recordIds: []
204 }) 204 }
205 getList() 205 obj.recordIds.push(recordId)
206 }) 206 console.log(obj)
207 } 207 uni.showLoading({
208 208 title: '加载中',
209 function goDetail(item) { 209 mask: true
210 const form = encodeURIComponent(JSON.stringify(item)) 210 })
211 // console.log(userType.value) 211 api.audit(obj).then((res) => {
212 212 uni.hideLoading()
213 let path = 213 uni.showToast({
214 `/personalVip/auditDetail?form=${form}` 214 title: '操作成功',
215 uni.navigateTo({ 215 icon: 'none'
216 url: path 216 })
217 }); 217 getList()
218 218 })
219 219 }
220 } 220
221 221 function goDetail(item) {
222 function goMerge() { 222 const form = encodeURIComponent(JSON.stringify(item))
223 let path = `/personalVip/sheng/merge` 223 // console.log(userType.value)
224 uni.redirectTo({ 224
225 url: path 225 let path =
226 }); 226 `/personalVip/auditDetail?form=${form}`
227 } 227 uni.navigateTo({
228 function goMergeUp() { 228 url: path
229 let path = `/personalVip/sheng/mergeUp` 229 });
230 uni.redirectTo({ 230
231 url: path 231
232 }); 232 }
233 } 233
234 </script> 234 function goMerge() {
235 235 let path = `/personalVip/sheng/merge`
236 <style> 236 uni.redirectTo({
237 237 url: path
238 });
239 }
240
241 function goMergeUp() {
242 let path = `/personalVip/sheng/mergeUp`
243 uni.redirectTo({
244 url: path
245 });
246 }
247 </script>
248
249 <style>
250
238 </style> 251 </style>
...\ No newline at end of file ...\ No newline at end of file
......
personalVip/auditDetail.vue
...@@ -183,8 +183,13 @@ function doApproval(recordId, flag, reason) { ...@@ -183,8 +183,13 @@ function doApproval(recordId, flag, reason) {
183 recordIds: [] 183 recordIds: []
184 } 184 }
185 obj.recordIds.push(recordId) 185 obj.recordIds.push(recordId)
186 console.log(obj) 186 console.log(obj)
187 api.audit(obj).then((res) => { 187 uni.showLoading({
188 title: '加载中',
189 mask: true
190 })
191 api.audit(obj).then((res) => {
192 uni.hideLoading()
188 uni.showToast({ 193 uni.showToast({
189 title: '操作成功', 194 title: '操作成功',
190 icon: 'none' 195 icon: 'none'
......
personalVip/changeLevelAudit.vue
...@@ -155,8 +155,12 @@ ...@@ -155,8 +155,12 @@
155 reason: reason || '', 155 reason: reason || '',
156 ids: [id] 156 ids: [id]
157 } 157 }
158 console.log(obj) 158 console.log(obj)
159 api.changeLevelAudit(obj).then((res) => { 159 uni.showLoading({
160 title: '加载中'
161 })
162 api.changeLevelAudit(obj).then((res) => {
163 uni.hideLoading()
160 uni.showToast({ 164 uni.showToast({
161 title: '操作成功', 165 title: '操作成功',
162 icon: 'none' 166 icon: 'none'
......
personalVip/changeVipAudit.vue
...@@ -150,8 +150,13 @@ ...@@ -150,8 +150,13 @@
150 reason: reason || '', 150 reason: reason || '',
151 ids: [id] 151 ids: [id]
152 } 152 }
153 console.log(obj) 153 console.log(obj)
154 api.personChangeAudit(obj).then((res) => { 154 uni.showLoading({
155 title: '加载中',
156 mask: true
157 })
158 api.personChangeAudit(obj).then((res) => {
159 uni.hideLoading()
155 uni.showToast({ 160 uni.showToast({
156 title: '操作成功', 161 title: '操作成功',
157 icon: 'none' 162 icon: 'none'
......
personalVip/mergeVip.vue
...@@ -81,7 +81,8 @@ ...@@ -81,7 +81,8 @@
81 } 81 }
82 function getList(){ 82 function getList(){
83 uni.showLoading({ 83 uni.showLoading({
84 title:'加载中' 84 title: '加载中',
85 mask: true
85 }) 86 })
86 api.infoMergeRangeList(queryParams.value).then(res=>{ 87 api.infoMergeRangeList(queryParams.value).then(res=>{
87 list.value = res.rows 88 list.value = res.rows
......
personalVip/mergeVipAudit.vue
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
74 }) 74 })
75 function getList(){ 75 function getList(){
76 uni.showLoading({ 76 uni.showLoading({
77 title:'加载中' 77 title: '加载中',
78 mask: true
78 }) 79 })
79 api.infoMergeRangeList(queryParams.value).then(res=>{ 80 api.infoMergeRangeList(queryParams.value).then(res=>{
80 list.value = res.rows 81 list.value = res.rows
...@@ -148,8 +149,13 @@ ...@@ -148,8 +149,13 @@
148 reason: reason || '', 149 reason: reason || '',
149 ids: [id] 150 ids: [id]
150 } 151 }
151 console.log(obj) 152 console.log(obj)
152 api.mergerVipAudit(obj).then((res) => { 153 uni.showLoading({
154 title: '加载中',
155 mask:true
156 })
157 api.mergerVipAudit(obj).then((res) => {
158 uni.hideLoading()
153 uni.showToast({ 159 uni.showToast({
154 title: '操作成功', 160 title: '操作成功',
155 icon: 'none' 161 icon: 'none'
......
personalVip/mobilize.vue
...@@ -123,9 +123,6 @@ ...@@ -123,9 +123,6 @@
123 }) 123 })
124 124
125 function init() { 125 function init() {
126 uni.showLoading({
127 title: '加载中'
128 })
129 deptType.value = app.globalData.deptType 126 deptType.value = app.globalData.deptType
130 if (deptType.value == 2 || deptType.value == 3) { 127 if (deptType.value == 2 || deptType.value == 3) {
131 queryParams.value.dgId = -1 128 queryParams.value.dgId = -1
...@@ -147,9 +144,6 @@ ...@@ -147,9 +144,6 @@
147 144
148 function onClickItem(e) { 145 function onClickItem(e) {
149 console.log(e) 146 console.log(e)
150 uni.showLoading({
151 title: '加载中'
152 })
153 if (deptType.value == 2 || deptType.value == 3) { 147 if (deptType.value == 2 || deptType.value == 3) {
154 queryParams.value.dgId = -1 148 queryParams.value.dgId = -1
155 queryParams.value.shenRes = e.currentIndex 149 queryParams.value.shenRes = e.currentIndex
...@@ -167,7 +161,8 @@ ...@@ -167,7 +161,8 @@
167 161
168 function getList() { 162 function getList() {
169 uni.showLoading({ 163 uni.showLoading({
170 title: '加载中' 164 title: '加载中',
165 mask: true
171 }) 166 })
172 api.getMobilizelist(queryParams.value).then(res => { 167 api.getMobilizelist(queryParams.value).then(res => {
173 uni.hideLoading() 168 uni.hideLoading()
...@@ -285,8 +280,13 @@ ...@@ -285,8 +280,13 @@
285 reason: reason || '', 280 reason: reason || '',
286 rangeIds: rangeId 281 rangeIds: rangeId
287 } 282 }
288 console.log(obj) 283 console.log(obj)
289 api.mobilizeAudit(obj).then((res) => { 284 uni.showLoading({
285 title: '加载中',
286 mask: true
287 })
288 api.mobilizeAudit(obj).then((res) => {
289 uni.hideLoading()
290 uni.showToast({ 290 uni.showToast({
291 title: '操作成功', 291 title: '操作成功',
292 icon: 'none' 292 icon: 'none'
......
personalVip/mobilizeDetail.vue
...@@ -151,8 +151,12 @@ ...@@ -151,8 +151,12 @@
151 reason: reason || '', 151 reason: reason || '',
152 rangeIds: rangeIds 152 rangeIds: rangeIds
153 } 153 }
154 console.log(obj) 154 console.log(obj)
155 api.mobilizeAudit(obj).then((res) => { 155 uni.showLoading({
156 title: '加载中'
157 })
158 api.mobilizeAudit(obj).then((res) => {
159 uni.hideLoading()
156 uni.showToast({ 160 uni.showToast({
157 title: '操作成功', 161 title: '操作成功',
158 icon: 'none' 162 icon: 'none'
......
personalVip/payment.vue
...@@ -125,7 +125,8 @@ ...@@ -125,7 +125,8 @@
125 if (res.confirm) { 125 if (res.confirm) {
126 uni.showLoading({ 126 uni.showLoading({
127 icon: 'none', 127 icon: 'none',
128 title: '提交中' 128 title: '提交中',
129 mask: true
129 }) 130 })
130 api.personalCommit(row.rangId).then(res => { 131 api.personalCommit(row.rangId).then(res => {
131 uni.hideLoading() 132 uni.hideLoading()
......
personalVip/sheng/merge.vue
...@@ -188,16 +188,21 @@ ...@@ -188,16 +188,21 @@
188 title: '提示', 188 title: '提示',
189 content: `确认合并已选中的数据?`, 189 content: `确认合并已选中的数据?`,
190 success: function(res) { 190 success: function(res) {
191 if (res.confirm) { 191 if (res.confirm) {
192 api.mergePayMentApi({ recordIds: ids}).then(res => { 192 uni.showLoading({
193 title: '加载中',
194 mask: true
195 })
196 api.mergePayMentApi({ recordIds: ids}).then(resp => {
193 // uni.showToast({ 197 // uni.showToast({
194 // title: `操作成功` 198 // title: `操作成功`
195 // }) 199 // })
200 uni.hideLoading()
196 uni.showModal({ 201 uni.showModal({
197 title: '提示', 202 title: '提示',
198 content: `合并完成，是否进行审核数据提交？`, 203 content: `合并完成，是否进行审核数据提交？`,
199 success: function(res) { 204 success: function(resp) {
200 if (res.confirm) { 205 if (resp.confirm) {
201 goMergeUp() 206 goMergeUp()
202 } 207 }
203 } 208 }
......
personalVip/sheng/mergeUp.vue
...@@ -111,19 +111,22 @@ ...@@ -111,19 +111,22 @@
111 switch (e.currentIndex) { 111 switch (e.currentIndex) {
112 case 0: 112 case 0:
113 queryParams.value.mergeFlag = 101 113 queryParams.value.mergeFlag = 101
114 queryParams.value.status = null 114 queryParams.value.statusFlag = 101
115 break; 115 break;
116 case 1: 116 case 1:
117 queryParams.value.mergeFlag = 1 117 queryParams.value.mergeFlag = 1
118 queryParams.value.status = 0 118 queryParams.value.status = 0
119 queryParams.value.statusFlag = 102
119 break; 120 break;
120 case 2: 121 case 2:
121 queryParams.value.mergeFlag = 1 122 queryParams.value.mergeFlag = 1
122 queryParams.value.status = 1 123 queryParams.value.status = 1
124 queryParams.value.statusFlag = 103
123 break; 125 break;
124 case 3: 126 case 3:
125 queryParams.value.mergeFlag = 1 127 queryParams.value.mergeFlag = 1
126 queryParams.value.status = 2 128 queryParams.value.status = 2
129 queryParams.value.statusFlag = 104
127 break; 130 break;
128 } 131 }
129 getList() 132 getList()
...@@ -161,12 +164,16 @@ ...@@ -161,12 +164,16 @@
161 title: '提示', 164 title: '提示',
162 content: `确定提交${item.content.name}？`, 165 content: `确定提交${item.content.name}？`,
163 success: function(res) { 166 success: function(res) {
164 if (res.confirm) { 167 if (res.confirm) {
168 uni.showLoading({
169 title: '加载中'
170 })
165 api.doMergeFlowsPer({ 171 api.doMergeFlowsPer({
166 recordIds: [item.recordId], 172 recordIds: [item.recordId],
167 flag: '1', 173 flag: '1',
168 reason: null 174 reason: null
169 }).then(res => { 175 }).then(res => {
176 uni.hideToast()
170 uni.showToast({ 177 uni.showToast({
171 title: `操作成功!` 178 title: `操作成功!`
172 }) 179 })
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!