Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
8630af21 by 杨炀
Options

no message

1 parent 9a050e3a
Expand all
Inline Side-by-side
Showing 10 changed files with 174 additions and 109 deletions
common/login.js
...@@ -86,6 +86,7 @@ function getInfo() { ...@@ -86,6 +86,7 @@ function getInfo() {
86 uni.setStorageSync('userName', user.userName) 86 uni.setStorageSync('userName', user.userName)
87 // uni.setStorageSync('perId', personInfo.perId||-1) 87 // uni.setStorageSync('perId', personInfo.perId||-1)
88 app.globalData.deptType = user.dept.deptType 88 app.globalData.deptType = user.dept.deptType
89 app.globalData.genFlag = user.dept.genFlag
89 switch (user.dept.deptType) { 90 switch (user.dept.deptType) {
90 case '1': // 中跆协 91 case '1': // 中跆协
91 app.globalData.userType = '1' 92 app.globalData.userType = '1'
......
level/ztx/cert.vue
...@@ -70,6 +70,16 @@ ...@@ -70,6 +70,16 @@
70 const userType = ref('') 70 const userType = ref('')
71 onLoad((option) => { 71 onLoad((option) => {
72 queryParams.value.type = option.type 72 queryParams.value.type = option.type
73 if(option.type==2){
74 uni.setNavigationBarTitle({
75 title:'段位考试详情'
76 })
77 }
78 if(option.type==3){
79 uni.setNavigationBarTitle({
80 title:'越段考试详情'
81 })
82 }
73 }) 83 })
74 onShow(() => { 84 onShow(() => {
75 if (app.globalData.isLogin) { 85 if (app.globalData.isLogin) {
......
level/ztx/examList.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <view> 2 <view>
3 <!-- 级位证书发布 --> 3 <!-- 级位证书发布 -->
4 <view class="appList"> 4 <view class="appList">
5 <view class="appItem" v-for="item in infoList"> 5 <view class="appItem" v-for="item in infoList" :key="item.examId">
6 <view class="status" @click="goDetail(item)"> 6 <view class="status" @click="goDetail(item)">
7 <text :class="{ 7 <text :class="{
8 'text-warning':item.isCert=='0', 8 'text-warning':item.isCert=='0',
...@@ -15,15 +15,15 @@ ...@@ -15,15 +15,15 @@
15 <view class="name mt0" @click="goDetail(item)">{{item.name}}</view> 15 <view class="name mt0" @click="goDetail(item)">{{item.name}}</view>
16 <view class="pp esp">考级考官：{{item.examinerNames}}</view> 16 <view class="pp esp">考级考官：{{item.examinerNames}}</view>
17 <view class="flexbox" @click="goDetail(item)"> 17 <view class="flexbox" @click="goDetail(item)">
18 <view> 18 <!-- <view>
19 申请单位 19 申请单位
20 <view>{{item.memberName}}</view> 20 <view>{{item.memberName}}</view>
21 </view> 21 </view> -->
22 <view> 22 <view>
23 已发/待发证书 23 已发/待发证书
24 <view>{{item.hasCerts}}/<text class="text-danger">{{item.noCerts}}</text></view> 24 <view>{{item.hasCerts}}/<text class="text-danger">{{item.noCerts}}</text></view>
25 </view> 25 </view>
26 <view> 26 <view class="w50">
27 考生数/通过数 27 考生数/通过数
28 <view>{{item.totalNum}}/<text class="text-danger">{{item.pass}}</text></view> 28 <view>{{item.totalNum}}/<text class="text-danger">{{item.pass}}</text></view>
29 </view> 29 </view>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
58 // pageNum: 1, 58 // pageNum: 1,
59 // pageSize: 10 59 // pageSize: 10
60 }) 60 })
61 const statusArr = ['未发放', '部分发放', '已发放'] 61 const statusArr = ['未发放', '部分发放', '已发放']
62 const current = ref() 62 const current = ref()
63 const infoList = ref([]) 63 const infoList = ref([])
64 const total = ref(0) 64 const total = ref(0)
...@@ -67,6 +67,16 @@ const statusArr = ['未发放', '部分发放', '已发放'] ...@@ -67,6 +67,16 @@ const statusArr = ['未发放', '部分发放', '已发放']
67 onLoad((option) => { 67 onLoad((option) => {
68 queryParams.value.payId = option.payId 68 queryParams.value.payId = option.payId
69 queryParams.value.type = option.type 69 queryParams.value.type = option.type
70 if (option.type == 2) {
71 uni.setNavigationBarTitle({
72 title: '段位考试详情'
73 })
74 }
75 if (option.type == 3) {
76 uni.setNavigationBarTitle({
77 title: '越段考试详情'
78 })
79 }
70 }) 80 })
71 onShow(() => { 81 onShow(() => {
72 if (app.globalData.isLogin) { 82 if (app.globalData.isLogin) {
...@@ -98,7 +108,8 @@ const statusArr = ['未发放', '部分发放', '已发放'] ...@@ -98,7 +108,8 @@ const statusArr = ['未发放', '部分发放', '已发放']
98 108
99 function goDetail(item) { 109 function goDetail(item) {
100 // const form = encodeURIComponent(JSON.stringify(item)) 110 // const form = encodeURIComponent(JSON.stringify(item))
101 let path = `/level/ztx/studentList?type=${queryParams.value.type}&examId=${item.examId}&payId=${queryParams.value.payId}` 111 let path =
112 `/level/ztx/studentList?type=${queryParams.value.type}&examId=${item.examId}&payId=${queryParams.value.payId}`
102 uni.navigateTo({ 113 uni.navigateTo({
103 url: path 114 url: path
104 }); 115 });
...@@ -107,11 +118,14 @@ const statusArr = ['未发放', '部分发放', '已发放'] ...@@ -107,11 +118,14 @@ const statusArr = ['未发放', '部分发放', '已发放']
107 function send(row) { 118 function send(row) {
108 uni.showModal({ 119 uni.showModal({
109 title: '提示', 120 title: '提示',
110 content: `确定生成 ${row.name} 的证书吗`, 121 content: `确定一键下发 ${row.name} 的证书`,
111 success: function(res) { 122 success: function(res) {
112 if (res.confirm) { 123 if (res.confirm) {
113 api.submitCert([{ 124 api.submitCert([{
114 id: row.payId 125 id: queryParams.value.payId,
126 children: [{
127 id: row.examId
128 }]
115 }]).then(res => { 129 }]).then(res => {
116 uni.showToast({ 130 uni.showToast({
117 title: `下发成功` 131 title: `下发成功`
......
level/ztx/studentList.vue
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 v-model="queryParams.name" placeholder="搜索姓名" @blur="getList()" @clear="getList()"> 5 v-model="queryParams.name" placeholder="搜索姓名" @blur="getList()" @clear="getList()">
6 </uni-easyinput> 6 </uni-easyinput>
7 </view> 7 </view>
8 <view class="indexboxre"> 8 <view class="indexboxre" style="height: calc(100vh - 180rpx)">
9 <view class="userlist"> 9 <view class="userlist">
10 <view class="item" v-for="n in list"> 10 <view class="item" v-for="n in list" :key="n.id">
11 <view class="w100"> 11 <view class="w100">
12 <view class="status"> 12 <view class="status">
13 <text class="text-success" v-if="n.isCert == '1' ">已发送</text> 13 <text class="text-success" v-if="n.isCert == '1' ">已发送</text>
......
pages/exam/payment.vue
...@@ -59,8 +59,8 @@ ...@@ -59,8 +59,8 @@
59 </uni-forms-item> 59 </uni-forms-item>
60 <uni-forms-item label="缴费凭证" required> 60 <uni-forms-item label="缴费凭证" required>
61 61
62 <uni-file-picker v-model="selectFileValue" limit="1" file-mediatype="all" file-extname="png,jpg,jpeg,pdf,zip" 62 <uni-file-picker v-model="selectFileValue" limit="1" file-mediatype="all"
63 @select="selectFile" @progress="fileProgress" 63 file-extname="png,jpg,jpeg,pdf,zip" @select="selectFile" @progress="fileProgress"
64 @delete="delSupplementFile(index)"></uni-file-picker> 64 @delete="delSupplementFile(index)"></uni-file-picker>
65 </uni-forms-item> 65 </uni-forms-item>
66 <uni-forms-item label="备注"> 66 <uni-forms-item label="备注">
...@@ -103,6 +103,16 @@ ...@@ -103,6 +103,16 @@
103 onLoad((option) => { 103 onLoad((option) => {
104 queryParams.value.type = option.type 104 queryParams.value.type = option.type
105 console.log(option.type) 105 console.log(option.type)
106 if (option.type == 2) {
107 uni.setNavigationBarTitle({
108 title: '段位考试缴费单'
109 })
110 }
111 if (option.type == 3) {
112 uni.setNavigationBarTitle({
113 title: '越段考试缴费单'
114 })
115 }
106 if (app.globalData.isLogin) { 116 if (app.globalData.isLogin) {
107 init() 117 init()
108 } else { 118 } else {
...@@ -131,6 +141,7 @@ ...@@ -131,6 +141,7 @@
131 }) 141 })
132 }) 142 })
133 } 143 }
144
134 function handleUpdate(item) { 145 function handleUpdate(item) {
135 form.value.payId = item.payId 146 form.value.payId = item.payId
136 if (item.payCert) { 147 if (item.payCert) {
...@@ -215,7 +226,8 @@ ...@@ -215,7 +226,8 @@
215 margin: 50rpx 0 30rpx; 226 margin: 50rpx 0 30rpx;
216 } 227 }
217 } 228 }
218 :deep(.file-picker__progress){ 229
230 :deep(.file-picker__progress) {
219 opacity: 0; 231 opacity: 0;
220 } 232 }
221 </style> 233 </style>
...\ No newline at end of file ...\ No newline at end of file
......
pages/exam/score.vue
1 <template> 1 <template>
2 <view> 2 <view>
3 <!-- <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem" 3 <!-- <uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem"
4 styleType="text" activeColor="#AD181F"></uni-segmented-control> --> 4 styleType="text" activeColor="#AD181F"></uni-segmented-control> -->
5 5
6 <!-- 成绩录入 --> 6 <!-- 成绩录入 -->
7 <view class="appList"> 7 <view class="appList">
8 <view class="appItem" v-for="item in infoList" :key="item.recordId" > 8 <view class="appItem" v-for="item in infoList" :key="item.recordId">
9 <view @click="goDetail(item)"> 9 <view @click="goDetail(item)">
10 <view class="status" > 10 <view class="status">
11 <text :class="{ 11 <text :class="{
12 'text-primary':item.scoreStatus=='0', 12 'text-primary':item.scoreStatus=='0',
13 'text-success':item.scoreStatus=='2', 13 'text-success':item.scoreStatus=='2',
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
17 </view> 17 </view>
18 18
19 <view class="date" v-if="item.status!='0'&&item.submitTime">提交时间:{{item.submitTime}}</view> 19 <view class="date" v-if="item.status!='0'&&item.submitTime">提交时间:{{item.submitTime}}</view>
20 <view class="name mt0" >{{item.name}}</view> 20 <view class="name mt0">{{item.name}}</view>
21 <view class="pp esp">考段日期：{{item.startTime?.substring(0,16)}} 至 {{item.endTime?.substring(0,16)}}</view> 21 <view class="pp esp">考段日期：{{item.startTime?.substring(0,16)}} 至 {{item.endTime?.substring(0,16)}}
22 <view class="flexbox" > 22 </view>
23 <view class="flexbox">
23 <view> 24 <view>
24 申请日期 25 申请日期
25 <view>{{item.applyTime?.substring(0, 10)}}</view> 26 <view>{{item.applyTime?.substring(0, 10)}}</view>
...@@ -34,7 +35,7 @@ ...@@ -34,7 +35,7 @@
34 </view> 35 </view>
35 </view> 36 </view>
36 </view> 37 </view>
37 <!-- <view class="func" v-if="(item.scoreStatus=='0'||item.scoreStatus=='3' || item.scoreStatus=='4')&& item.rankStatus == '1'"> 38 <!-- <view class="func" v-if="(item.scoreStatus=='0'||item.scoreStatus=='3' || item.scoreStatus=='4')&& item.rankStatus == '1'">
38 <button @click="scoreEdit(item)">成绩维护</button> 39 <button @click="scoreEdit(item)">成绩维护</button>
39 </view> --> 40 </view> -->
40 </view> 41 </view>
...@@ -47,28 +48,43 @@ ...@@ -47,28 +48,43 @@
47 </template> 48 </template>
48 49
49 <script setup> 50 <script setup>
50 import * as examApi from '@/common/api_exam.js' 51 import * as examApi from '@/common/api_exam.js'
51 import _ from 'lodash' 52 import _ from 'lodash'
52 import { ref } from 'vue' 53 import {
53 import { onLoad,onShow } from '@dcloudio/uni-app' 54 ref
54 55 } from 'vue'
55 const app = getApp(); 56 import {
56 const queryParams = ref({ 57 onLoad,
58 onShow
59 } from '@dcloudio/uni-app'
60
61 const app = getApp();
62 const queryParams = ref({
57 status: '0', 63 status: '0',
58 rankStatus:'1' 64 rankStatus: '1'
59 }) 65 })
60 const current = ref() 66 const current = ref()
61 const navs = ref(['审核中', '审核通过', '审核拒绝']) 67 const navs = ref(['审核中', '审核通过', '审核拒绝'])
62 const statusArr = ['审批中', '审批通过', '审批拒绝', '审批撤回'] 68 const statusArr = ['审批中', '审批通过', '审批拒绝', '审批撤回']
63 const deptType = ref('') 69 const deptType = ref('')
64 const infoList = ref([]) 70 const infoList = ref([])
65 const total = ref(0) 71 const total = ref(0)
66 72
67 onLoad((options)=>{ 73 onLoad((options) => {
68 queryParams.value.type=options.type 74 queryParams.value.type = options.type
69 }) 75 if (options.type == 2) {
70 76 uni.setNavigationBarTitle({
71 onShow(() => { 77 title: '段位成绩录入'
78 })
79 }
80 if (options.type == 3) {
81 uni.setNavigationBarTitle({
82 title: '越段成绩录入'
83 })
84 }
85 })
86
87 onShow(() => {
72 if (app.globalData.isLogin) { 88 if (app.globalData.isLogin) {
73 init() 89 init()
74 } else { 90 } else {
...@@ -76,25 +92,25 @@ onShow(() => { ...@@ -76,25 +92,25 @@ onShow(() => {
76 init() 92 init()
77 }; 93 };
78 } 94 }
79 }) 95 })
80 96
81 function init(){ 97 function init() {
82 uni.showLoading({ 98 uni.showLoading({
83 title: '加载中' 99 title: '加载中'
84 }) 100 })
85 deptType.value = app.globalData.deptType 101 deptType.value = app.globalData.deptType
86 getList() 102 getList()
87 } 103 }
88 104
89 function onClickItem(e) { 105 function onClickItem(e) {
90 uni.showLoading({ 106 uni.showLoading({
91 title: '加载中' 107 title: '加载中'
92 }) 108 })
93 queryParams.value.status = e.currentIndex 109 queryParams.value.status = e.currentIndex
94 getList() 110 getList()
95 } 111 }
96 112
97 function getList() { 113 function getList() {
98 examApi.getRankScoreList(queryParams.value).then(res => { 114 examApi.getRankScoreList(queryParams.value).then(res => {
99 115
100 infoList.value = res.rows 116 infoList.value = res.rows
...@@ -102,9 +118,9 @@ function getList() { ...@@ -102,9 +118,9 @@ function getList() {
102 118
103 uni.hideLoading() 119 uni.hideLoading()
104 }) 120 })
105 } 121 }
106 122
107 function scoreEdit(item) { 123 function scoreEdit(item) {
108 console.log(item.sourceData) 124 console.log(item.sourceData)
109 var obj = { 125 var obj = {
110 flag: flag, 126 flag: flag,
...@@ -144,9 +160,9 @@ function scoreEdit(item) { ...@@ -144,9 +160,9 @@ function scoreEdit(item) {
144 } 160 }
145 }) 161 })
146 } 162 }
147 } 163 }
148 164
149 function doApproval(obj) { 165 function doApproval(obj) {
150 examApi.doMergeFlows(obj).then((res) => { 166 examApi.doMergeFlows(obj).then((res) => {
151 uni.showToast({ 167 uni.showToast({
152 title: '操作成功', 168 title: '操作成功',
...@@ -154,15 +170,14 @@ function doApproval(obj) { ...@@ -154,15 +170,14 @@ function doApproval(obj) {
154 }) 170 })
155 getList() 171 getList()
156 }) 172 })
157 } 173 }
158 174
159 function goDetail(item) { 175 function goDetail(item) {
160 let path = `/pages/rank/applyDetail?examId=${item.examId}` 176 let path = `/pages/rank/applyDetail?examId=${item.examId}`
161 uni.navigateTo({ 177 uni.navigateTo({
162 url: path 178 url: path
163 }); 179 });
164 } 180 }
165
166 </script> 181 </script>
167 182
168 <style lang="scss" scoped> 183 <style lang="scss" scoped>
......
pages/rank/scoreApproval.vue
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
5 5
6 <!-- 段位考试审核 --> 6 <!-- 段位考试审核 -->
7 <view class="appList"> 7 <view class="appList">
8 <view class="appItem" v-for="item in infoList" :key="item.recordId" > 8 <view class="appItem" v-for="item in infoList" :key="item.recordId">
9 <view @click="goDetail(item)"> 9 <view @click="goDetail(item)">
10 <view class="status" > 10 <view class="status">
11 <text :class="{ 11 <text :class="{
12 'text-primary':item.auditStatus=='0', 12 'text-primary':item.auditStatus=='0',
13 'text-success':item.auditStatus=='1', 13 'text-success':item.auditStatus=='1',
...@@ -18,10 +18,12 @@ ...@@ -18,10 +18,12 @@
18 18
19 <view class="date" v-if="item.status!='0'&&item.submitTime"> 19 <view class="date" v-if="item.status!='0'&&item.submitTime">
20 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons> 20 <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
21 提交时间:{{item.submitTime}}</view> 21 提交时间:{{item.submitTime}}
22 <view class="name mt10" ><text class="dot"></text>{{item.name}}</view> 22 </view>
23 <view class="pp esp">考段日期：{{item.startTime.substring(0,16)}} 至 {{item.endTime.substring(0,16)}}</view> 23 <view class="name mt10"><text class="dot"></text>{{item.name}}</view>
24 <view class="flexbox" > 24 <view class="pp esp">考段日期：{{item.startTime.substring(0,16)}} 至 {{item.endTime.substring(0,16)}}
25 </view>
26 <view class="flexbox">
25 <view> 27 <view>
26 申请日期 28 申请日期
27 <view>{{item.applyTime.substring(0, 10)}}</view> 29 <view>{{item.applyTime.substring(0, 10)}}</view>
...@@ -52,28 +54,43 @@ ...@@ -52,28 +54,43 @@
52 </template> 54 </template>
53 55
54 <script setup> 56 <script setup>
55 import * as examApi from '@/common/api_exam.js' 57 import * as examApi from '@/common/api_exam.js'
56 import _ from 'lodash' 58 import _ from 'lodash'
57 import { ref } from 'vue' 59 import {
58 import { onLoad,onShow } from '@dcloudio/uni-app' 60 ref
59 61 } from 'vue'
60 const app = getApp(); 62 import {
61 const queryParams = ref({ 63 onLoad,
64 onShow
65 } from '@dcloudio/uni-app'
66
67 const app = getApp();
68 const queryParams = ref({
62 status: '0', 69 status: '0',
63 rankStatus:'1' 70 rankStatus: '1'
64 }) 71 })
65 const current = ref() 72 const current = ref()
66 const navs = ref(['审核中', '审核通过', '审核拒绝']) 73 const navs = ref(['审核中', '审核通过', '审核拒绝'])
67 const statusArr = ['审批中', '审批通过', '审批拒绝', '审批撤回'] 74 const statusArr = ['审批中', '审批通过', '审批拒绝', '审批撤回']
68 const deptType = ref('') 75 const deptType = ref('')
69 const infoList = ref([]) 76 const infoList = ref([])
70 const total = ref(0) 77 const total = ref(0)
71 78
72 onLoad((options)=>{ 79 onLoad((options) => {
73 queryParams.value.type=options.type 80 queryParams.value.type = options.type
74 }) 81 if (options.type == 2) {
75 82 uni.setNavigationBarTitle({
76 onShow(() => { 83 title: '段位考试审核'
84 })
85 }
86 if (options.type == 3) {
87 uni.setNavigationBarTitle({
88 title: '越段考试审核'
89 })
90 }
91 })
92
93 onShow(() => {
77 if (app.globalData.isLogin) { 94 if (app.globalData.isLogin) {
78 init() 95 init()
79 } else { 96 } else {
...@@ -81,25 +98,25 @@ onShow(() => { ...@@ -81,25 +98,25 @@ onShow(() => {
81 init() 98 init()
82 }; 99 };
83 } 100 }
84 }) 101 })
85 102
86 function init(){ 103 function init() {
87 uni.showLoading({ 104 uni.showLoading({
88 title: '加载中' 105 title: '加载中'
89 }) 106 })
90 deptType.value = app.globalData.deptType 107 deptType.value = app.globalData.deptType
91 getList() 108 getList()
92 } 109 }
93 110
94 function onClickItem(e) { 111 function onClickItem(e) {
95 uni.showLoading({ 112 uni.showLoading({
96 title: '加载中' 113 title: '加载中'
97 }) 114 })
98 queryParams.value.status = e.currentIndex 115 queryParams.value.status = e.currentIndex
99 getList() 116 getList()
100 } 117 }
101 118
102 function getList() { 119 function getList() {
103 examApi.getVerityList(queryParams.value).then(res => { 120 examApi.getVerityList(queryParams.value).then(res => {
104 uni.hideLoading() 121 uni.hideLoading()
105 const list = [] 122 const list = []
...@@ -123,9 +140,9 @@ function getList() { ...@@ -123,9 +140,9 @@ function getList() {
123 infoList.value = list 140 infoList.value = list
124 total.value = res.total 141 total.value = res.total
125 }) 142 })
126 } 143 }
127 144
128 function audit(item, flag) { 145 function audit(item, flag) {
129 console.log(item.sourceData) 146 console.log(item.sourceData)
130 var obj = { 147 var obj = {
131 flag: flag, 148 flag: flag,
...@@ -165,9 +182,9 @@ function audit(item, flag) { ...@@ -165,9 +182,9 @@ function audit(item, flag) {
165 } 182 }
166 }) 183 })
167 } 184 }
168 } 185 }
169 186
170 function doApproval(obj) { 187 function doApproval(obj) {
171 examApi.doMergeFlows(obj).then((res) => { 188 examApi.doMergeFlows(obj).then((res) => {
172 uni.showToast({ 189 uni.showToast({
173 title: '操作成功', 190 title: '操作成功',
...@@ -175,15 +192,14 @@ function doApproval(obj) { ...@@ -175,15 +192,14 @@ function doApproval(obj) {
175 }) 192 })
176 getList() 193 getList()
177 }) 194 })
178 } 195 }
179 196
180 function goDetail(item) { 197 function goDetail(item) {
181 let path = `/pages/rank/applyDetail?examId=${item.examId}` 198 let path = `/pages/rank/applyDetail?examId=${item.examId}`
182 uni.navigateTo({ 199 uni.navigateTo({
183 url: path 200 url: path
184 }); 201 });
185 } 202 }
186
187 </script> 203 </script>
188 204
189 <style lang="scss" scoped> 205 <style lang="scss" scoped>
......
personalVip/addVip.vue
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
155 value: '3', 155 value: '3',
156 text: "外国护照" 156 text: "外国护照"
157 }, { 157 }, {
158 value: '5', 158 value: '4',
159 text: '户口本' 159 text: '户口本'
160 } 160 }
161 ]) 161 ])
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
189 onLoad((option) => { 189 onLoad((option) => {
190 if (option.tab == '1') { 190 if (option.tab == '1') {
191 current.value = 1 191 current.value = 1
192 baseFormData.value.idcType = option.idcType || 0
192 } 193 }
193 // console.log(current.value,option.tab) 194 // console.log(current.value,option.tab)
194 getRegionsList() 195 getRegionsList()
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
289 baseFormData.value = { 290 baseFormData.value = {
290 photo: '', 291 photo: '',
291 sex: '0', 292 sex: '0',
292 idcType: '0', 293 idcType: baseFormData.value.idcType,
293 perType: '1', 294 perType: '1',
294 }; 295 };
295 } 296 }
...@@ -452,7 +453,7 @@ ...@@ -452,7 +453,7 @@
452 }) 453 })
453 return 454 return
454 } 455 }
455 if (baseFormData.value.idcType == 1 || baseFormData.value.idcType == 3 || baseFormData.value.idcType == 4) { 456 if ( baseFormData.value.idcType == 3 ) {
456 //转换为大写并判断位数12 457 //转换为大写并判断位数12
457 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase() 458 baseFormData.value.idcCode = baseFormData.value.idcCode.toUpperCase()
458 // var regex = /^[a-zA-Z]/ 459 // var regex = /^[a-zA-Z]/
...@@ -491,15 +492,9 @@ ...@@ -491,15 +492,9 @@
491 icon: 'none' 492 icon: 'none'
492 }) 493 })
493 uni.redirectTo({ 494 uni.redirectTo({
494 url: `/personalVip/addVip?tab=${current.value}` 495 url: `/personalVip/addVip?tab=${current.value}&idcType=${baseFormData.value.idcType}`
495 }); 496 });
496 497
497 }).catch(() => {
498 let msg = '您已注册该会员，请不要重复注册！'
499 uni.showToast({
500 title: msg,
501 icon: 'none'
502 })
503 }) 498 })
504 } 499 }
505 } 500 }
......
personalVip/mobilizeDetail.vue
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
10 <view class="colorful">{{n.perName?.slice(0,1)}}</view> 10 <view class="colorful">{{n.perName?.slice(0,1)}}</view>
11 </view> 11 </view>
12 <view> 12 <view>
13 <!-- {{form}} -->
13 <view class="name">{{n.perName}}</view> 14 <view class="name">{{n.perName}}</view>
14 <view class="date">申请调入一级协会 {{n.sourceShenDeptName||'--'}}</view> 15 <view class="date" v-if="deptType==1">原一级协会 <text class="text-primary">{{n.sourceShenDeptName||'--'}}</text></view>
15 <view class="date">申请调入单位 {{n.targetDeptName||'--'}}</view> 16 <view class="date">申请调入一级协会 <text class="text-primary">{{form.shenDeptName||'--'}}</text></view>
17 <view class="date">申请调入单位 <text class="text-primary">{{n.targetDeptName||'--'}}</text></view>
16 </view> 18 </view>
17 </view> 19 </view>
18 </view> 20 </view>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!