Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt
Showing
5 changed files
with
218 additions
and
143 deletions
| ... | @@ -416,6 +416,16 @@ export function audit(data) { | ... | @@ -416,6 +416,16 @@ export function audit(data) { |
| 416 | }) | 416 | }) |
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | // 个人会员新版本审核 | ||
| 420 | export function auditApi(data) { | ||
| 421 | return request({ | ||
| 422 | url: `/person/paymentRangeNew/audit/${data.ids}?reason=${data.reason}&flag=${data.flag}`, | ||
| 423 | method: 'post', | ||
| 424 | params: data | ||
| 425 | }) | ||
| 426 | } | ||
| 427 | |||
| 428 | |||
| 419 | // 审核详情 | 429 | // 审核详情 |
| 420 | export function getHistoryByRelateId(rId) { | 430 | export function getHistoryByRelateId(rId) { |
| 421 | return request({ | 431 | return request({ |
| ... | @@ -1950,3 +1960,12 @@ export function GroupGetLogs(id) { | ... | @@ -1950,3 +1960,12 @@ export function GroupGetLogs(id) { |
| 1950 | }) | 1960 | }) |
| 1951 | } | 1961 | } |
| 1952 | 1962 | ||
| 1963 | |||
| 1964 | // 新个人会员审批 | ||
| 1965 | export function auditList(params) { | ||
| 1966 | return request({ | ||
| 1967 | url: '/person/paymentRangeNew/list', | ||
| 1968 | method: 'get', | ||
| 1969 | params: params | ||
| 1970 | }) | ||
| 1971 | } | ... | ... |
This diff could not be displayed because it is too large.
pages/index/image.js
0 → 100644
This diff could not be displayed because it is too large.
| 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 |
| 11 | styleType="text" activeColor="#AD181F"></uni-segmented-control> | 11 | :current="current" |
| 12 | :values="navs" | ||
| 13 | activeColor="#AD181F" | ||
| 14 | class="whitebg" | ||
| 15 | styleType="text" | ||
| 16 | @clickItem="onClickItem"> | ||
| 17 | </uni-segmented-control> | ||
| 12 | 18 | ||
| 13 | <!-- 缴费审核 --> | 19 | <!-- 缴费审核 --> |
| 14 | <view v-if="total>0" class="vipData" style="flex-wrap: wrap;"> | 20 | <view v-if="total>0" class="vipData" style="flex-wrap: wrap;"> |
| 15 | <view class="w50">人数合计 <text>{{ statistical.personCount }} 人</text></view> | 21 | <view class="w50">费用合计 |
| 16 | <view class="w50">新会员合计 <text>{{ statistical.newPersonCount }} 人</text></view> | 22 | <text>{{ statistical.totalCost?.toFixed(2) }}元</text> |
| 17 | <view class="w50">续费合计 <text>{{ statistical.oldPersonCount }} 人</text></view> | 23 | </view> |
| 18 | <view class="w50">年限合计 <text>{{ statistical.totalYear }} 年</text></view> | 24 | <view class="w50">人数合计 |
| 25 | <text>{{ statistical.personCount }} 人</text> | ||
| 26 | </view> | ||
| 27 | <view class="w50">新会员合计 | ||
| 28 | <text>{{ statistical.newPersonCount }} 人</text> | ||
| 29 | </view> | ||
| 30 | <view class="w50">续费合计 | ||
| 31 | <text>{{ statistical.oldPersonCount }} 年</text> | ||
| 32 | </view> | ||
| 33 | <view class="w50">年限合计 | ||
| 34 | <text>{{ statistical.totalYear }} 年</text> | ||
| 35 | </view> | ||
| 19 | </view> | 36 | </view> |
| 20 | <view class="appList"> | 37 | <view class="appList"> |
| 21 | <view class="appItem" v-for="(item,index) in list" :key="index"> | 38 | <view v-for="(item,index) in list" :key="index" class="appItem"> |
| 22 | <view class="status" @click="goDetail(item)"> | 39 | <view class="status" @click="goDetail(item)"> |
| 23 | <text v-if="item.auditStatus==0" class="text-primary">审核中</text> | 40 | <text v-if="item.auditStatus==1" class="text-primary">审核中</text> |
| 24 | <text v-if="item.auditStatus==1" class="text-success"> 审核通过</text> | 41 | <text v-if="item.auditStatus==2" class="text-success"> 审核通过</text> |
| 25 | <text v-if="item.auditStatus==2" class="text-danger"> 审核拒绝</text> | 42 | <text v-if="item.auditStatus==3" class="text-danger"> 审核拒绝</text> |
| 26 | <text v-if="item.auditStatus==3" class="text-warning">已撤回</text> | ||
| 27 | </view> | 43 | </view> |
| 28 | <view class="date" @click="goDetail(item)"> | 44 | <view class="date" @click="goDetail(item)"> |
| 29 | <uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons> | 45 | <uni-icons color="#AD181F" size="16" type="calendar-filled"></uni-icons> |
| 30 | {{item.content.commitTime}} 提交 | 46 | {{ item.commitTime }} 提交 |
| 31 | </view> | 47 | </view> |
| 32 | <view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}} | 48 | <view v-if="item?.wfCode" class="text-primary" @click="goDetail(item)">{{ item.wfCode }} |
| 33 | </view> | 49 | </view> |
| 34 | <view class="name" @click="goDetail(item)">{{item.content.name}}</view> | 50 | <view class="name" @click="goDetail(item)">{{ item.memName }}</view> |
| 35 | <view class="flexbox" @click="goDetail(item)"> | 51 | <view class="flexbox" @click="goDetail(item)"> |
| 36 | <view> | 52 | <view> |
| 37 | 人数合计 | 53 | 人数合计 |
| 38 | <view>{{item.content.personCount}}</view> | 54 | <view>{{ item.allCount }}</view> |
| 39 | </view> | 55 | </view> |
| 40 | <view> | 56 | <view> |
| 41 | 年限合计 | 57 | 年限合计 |
| 42 | <view>{{item.content.totalYear}}</view> | 58 | <view>{{ item.yearCount }}</view> |
| 43 | </view> | 59 | </view> |
| 44 | <view> | 60 | <view> |
| 45 | 提交单位 | 61 | 新会员 |
| 46 | <view>{{item.content.memberName}}</view> | 62 | <view>{{ item.newCount }}</view> |
| 47 | </view> | 63 | </view> |
| 64 | <view> | ||
| 65 | 费用 | ||
| 66 | <view>¥{{ (item.price * 1).toFixed(2) }}</view> | ||
| 48 | </view> | 67 | </view> |
| 49 | <view class="func" v-if="item.auditStatus==0"> | ||
| 50 | <button @click="audit(item.recordId,'0')">拒绝</button> | ||
| 51 | <button @click="audit(item.recordId,'1')">同意</button> | ||
| 52 | </view> | 68 | </view> |
| 53 | <view class="func" v-if="item.auditStatus==1 && item.isView == 1"> | 69 | <view v-if="item.auditStatus==1" class="func"> |
| 54 | <button @click="handleDelete(item)">撤回</button> | 70 | <button @click="audit(item,'2')">拒绝</button> |
| 71 | <button @click="audit(item,'1')">同意</button> | ||
| 55 | </view> | 72 | </view> |
| 73 | <!-- <view v-if="item.auditStatus==1 && item.isView == 1" class="func">--> | ||
| 74 | <!-- <button @click="handleDelete(item)">撤回</button>--> | ||
| 75 | <!-- </view>--> | ||
| 56 | </view> | 76 | </view> |
| 57 | </view> | 77 | </view> |
| 58 | 78 | ||
| 59 | 79 | ||
| 60 | 80 | <view v-if="list.length==0" class="nodata"> | |
| 61 | <view class="nodata" v-if="list.length==0"> | 81 | <image :src="config.baseUrl_api + '/fs/static/nodata.png'" mode="aspectFit"></image> |
| 62 | <image mode="aspectFit" :src="config.baseUrl_api + '/fs/static/nodata.png'"></image> | ||
| 63 | <text>暂无数据</text> | 82 | <text>暂无数据</text> |
| 64 | </view> | 83 | </view> |
| 65 | <!-- <view v-if="userType=='2'" class="block-btn-box"> | 84 | <!-- <view v-if="userType=='2'" class="block-btn-box"> |
| ... | @@ -69,29 +88,27 @@ | ... | @@ -69,29 +88,27 @@ |
| 69 | </template> | 88 | </template> |
| 70 | 89 | ||
| 71 | <script setup> | 90 | <script setup> |
| 72 | import * as api from '@/common/api.js' | 91 | import * as api from '@/common/api.js' |
| 73 | import config from '@/config.js' | 92 | import config from '@/config.js' |
| 74 | import { | 93 | import {ref} from 'vue' |
| 75 | onMounted, | 94 | import {onShow} from '@dcloudio/uni-app' |
| 76 | ref | 95 | |
| 77 | } from 'vue' | 96 | const app = getApp(); |
| 78 | import { | 97 | const queryParams = ref({ |
| 79 | onShow | ||
| 80 | } from '@dcloudio/uni-app' | ||
| 81 | const app = getApp(); | ||
| 82 | const queryParams = ref({ | ||
| 83 | // pageNum: 1, | 98 | // pageNum: 1, |
| 84 | // pageSize: 10 | 99 | // pageSize: 10 |
| 85 | auditStatus: '0' | 100 | auditStatus: "1", |
| 86 | }) | 101 | auditFlag: "1" |
| 87 | const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回']) | 102 | |
| 88 | const current = ref(0) | 103 | }) |
| 89 | const list = ref([]) | 104 | const navs = ref(['待审核', '审核通过', '审核拒绝',]) |
| 90 | const statistical = ref({}) | 105 | const current = ref(0) |
| 91 | const total = ref(0) | 106 | const list = ref([]) |
| 92 | const deptType = ref('') | 107 | const statistical = ref({}) |
| 93 | const userType = ref('') | 108 | const total = ref(0) |
| 94 | onShow(() => { | 109 | const deptType = ref('') |
| 110 | const userType = ref('') | ||
| 111 | onShow(() => { | ||
| 95 | if (app.globalData.isLogin) { | 112 | if (app.globalData.isLogin) { |
| 96 | init() | 113 | init() |
| 97 | } else { | 114 | } else { |
| ... | @@ -99,54 +116,54 @@ | ... | @@ -99,54 +116,54 @@ |
| 99 | init() | 116 | init() |
| 100 | }; | 117 | }; |
| 101 | } | 118 | } |
| 102 | }) | 119 | }) |
| 103 | 120 | ||
| 104 | function init() { | 121 | function init() { |
| 105 | userType.value = app.globalData.userType | 122 | userType.value = app.globalData.userType |
| 106 | deptType.value = app.globalData.deptType | 123 | deptType.value = app.globalData.deptType |
| 107 | getList() | 124 | getList() |
| 108 | } | 125 | } |
| 109 | 126 | ||
| 110 | function onClickItem(e) { | 127 | function onClickItem(e) { |
| 111 | console.log(e) | 128 | queryParams.value.auditStatus = e.currentIndex + 1 |
| 112 | queryParams.value.auditStatus = e.currentIndex | 129 | console.log(queryParams.value.auditStatus) |
| 113 | getList() | 130 | getList() |
| 114 | } | 131 | } |
| 115 | 132 | ||
| 116 | function getList() { | 133 | async function getList() { |
| 117 | uni.showLoading({ | 134 | uni.showLoading({ |
| 118 | title: `加载中`, | 135 | title: `加载中`, |
| 119 | mask: true | 136 | mask: true |
| 120 | }) | 137 | }) |
| 138 | if (deptType.value == 2 || deptType.value == 3) { | ||
| 139 | queryParams.value.mergeFlag = 0 | ||
| 140 | } | ||
| 141 | const res = await api.auditList(queryParams.value) | ||
| 142 | list.value = res.rows | ||
| 143 | total.value = res.total | ||
| 121 | statistical.value = { | 144 | statistical.value = { |
| 145 | totalCost: 0, | ||
| 122 | personCount: 0, | 146 | personCount: 0, |
| 123 | newPersonCount: 0, | 147 | newPersonCount: 0, |
| 124 | oldPersonCount: 0, | 148 | oldPersonCount: 0, |
| 125 | totalYear: 0 | 149 | totalYear: 0 |
| 126 | } | 150 | } |
| 127 | if (deptType.value == 2 || deptType.value == 3) { | 151 | for (const val of list.value) { |
| 128 | queryParams.value.mergeFlag = 0 | 152 | statistical.value.totalCost += val.price * 1 |
| 153 | statistical.value.personCount += val.allCount * 1 | ||
| 154 | statistical.value.newPersonCount += val.newCount * 1 | ||
| 155 | statistical.value.oldPersonCount += val.oldCount * 1 | ||
| 156 | statistical.value.totalYear += val.yearCount * 1 | ||
| 129 | } | 157 | } |
| 130 | api.getVerifyList(queryParams.value).then(res => { | ||
| 131 | list.value = res.rows | ||
| 132 | list.value.forEach(item => { | ||
| 133 | item.content = JSON.parse(item.content) | ||
| 134 | statistical.value.personCount += (item.content.personCount * 1) | ||
| 135 | statistical.value.newPersonCount += (item.content.newPersonCount * 1) | ||
| 136 | statistical.value.oldPersonCount += (item.content.oldPersonCount * 1) | ||
| 137 | statistical.value.totalYear += (item.content.totalYear * 1) | ||
| 138 | |||
| 139 | }) | ||
| 140 | total.value = res.total | ||
| 141 | uni.hideLoading() | 158 | uni.hideLoading() |
| 142 | }) | ||
| 143 | } | ||
| 144 | 159 | ||
| 145 | function handleDelete(row) { | 160 | } |
| 161 | |||
| 162 | function handleDelete(row) { | ||
| 146 | uni.showModal({ | 163 | uni.showModal({ |
| 147 | title: '提示', | 164 | title: '提示', |
| 148 | content: `确定撤回 ${row.content.name}?`, | 165 | content: `确定撤回 ${row.name}?`, |
| 149 | success: function(res) { | 166 | success: function (res) { |
| 150 | if (res.confirm) { | 167 | if (res.confirm) { |
| 151 | api.withDraw({ | 168 | api.withDraw({ |
| 152 | recordId: row.recordId, | 169 | recordId: row.recordId, |
| ... | @@ -160,55 +177,57 @@ | ... | @@ -160,55 +177,57 @@ |
| 160 | } | 177 | } |
| 161 | } | 178 | } |
| 162 | }) | 179 | }) |
| 163 | } | 180 | } |
| 164 | 181 | ||
| 165 | function audit(recordId, flag) { | 182 | function audit(item, flag) { |
| 166 | if (flag == '0') { | 183 | if (flag == '2') { |
| 167 | // 拒绝 | 184 | // 拒绝 |
| 168 | // 弹出框填写理由 | 185 | // 弹出框填写理由 |
| 169 | uni.showModal({ | 186 | uni.showModal({ |
| 170 | title: '请输入拒绝理由', | 187 | title: '请输入拒绝理由', |
| 171 | editable: true, | 188 | editable: true, |
| 172 | success: function(res) { | 189 | success: function (res) { |
| 173 | if (res.confirm) { | 190 | if (res.confirm) { |
| 174 | if (!res.content) { | 191 | if (!res.content) { |
| 175 | uni.showToast({ | 192 | uni.showToast({ |
| 176 | title: '请输入拒绝理由', | 193 | title: '请输入拒绝理由', |
| 177 | icon: 'none' | 194 | icon: 'none' |
| 178 | }) | 195 | }) |
| 196 | return | ||
| 179 | } else { | 197 | } else { |
| 180 | doApproval(recordId, flag, res.content) | 198 | doApproval(item.rangId, flag, res.content) |
| 181 | } | 199 | } |
| 182 | } | 200 | } |
| 183 | } | 201 | } |
| 184 | }) | 202 | }) |
| 185 | } else if (flag == '1') { | 203 | } |
| 204 | if (flag == '1') { | ||
| 186 | // 二次确认 | 205 | // 二次确认 |
| 187 | uni.showModal({ | 206 | uni.showModal({ |
| 188 | title: '提示', | 207 | title: '提示', |
| 189 | content: `确定审批通过吗`, | 208 | content: `确定审批通过吗`, |
| 190 | success: function(res) { | 209 | success: function (res) { |
| 191 | if (res.confirm) { | 210 | if (res.confirm) { |
| 192 | doApproval(recordId, flag) | 211 | doApproval(item.rangId, flag) |
| 193 | } | 212 | } |
| 194 | } | 213 | } |
| 195 | }) | 214 | }) |
| 196 | } | 215 | } |
| 197 | } | 216 | } |
| 198 | 217 | ||
| 199 | function doApproval(recordId, flag, reason) { | 218 | function doApproval(recordId, flag, reason) { |
| 200 | var obj = { | 219 | let obj = { |
| 201 | flag: flag, | 220 | flag: flag, |
| 202 | reason: reason || '', | 221 | reason: reason || '', |
| 203 | recordIds: [] | 222 | ids: [] |
| 204 | } | 223 | } |
| 205 | obj.recordIds.push(recordId) | 224 | obj.ids.push(recordId) |
| 206 | console.log(obj) | 225 | console.log(obj) |
| 207 | uni.showLoading({ | 226 | uni.showLoading({ |
| 208 | title: '加载中', | 227 | title: '加载中', |
| 209 | mask: true | 228 | mask: true |
| 210 | }) | 229 | }) |
| 211 | api.audit(obj).then((res) => { | 230 | api.auditApi(obj).then((res) => { |
| 212 | uni.hideLoading() | 231 | uni.hideLoading() |
| 213 | uni.showToast({ | 232 | uni.showToast({ |
| 214 | title: '操作成功', | 233 | title: '操作成功', |
| ... | @@ -216,34 +235,40 @@ | ... | @@ -216,34 +235,40 @@ |
| 216 | }) | 235 | }) |
| 217 | getList() | 236 | getList() |
| 218 | }) | 237 | }) |
| 219 | } | 238 | } |
| 220 | 239 | ||
| 221 | function goDetail(item) { | 240 | function goDetail(item) { |
| 222 | const form = encodeURIComponent(JSON.stringify(item)) | 241 | const form = encodeURIComponent(JSON.stringify(item)) |
| 223 | // console.log(userType.value) | 242 | // console.log(userType.value) |
| 224 | 243 | ||
| 244 | // let path = | ||
| 245 | // `/personalVip/auditDetail?form=${form}` | ||
| 246 | // uni.navigateTo({ | ||
| 247 | // url: path | ||
| 248 | // }); | ||
| 249 | |||
| 225 | let path = | 250 | let path = |
| 226 | `/personalVip/auditDetail?form=${form}` | 251 | `/personalVip/paymentDetail?form=${form}` |
| 227 | uni.navigateTo({ | 252 | uni.navigateTo({ |
| 228 | url: path | 253 | url: path |
| 229 | }); | 254 | }); |
| 230 | 255 | ||
| 231 | 256 | ||
| 232 | } | 257 | } |
| 233 | 258 | ||
| 234 | function goMerge() { | 259 | function goMerge() { |
| 235 | let path = `/personalVip/sheng/merge` | 260 | let path = `/personalVip/sheng/merge` |
| 236 | uni.redirectTo({ | 261 | uni.redirectTo({ |
| 237 | url: path | 262 | url: path |
| 238 | }); | 263 | }); |
| 239 | } | 264 | } |
| 240 | 265 | ||
| 241 | function goMergeUp() { | 266 | function goMergeUp() { |
| 242 | let path = `/personalVip/sheng/mergeUp` | 267 | let path = `/personalVip/sheng/mergeUp` |
| 243 | uni.redirectTo({ | 268 | uni.redirectTo({ |
| 244 | url: path | 269 | url: path |
| 245 | }); | 270 | }); |
| 246 | } | 271 | } |
| 247 | </script> | 272 | </script> |
| 248 | 273 | ||
| 249 | <style> | 274 | <style> | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <view> | 2 | <view> |
| 3 | <view class="wBox"> | 3 | <view class="wBox"> |
| 4 | <view class="tt">{{form.paymentName}}</view> | 4 | <view class="tt">{{ form.memName }}</view> |
| 5 | <view class="info" style="flex-wrap: wrap;"> | ||
| 6 | <view class="w45">共 | ||
| 7 | <text class="text-danger"> {{ form?.allCount }}</text> | ||
| 8 | 人 | ||
| 9 | </view> | ||
| 10 | <view class="w45">新会员 | ||
| 11 | <text class="text-primary"> {{ form?.newCount }}</text> | ||
| 12 | 人 | ||
| 13 | </view> | ||
| 14 | <view class="w45">续费合计 | ||
| 15 | <text class="text-primary"> {{ form?.oldCount }}</text> | ||
| 16 | 人 | ||
| 17 | </view> | ||
| 18 | <view class="w45">费用合计 | ||
| 19 | <text class="text-danger">{{ form?.price }}</text> | ||
| 20 | 元 | ||
| 21 | </view> | ||
| 22 | </view> | ||
| 23 | </view> | ||
| 24 | |||
| 25 | |||
| 26 | <view class="wBox"> | ||
| 27 | <!-- <view class="tt">{{ // form.paymentName }}</view>--> | ||
| 5 | <view class="info"> | 28 | <view class="info"> |
| 6 | <view>共<text>{{list.length}}</text>人</view> | 29 | <view>共 |
| 30 | <text>{{ list.length }}</text> | ||
| 31 | 人 | ||
| 32 | </view> | ||
| 7 | </view> | 33 | </view> |
| 8 | <view class="userlist"> | 34 | <view class="userlist"> |
| 9 | <view class="item" v-for="(n,index) in list" :key="index"> | 35 | <view v-for="(n,index) in list" :key="index" class="item"> |
| 10 | <view> | 36 | <view> |
| 11 | <view class="name">{{n.perName}}<text v-if="n.memberInfoName">({{n.memberInfoName || ''}})</text></view> | 37 | <view class="name">{{ n.perName }} |
| 12 | <view class="date">原有效期至 {{n.originValidityDate ? n.originValidityDate.slice(0,10) : '--'}}</view> | 38 | <text v-if="n.memberInfoName">({{ n.memberInfoName || '' }})</text> |
| 39 | </view> | ||
| 40 | <view class="date">原有效期至 {{ n.originValidityDate ? n.originValidityDate.slice(0, 10) : '--' }}</view> | ||
| 13 | </view> | 41 | </view> |
| 14 | <view class="nian"> | 42 | <view class="nian"> |
| 15 | {{n.payYear}}年 | 43 | {{ n.payYear }}年 |
| 16 | </view> | 44 | </view> |
| 17 | </view> | 45 | </view> |
| 18 | </view> | 46 | </view> |
| 19 | </view> | 47 | </view> |
| 20 | 48 | ||
| 21 | <view class="h3-padding" v-if="feelList.length>0">审核流程</view> | 49 | <view v-if="feelList.length>0" class="h3-padding">审核流程</view> |
| 22 | <view class="wBox" v-if="feelList.length>0"> | 50 | <view v-if="feelList.length>0" class="wBox"> |
| 23 | <view class="stepItem" v-for="(n,index) in feelList" :key="index"> | 51 | <view v-for="(n,index) in feelList" :key="index" class="stepItem"> |
| 24 | <view class="time">{{n.auditTime || '待审批'}}</view> | 52 | <view class="time">{{ n.auditTime || '待审批' }}</view> |
| 25 | <view class="content"> | 53 | <view class="content"> |
| 26 | <view class="status"> | 54 | <view class="status"> |
| 27 | <text v-if="n.auditResult==0" class="text-primary"> 审核中</text> | 55 | <text v-if="n.auditResult==0" class="text-primary"> 审核中</text> |
| ... | @@ -29,9 +57,9 @@ | ... | @@ -29,9 +57,9 @@ |
| 29 | <text v-if="n.auditResult==2" class="text-danger"> 审核拒绝</text> | 57 | <text v-if="n.auditResult==2" class="text-danger"> 审核拒绝</text> |
| 30 | <text v-if="n.auditResult==3" class="text-warning"> 已撤回</text> | 58 | <text v-if="n.auditResult==3" class="text-warning"> 已撤回</text> |
| 31 | </view> | 59 | </view> |
| 32 | <view class="name">第 {{index+1}} 步</view> | 60 | <view class="name">第 {{ index + 1 }} 步</view> |
| 33 | <view class="deptName">{{n.auditDeptName || n.auditBy}}</view> | 61 | <view class="deptName">{{ n.auditDeptName || n.auditBy }}</view> |
| 34 | <view>备注:{{n.auditMsg || '/' }}</view> | 62 | <view>备注:{{ n.auditMsg || '/' }}</view> |
| 35 | </view> | 63 | </view> |
| 36 | </view> | 64 | </view> |
| 37 | </view> | 65 | </view> |
| ... | @@ -39,32 +67,33 @@ | ... | @@ -39,32 +67,33 @@ |
| 39 | </template> | 67 | </template> |
| 40 | 68 | ||
| 41 | <script setup> | 69 | <script setup> |
| 42 | import * as api from '@/common/api.js' | 70 | import * as api from '@/common/api.js' |
| 43 | import { ref } from 'vue' | 71 | import {ref} from 'vue' |
| 44 | import { onLoad } from '@dcloudio/uni-app' | 72 | import {onLoad} from '@dcloudio/uni-app' |
| 45 | 73 | ||
| 46 | // 查询参数(和PC保持一致) | 74 | // 查询参数(和PC保持一致) |
| 47 | const queryParams = ref({ | 75 | const queryParams = ref({ |
| 48 | rangeId: '', | 76 | rangeId: '', |
| 49 | pageNum: 1, | 77 | pageNum: 1, |
| 50 | pageSize: 999 | 78 | pageSize: 999 |
| 51 | }) | 79 | }) |
| 52 | 80 | ||
| 53 | const form = ref({}) | 81 | const form = ref({}) |
| 54 | const list = ref([]) | 82 | const list = ref([]) |
| 55 | const feelList = ref([]) | 83 | const feelList = ref([]) |
| 56 | 84 | ||
| 57 | onLoad((option) => { | 85 | onLoad((option) => { |
| 58 | if (option.form) { | 86 | if (option.form) { |
| 59 | form.value = JSON.parse(decodeURIComponent(option.form)) | 87 | form.value = JSON.parse(decodeURIComponent(option.form)) |
| 60 | queryParams.value.rangeId = form.value.rangId || form.value.rangeId | 88 | queryParams.value.rangeId = form.value.rangId || form.value.rangeId |
| 61 | |||
| 62 | getList() | 89 | getList() |
| 63 | getAuditLogs() | 90 | getAuditLogs() |
| 64 | } | 91 | } |
| 65 | }) | ||
| 66 | 92 | ||
| 67 | async function getList() { | 93 | console.log(form.value) |
| 94 | }) | ||
| 95 | |||
| 96 | async function getList() { | ||
| 68 | try { | 97 | try { |
| 69 | const res = await api.listAPI(queryParams.value) | 98 | const res = await api.listAPI(queryParams.value) |
| 70 | list.value = res.rows || [] | 99 | list.value = res.rows || [] |
| ... | @@ -72,9 +101,9 @@ | ... | @@ -72,9 +101,9 @@ |
| 72 | list.value = [] | 101 | list.value = [] |
| 73 | console.error('获取成员失败', e) | 102 | console.error('获取成员失败', e) |
| 74 | } | 103 | } |
| 75 | } | 104 | } |
| 76 | 105 | ||
| 77 | function getAuditLogs() { | 106 | function getAuditLogs() { |
| 78 | if (form.value.auditLogs) { | 107 | if (form.value.auditLogs) { |
| 79 | try { | 108 | try { |
| 80 | feelList.value = JSON.parse(form.value.auditLogs) | 109 | feelList.value = JSON.parse(form.value.auditLogs) |
| ... | @@ -82,11 +111,11 @@ | ... | @@ -82,11 +111,11 @@ |
| 82 | feelList.value = [] | 111 | feelList.value = [] |
| 83 | } | 112 | } |
| 84 | } | 113 | } |
| 85 | } | 114 | } |
| 86 | </script> | 115 | </script> |
| 87 | 116 | ||
| 88 | <style scoped lang="scss"> | 117 | <style lang="scss" scoped> |
| 89 | .wBox { | 118 | .wBox { |
| 90 | width: 700rpx; | 119 | width: 700rpx; |
| 91 | padding: 30rpx; | 120 | padding: 30rpx; |
| 92 | margin: 20rpx auto 0; | 121 | margin: 20rpx auto 0; |
| ... | @@ -98,9 +127,9 @@ | ... | @@ -98,9 +127,9 @@ |
| 98 | color: #0A1629; | 127 | color: #0A1629; |
| 99 | font-size: 30rpx; | 128 | font-size: 30rpx; |
| 100 | } | 129 | } |
| 101 | } | 130 | } |
| 102 | 131 | ||
| 103 | .userlist { | 132 | .userlist { |
| 104 | .item { | 133 | .item { |
| 105 | border-bottom: 1px dashed #e5e5e5; | 134 | border-bottom: 1px dashed #e5e5e5; |
| 106 | position: relative; | 135 | position: relative; |
| ... | @@ -114,6 +143,7 @@ | ... | @@ -114,6 +143,7 @@ |
| 114 | 143 | ||
| 115 | .name { | 144 | .name { |
| 116 | font-size: 30rpx; | 145 | font-size: 30rpx; |
| 146 | |||
| 117 | text { | 147 | text { |
| 118 | margin-left: 1em; | 148 | margin-left: 1em; |
| 119 | color: #4C5359; | 149 | color: #4C5359; |
| ... | @@ -129,9 +159,9 @@ | ... | @@ -129,9 +159,9 @@ |
| 129 | color: #AD181F; | 159 | color: #AD181F; |
| 130 | } | 160 | } |
| 131 | } | 161 | } |
| 132 | } | 162 | } |
| 133 | 163 | ||
| 134 | .info { | 164 | .info { |
| 135 | display: flex; | 165 | display: flex; |
| 136 | margin: 30rpx 0 20rpx; | 166 | margin: 30rpx 0 20rpx; |
| 137 | font-size: 28rpx; | 167 | font-size: 28rpx; |
| ... | @@ -139,19 +169,20 @@ | ... | @@ -139,19 +169,20 @@ |
| 139 | view { | 169 | view { |
| 140 | color: #7D8592; | 170 | color: #7D8592; |
| 141 | margin-right: 20rpx; | 171 | margin-right: 20rpx; |
| 172 | |||
| 142 | text { | 173 | text { |
| 143 | color: #AD181F; | 174 | color: #AD181F; |
| 144 | } | 175 | } |
| 145 | } | 176 | } |
| 146 | } | 177 | } |
| 147 | 178 | ||
| 148 | .h3-padding { | 179 | .h3-padding { |
| 149 | padding: 20rpx 30rpx 0; | 180 | padding: 20rpx 30rpx 0; |
| 150 | font-size: 30rpx; | 181 | font-size: 30rpx; |
| 151 | font-weight: 500; | 182 | font-weight: 500; |
| 152 | } | 183 | } |
| 153 | 184 | ||
| 154 | .stepItem { | 185 | .stepItem { |
| 155 | border-left: 2rpx solid #E60012; | 186 | border-left: 2rpx solid #E60012; |
| 156 | padding-left: 20rpx; | 187 | padding-left: 20rpx; |
| 157 | position: relative; | 188 | position: relative; |
| ... | @@ -190,5 +221,5 @@ | ... | @@ -190,5 +221,5 @@ |
| 190 | color: #666; | 221 | color: #666; |
| 191 | } | 222 | } |
| 192 | } | 223 | } |
| 193 | } | 224 | } |
| 194 | </style> | 225 | </style> | ... | ... |
-
Please register or sign in to post a comment