Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
9a050e3a by 杨炀
Options

1.0.4 36库 修复12.18bug 及 修改意见

1 parent e17cf320
Expand all
Inline Side-by-side
Showing 8 changed files with 178 additions and 80 deletions
common/api.js
...@@ -30,10 +30,14 @@ function carUrl(data, type) { ...@@ -30,10 +30,14 @@ function carUrl(data, type) {
30 return uni.uploadFile({ 30 return uni.uploadFile({
31 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`, 31 url: `${config.baseUrl_api}/person/info/getPersonInfoFromCert/${type}`,
32 header: { 32 header: {
33 'Authorization': uni.getStorageSync('token'), 33 'Authorization': uni.getStorageSync('token'),
34 'Content-Language': 'zh_CN',
35 'Accept-Language': 'zh-CN,zh',
34 }, 36 },
35 name: 'pic', 37 name: 'pic',
36 filePath: data 38 filePath: data
39 }).then(res => {
40 return JSON.parse(res.data)
37 }) 41 })
38 // return request({ 42 // return request({
39 // url: `/person/info/getPersonInfoFromCert/${type}`, 43 // url: `/person/info/getPersonInfoFromCert/${type}`,
...@@ -226,7 +230,12 @@ function addTransferToRange(data) { ...@@ -226,7 +230,12 @@ function addTransferToRange(data) {
226 params: data 230 params: data
227 }) 231 })
228 } 232 }
229 233 function deltransferRange(rids) {
234 return request({
235 url: `/person/transfer/${rids}`,
236 method: 'delete'
237 })
238 }
230 function commit(rangeIds) { 239 function commit(rangeIds) {
231 return request({ 240 return request({
232 url: `/person/transferRange/commit/${rangeIds}`, 241 url: `/person/transferRange/commit/${rangeIds}`,
...@@ -240,7 +249,15 @@ function mobilizeAudit(data) { ...@@ -240,7 +249,15 @@ function mobilizeAudit(data) {
240 method: 'post', 249 method: 'post',
241 params: data 250 params: data
242 }) 251 })
243 } 252 }
253 function delMobilize(rids) {
254 return request({
255 url: `/person/transferRange/${rids}`,
256 method: 'delete'
257 })
258 }
259
260
244 //文件上传 261 //文件上传
245 function uploadFile(e) { 262 function uploadFile(e) {
246 const fileUrl = e.tempFilePaths[0] 263 const fileUrl = e.tempFilePaths[0]
...@@ -1058,5 +1075,6 @@ export { ...@@ -1058,5 +1075,6 @@ export {
1058 getMemberInfoModRange,commitGroupChange,delGroupChange, 1075 getMemberInfoModRange,commitGroupChange,delGroupChange,
1059 getChangeGroupByRangeId,groupInfoMod,addGroupInfoModeToRange, 1076 getChangeGroupByRangeId,groupInfoMod,addGroupInfoModeToRange,
1060 groupChangeEditMod,groupChangeAudit,extractInfoFromChinaIdCard 1077 groupChangeEditMod,groupChangeAudit,extractInfoFromChinaIdCard
1061 ,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById 1078 ,certifiedwithDraw,certifiedunMerge,getRemindCount,getGroupMemberInfoById
1079 ,delMobilize,deltransferRange
1062 } 1080 }
...\ No newline at end of file ...\ No newline at end of file
......
common/login.js
...@@ -123,7 +123,7 @@ function getMyOwnMemberInfo() { ...@@ -123,7 +123,7 @@ function getMyOwnMemberInfo() {
123 const app = getApp() 123 const app = getApp()
124 app.globalData.authenticationStatus = res.data.authenticationStatus 124 app.globalData.authenticationStatus = res.data.authenticationStatus
125 app.globalData.memberInfo = res.data.memberInfo 125 app.globalData.memberInfo = res.data.memberInfo
126 app.globalData.isExam = res.data?.dept?.isExam 126 app.globalData.isExam = res.data?.memberInfo?.isPoints
127 }) 127 })
128 } 128 }
129 export { 129 export {
......
config.js
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 // staging 会员系统 5 // staging 会员系统
6 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/"; 6 // const baseUrl_api = "http://22yidpjzjifv.ngrok.xiaomiqiu123.top/stage-api/";
7 // const baseUrl_api = "http://123.60.96.243/stage-api/"; 7 // const baseUrl_api = "http://123.60.96.243/stage-api/";
8 // const baseUrl_api = 'http://192.168.1.131:8787' 8 // const baseUrl_api = 'http://192.168.1.11:8787'
9 // const baseUrl_api = 'https://ztx.itechtop.cn/stage-api' 9 // const baseUrl_api = 'https://ztx.itechtop.cn/stage-api'
10 // const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api' 10 const baseUrl_api = 'https://tkcn.19wk.cn:8443/stage-api'
11 11
12 const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api' 12 // const baseUrl_api = 'https://newsystem.taekwondo.org.cn/stage-api'
13 export default { 13 export default {
14 baseUrl_api 14 baseUrl_api
15 } 15 }
......
level/addApply.vue
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </uni-forms-item> 26 </uni-forms-item>
27 <uni-forms-item @updateData="updateData" :label="`考官${ec}`" v-for="ec in examinerForChoose" 27 <uni-forms-item @updateData="updateData" :label="`考官${ec}`" v-for="ec in examinerForChoose"
28 :key="ec"> 28 :key="ec">
29 <view class="maskbox"> 29 <view class="maskbox">
30 <view class="mask" @click="selectFN(ec)"></view> 30 <view class="mask" @click="selectFN(ec)"></view>
31 <uni-easyinput v-model="form[`examiner_${ec}`]" clearable placeholder="点击选择考官" /> 31 <uni-easyinput v-model="form[`examiner_${ec}`]" clearable placeholder="点击选择考官" />
32 </view> 32 </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 <button class="btn-red-kx mini w100" @click="chooseOnline"> 41 <button class="btn-red-kx mini w100" @click="chooseOnline">
42 <uni-icons type="personadd" size="16" color="#AD181F"></uni-icons> 42 <uni-icons type="personadd" size="16" color="#AD181F"></uni-icons>
43 在线选择</button> 43 在线选择</button>
44 <!-- <button class="btn-red-kx mini w45" @click="handleUpdate"> 44 <!-- <button class="btn-red-kx mini w45" @click="handleUpdate">
45 <uni-icons type="upload" size="16" color="#AD181F"></uni-icons> 45 <uni-icons type="upload" size="16" color="#AD181F"></uni-icons>
46 上传成绩单</button> --> 46 上传成绩单</button> -->
47 </view> 47 </view>
...@@ -52,13 +52,13 @@ ...@@ -52,13 +52,13 @@
52 </view> 52 </view>
53 </view> 53 </view>
54 <view class="userlist"> 54 <view class="userlist">
55 <view class="item" v-for="(n,index) in infoList" :key="index" style="background-color: #fffafa;"> 55 <view class="item" v-for="(n,index) in infoList" :key="index"
56 <view class="w100"> 56 style="background-color: #fffafa;">
57 <view class="w100">
57 <view class="del" @click="handleDelete(n)">删除</view> 58 <view class="del" @click="handleDelete(n)">删除</view>
58 <view style="display: flex;"> 59 <view style="display: flex;">
59 <view class="photobox"> 60 <view class="photobox">
60 <image class="photo" v-if="n.photo" :src="n.photo" 61 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'></image>
61 mode='aspectFill'></image>
62 <view class="colorful" v-else>{{n.realName?.slice(0,1)}}</view> 62 <view class="colorful" v-else>{{n.realName?.slice(0,1)}}</view>
63 </view> 63 </view>
64 <view> 64 <view>
...@@ -72,9 +72,9 @@ ...@@ -72,9 +72,9 @@
72 <text style="padding: 15rpx 0;">{{ szToHz(n.levelOld) }}级</text> 72 <text style="padding: 15rpx 0;">{{ szToHz(n.levelOld) }}级</text>
73 </view> 73 </view>
74 <view style="width: 40%;"> 74 <view style="width: 40%;">
75 考试级别 75 考试级别
76 <text style="padding: 15rpx 0;">{{ szToHz(n.levelNew) }}级</text> 76 <text style="padding: 15rpx 0;">{{ szToHz(n.levelNew) }}级</text>
77 <!-- <view @click="changeLevelfather(n)"> 77 <!-- <view @click="changeLevelfather(n)">
78 <uni-data-select v-model="n.levelNew" :localdata="levelArr" 78 <uni-data-select v-model="n.levelNew" :localdata="levelArr"
79 @change="changeLevel"></uni-data-select> 79 @change="changeLevel"></uni-data-select>
80 </view> --> 80 </view> -->
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <view style="width: 30%;"> 84 <view style="width: 30%;">
85 是否通过 85 是否通过
86 <view> 86 <view>
87 <uni-data-select v-model="n.isPass" :localdata="range"></uni-data-select> 87 <uni-data-select :clear="false" v-model="n.isPass" :localdata="range"></uni-data-select>
88 </view> 88 </view>
89 </view> 89 </view>
90 </view> 90 </view>
...@@ -111,12 +111,18 @@ ...@@ -111,12 +111,18 @@
111 111
112 112
113 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation> 113 <uni-popup ref="choseStudent" type="bottom" background-color="#fff" animation>
114 <view class="popBody"> 114 <view class="popBody">
115 <view class="userlist" style="max-height:80vh;overflow: auto;"> 115 <view class="searchbar">
116 <uni-easyinput placeholderStyle="font-size:30rpx" :input-border="false" prefixIcon="search"
117 v-model="studentQuery.name" placeholder="搜索姓名" @blur="chooseOnline" @clear="chooseOnline">
118 </uni-easyinput>
119 </view>
120 <view class="userlist" style="height:80vh;overflow: auto;">
116 <view class="item" v-for=" (n,index) in studentList" :key="index"> 121 <view class="item" v-for=" (n,index) in studentList" :key="index">
117 <view @click="checkThis(n)"> 122 <view @click="checkThis(n)">
118 <image class="icon" v-if="n.checked" :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" /> 123 <image class="icon" v-if="n.checked"
119 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" /> 124 :src="config.baseUrl_api+'/fs/static/member/dx_dwn.png'" />
125 <image class="icon" v-else :src="config.baseUrl_api+'/fs/static/member/dx.png'" />
120 </view> 126 </view>
121 <view class="photobox"> 127 <view class="photobox">
122 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'> 128 <image class="photo" v-if="n.photo" :src="n.photo" mode='aspectFill'>
...@@ -135,7 +141,7 @@ ...@@ -135,7 +141,7 @@
135 <image mode="aspectFit" src="/static/nodata.png"></image> 141 <image mode="aspectFit" src="/static/nodata.png"></image>
136 <text>无可参加考试会员</text> 142 <text>无可参加考试会员</text>
137 </view> 143 </view>
138 </view> 144 </view>
139 <button class="btn-red-kx" v-if="studentList.length!=0" @click="submitStudents">确定</button> 145 <button class="btn-red-kx" v-if="studentList.length!=0" @click="submitStudents">确定</button>
140 </view> 146 </view>
141 </uni-popup> 147 </uni-popup>
...@@ -188,7 +194,10 @@ ...@@ -188,7 +194,10 @@
188 const infoList = ref([]) 194 const infoList = ref([])
189 const ids = ref([]) 195 const ids = ref([])
190 const tablePersonInfo = ref({}) 196 const tablePersonInfo = ref({})
191 const transcript = ref([]) 197 const transcript = ref([])
198 const studentQuery = ref({
199 name:''
200 })
192 const levelArr = ref([{ 201 const levelArr = ref([{
193 value: '10', 202 value: '10',
194 text: '十级' 203 text: '十级'
...@@ -365,13 +374,13 @@ ...@@ -365,13 +374,13 @@
365 save().then(() => { 374 save().then(() => {
366 // form.value.examId 下一步 375 // form.value.examId 下一步
367 active.value = 1 376 active.value = 1
368 getChosedStudentList() 377 getChosedStudentList()
369 if(form.value.examId){ 378 if (form.value.examId) {
370 api.getLevelApplyInfo(form.value.examId).then(res=>{ 379 api.getLevelApplyInfo(form.value.examId).then(res => {
371 if (res.data.transcript) { 380 if (res.data.transcript) {
372 transcript.value = JSON.parse(res.data.transcript) 381 transcript.value = JSON.parse(res.data.transcript)
373 } 382 }
374 }) 383 })
375 } 384 }
376 }) 385 })
377 } 386 }
...@@ -398,24 +407,25 @@ ...@@ -398,24 +407,25 @@
398 } 407 }
399 408
400 function chooseOnline() { 409 function chooseOnline() {
401 uni.showLoading({ 410 uni.showLoading({
402 title:'加载中', 411 title: '加载中',
403 icon:'none' 412 icon: 'none'
404 }) 413 })
405 var obj = { 414 var obj = {
406 memId: memberInfo.memId, 415 memId: memberInfo.memId,
407 examId: form.value.examId, 416 examId: form.value.examId,
408 examType: form.value.type 417 examType: form.value.type,
418 name:studentQuery.value.name
409 } 419 }
410 api.chooseStudentsList(obj).then(response => { 420 api.chooseStudentsList(obj).then(response => {
411 studentList.value = response.rows 421 studentList.value = response.rows
412 for (var s of studentList.value) { 422 for (var s of studentList.value) {
413 s.checked = false 423 s.checked = false
414 if(s.photo&&s.photo.indexOf('http')==-1){ 424 if (s.photo && s.photo.indexOf('http') == -1) {
415 s.photo = config.baseUrl_api + s.photo 425 s.photo = config.baseUrl_api + s.photo
416 } 426 }
417 427
418 } 428 }
419 uni.hideLoading() 429 uni.hideLoading()
420 choseStudent.value.open() 430 choseStudent.value.open()
421 }) 431 })
...@@ -473,9 +483,9 @@ ...@@ -473,9 +483,9 @@
473 483
474 if (!d.isPass) { 484 if (!d.isPass) {
475 d.isPass = '1' 485 d.isPass = '1'
476 } 486 }
477 if(d.photo&&d.photo.indexOf('http')==-1){ 487 if (d.photo && d.photo.indexOf('http') == -1) {
478 d.photo = config.baseUrl_api + d.photo 488 d.photo = config.baseUrl_api + d.photo
479 } 489 }
480 }) 490 })
481 491
...@@ -644,36 +654,40 @@ ...@@ -644,36 +654,40 @@
644 } 654 }
645 })) 655 }))
646 UpPop.value.close() 656 UpPop.value.close()
647 } 657 }
648 658
649 function handleDelete(row) { 659 function handleDelete(row) {
650 uni.showModal({ 660 uni.showModal({
651 title: '提示', 661 title: '提示',
652 content: `确定删除${row.realName}?`, 662 content: `确定删除${row.realName}?`,
653 success: function(res) { 663 success: function(res) {
654 if (res.confirm) { 664 if (res.confirm) {
655 api.dellevelPerson(row.id).then(res=>{ 665 api.dellevelPerson(row.id).then(res => {
656 uni.showToast({ 666 uni.showToast({
657 title:`操作成功` 667 title: `操作成功`
658 }) 668 })
659 getChosedStudentList() 669 getChosedStudentList()
660 }) 670 })
661 } 671 }
662 } 672 }
663 }) 673 })
664 } 674 }
665 </script> 675 </script>
666 676
667 <style lang="scss" scoped> 677 <style lang="scss" scoped>
668 :deep(.uni-progress-bar) { 678 :deep(.uni-progress-bar) {
669 display: none; 679 display: none;
670 }
671 .item{
672 .del{ color: #AD181F;
673 position: absolute;
674 right: 30rpx;
675 font-size: 28rpx;}
676 } 680 }
681
682 .item {
683 .del {
684 color: #AD181F;
685 position: absolute;
686 right: 30rpx;
687 font-size: 28rpx;
688 }
689 }
690
677 .wBox { 691 .wBox {
678 width: 700rpx; 692 width: 700rpx;
679 padding: 30rpx; 693 padding: 30rpx;
...@@ -689,11 +703,22 @@ ...@@ -689,11 +703,22 @@
689 703
690 .popBody { 704 .popBody {
691 padding: 40rpx 30rpx; 705 padding: 40rpx 30rpx;
692 } 706 }
693 .maskbox{position:relative; 707
694 .mask{position: absolute;width:calc(100% - 34px);height: 100%;z-index: 10; 708 .maskbox {
695 background-color: red;opacity: 0; 709 position: relative;
696 } 710
697 } 711 .mask {
698 :deep(.file-picker__progress){opacity:0;} 712 position: absolute;
713 width: calc(100% - 34px);
714 height: 100%;
715 z-index: 10;
716 background-color: red;
717 opacity: 0;
718 }
719 }
720
721 :deep(.file-picker__progress) {
722 opacity: 0;
723 }
699 </style> 724 </style>
...\ No newline at end of file ...\ No newline at end of file
......
personalVip/addMobilize.vue
...@@ -198,6 +198,27 @@ ...@@ -198,6 +198,27 @@
198 }) 198 })
199 uni.navigateBack() 199 uni.navigateBack()
200 }) 200 })
201 }
202 function handleDelete(row){
203 uni.showModal({
204 title: '提示',
205 content: `确定删除吗`,
206 success: function(res) {
207 if (res.confirm) {
208 api.deltransferRange([row.id]).then(Response=>{
209 uni.showToast({
210 icon:"none",
211 title:'删除成功！'
212 })
213 if (total.value == 1) {
214 baseFormData.value.rangeId = '-1'
215 queryParams.value.rangeId = '-1'
216 }
217 getList()
218 })
219 }
220 }
221 })
201 } 222 }
202 </script> 223 </script>
203 224
......
personalVip/mobilize.vue
...@@ -65,8 +65,9 @@ ...@@ -65,8 +65,9 @@
65 <button @click="audit(item.id,'1')">同意</button> 65 <button @click="audit(item.id,'1')">同意</button>
66 </view> 66 </view>
67 <view class="func" v-if="(deptType == 6&&(item.status == 0 || item.status == 2))"> 67 <view class="func" v-if="(deptType == 6&&(item.status == 0 || item.status == 2))">
68 <button @click="del(item)">删除</button>
68 <button @click="editThis(item)">编辑</button> 69 <button @click="editThis(item)">编辑</button>
69 <button>提交审核</button> 70 <button v-if="item.status == 0 || item.status == 2" @click="handleSubmit(item)">提交审核</button>
70 </view> 71 </view>
71 </view> 72 </view>
72 </view> 73 </view>
...@@ -128,12 +129,12 @@ ...@@ -128,12 +129,12 @@
128 if (deptType.value == 1) { 129 if (deptType.value == 1) {
129 queryParams.value.dgId = -2 130 queryParams.value.dgId = -2
130 queryParams.value.ztxRes = '0' 131 queryParams.value.ztxRes = '0'
131 navs.value = ['审核中', '审核通过', '审核拒绝', '撤销申请'] 132 navs.value = ['审核中', '审核通过', '审核拒绝']
132 } 133 }
133 if (deptType.value == 6) { 134 if (deptType.value == 6) {
134 queryParams.value.dgId = 1 135 queryParams.value.dgId = 1
135 queryParams.value.status = '0' 136 queryParams.value.status = '0'
136 navs.value = ['未提交', '审核中', '审核拒绝', '审核通过', '已撤回'] 137 navs.value = ['未提交', '审核中', '审核拒绝', '审核通过']
137 } 138 }
138 getList() 139 getList()
139 } 140 }
...@@ -204,9 +205,42 @@ ...@@ -204,9 +205,42 @@
204 url: path 205 url: path
205 }); 206 });
206 } 207 }
207 208 function handleSubmit(row){
209 uni.showModal({
210 title: '提示',
211 content: `确定提交吗`,
212 success: function(res) {
213 if (res.confirm) {
214 api.commit([row.id]).then(Response=>{
215 uni.showToast({
216 icon:"none",
217 title:'提交成功！'
218 })
219 getList()
220 })
221 }
222 }
223 })
224 }
225 function del(row){
226 uni.showModal({
227 title: '提示',
228 content: `确定删除吗`,
229 success: function(res) {
230 if (res.confirm) {
231 api.delMobilize(row.id).then(Response=>{
232 uni.showToast({
233 icon:"none",
234 title:'删除成功！'
235 })
236 getList()
237 })
238 }
239 }
240 })
241 }
208 function audit(rangeId, flag) { 242 function audit(rangeId, flag) {
209 if (flag == '0') { 243 if (flag == '2') {
210 // 拒绝 244 // 拒绝
211 // 弹出框填写理由 245 // 弹出框填写理由
212 uni.showModal({ 246 uni.showModal({
......
personalVip/mobilizeDetail.vue
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 </view> 38 </view>
39 </view> 39 </view>
40 40
41 <view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0"> 41 <!-- <view class="fixedBottom" v-if="(deptType == 1)&&form.ztxRes == 0">
42 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button> 42 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
43 <button class="btn-red" @click="audit(form.id,'1')">同意</button> 43 <button class="btn-red" @click="audit(form.id,'1')">同意</button>
44 </view> 44 </view>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <view class="fixedBottom" v-if="(deptType == 2 || deptType == 3)&&form.shenRes == 0"> 46 <view class="fixedBottom" v-if="(deptType == 2 || deptType == 3)&&form.shenRes == 0">
47 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button> 47 <button class="btn-red-kx" @click="audit(form.id,'2')">拒绝</button>
48 <button class="btn-red" @click="audit(form.id,'1')">同意</button> 48 <button class="btn-red" @click="audit(form.id,'1')">同意</button>
49 </view> 49 </view> -->
50 50
51 </view> 51 </view>
52 </template> 52 </template>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!