Skip to content

杨炀 / ztx_wx_gzt

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

+ loading

1 parent 6becca11
Expand all
Inline Side-by-side
Showing 25 changed files with 321 additions and 242 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/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/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!