Skip to content

杨炀 / ztx_wx_gzt

Go to a project
Toggle navigation
Toggle navigation pinning
9b888601 by lttnew
Options

Merge branch 'master' of https://code.itechtop.cn/yangyang/ztx_wx_gzt

2 parents 94f120e1 e92d0a31
Inline Side-by-side
Showing 5 changed files with 218 additions and 143 deletions
common/api.js
......@@ -416,6 +416,16 @@ export function audit(data) {
})
}
// 个人会员新版本审核
export function auditApi(data) {
return request({
url: `/person/paymentRangeNew/audit/${data.ids}?reason=${data.reason}&flag=${data.flag}`,
method: 'post',
params: data
})
}
// 审核详情
export function getHistoryByRelateId(rId) {
return request({
......@@ -1950,3 +1960,12 @@ export function GroupGetLogs(id) {
})
}
// 新个人会员审批
export function auditList(params) {
return request({
url: '/person/paymentRangeNew/list',
method: 'get',
params: params
})
}
......
pages/index/home.vue
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.
personalVip/audit.vue
<template>
<view>
<view class="text-center whitebg" v-if="userType=='2'">
<view class="cardNav" v-if="userType=='2'">
<view class="active">审核</view>
<view @click="goMerge">合并</view>
<view @click="goMergeUp">提交</view>
</view>
</view>
<uni-segmented-control class="whitebg" :current="current" :values="navs" @clickItem="onClickItem"
styleType="text" activeColor="#AD181F"></uni-segmented-control>
<!-- <view class="text-center whitebg" v-if="userType=='2'">-->
<!-- <view class="cardNav" v-if="userType=='2'">-->
<!-- <view class="active">审核</view>-->
<!-- <view @click="goMerge">合并</view>-->
<!-- <view @click="goMergeUp">提交</view>-->
<!-- </view>-->
<!-- </view>-->
<uni-segmented-control
:current="current"
:values="navs"
activeColor="#AD181F"
class="whitebg"
styleType="text"
@clickItem="onClickItem">
</uni-segmented-control>
<!-- 缴费审核 -->
<view v-if="total>0" class="vipData" style="flex-wrap: wrap;">
<view class="w50">人数合计 <text>{{ statistical.personCount }} 人</text></view>
<view class="w50">新会员合计 <text>{{ statistical.newPersonCount }} 人</text></view>
<view class="w50">续费合计 <text>{{ statistical.oldPersonCount }} 人</text></view>
<view class="w50">年限合计 <text>{{ statistical.totalYear }} 年</text></view>
<view class="w50">费用合计
<text>{{ statistical.totalCost?.toFixed(2) }}元</text>
</view>
<view class="w50">人数合计
<text>{{ statistical.personCount }} 人</text>
</view>
<view class="w50">新会员合计
<text>{{ statistical.newPersonCount }} 人</text>
</view>
<view class="w50">续费合计
<text>{{ statistical.oldPersonCount }} 年</text>
</view>
<view class="w50">年限合计
<text>{{ statistical.totalYear }} 年</text>
</view>
</view>
<view class="appList">
<view class="appItem" v-for="(item,index) in list" :key="index">
<view v-for="(item,index) in list" :key="index" class="appItem">
<view class="status" @click="goDetail(item)">
<text v-if="item.auditStatus==0" class="text-primary">审核中</text>
<text v-if="item.auditStatus==1" class="text-success"> 审核通过</text>
<text v-if="item.auditStatus==2" class="text-danger"> 审核拒绝</text>
<text v-if="item.auditStatus==3" class="text-warning">已撤回</text>
<text v-if="item.auditStatus==1" class="text-primary">审核中</text>
<text v-if="item.auditStatus==2" class="text-success"> 审核通过</text>
<text v-if="item.auditStatus==3" class="text-danger"> 审核拒绝</text>
</view>
<view class="date" @click="goDetail(item)">
<uni-icons type="calendar-filled" size="16" color="#AD181F"></uni-icons>
{{item.content.commitTime}} 提交
<uni-icons color="#AD181F" size="16" type="calendar-filled"></uni-icons>
{{ item.commitTime }} 提交
</view>
<view class="text-primary" v-if="item.content?.wfCode" @click="goDetail(item)">{{item.content?.wfCode}}
<view v-if="item?.wfCode" class="text-primary" @click="goDetail(item)">{{ item.wfCode }}
</view>
<view class="name" @click="goDetail(item)">{{item.content.name}}</view>
<view class="name" @click="goDetail(item)">{{ item.memName }}</view>
<view class="flexbox" @click="goDetail(item)">
<view>
人数合计
<view>{{item.content.personCount}}</view>
<view>{{ item.allCount }}</view>
</view>
<view>
年限合计
<view>{{item.content.totalYear}}</view>
<view>{{ item.yearCount }}</view>
</view>
<view>
提交单位
<view>{{item.content.memberName}}</view>
新会员
<view>{{ item.newCount }}</view>
</view>
<view>
费用
<view>￥{{ (item.price * 1).toFixed(2) }}</view>
</view>
<view class="func" v-if="item.auditStatus==0">
<button @click="audit(item.recordId,'0')">拒绝</button>
<button @click="audit(item.recordId,'1')">同意</button>
</view>
<view class="func" v-if="item.auditStatus==1 && item.isView == 1">
<button @click="handleDelete(item)">撤回</button>
<view v-if="item.auditStatus==1" class="func">
<button @click="audit(item,'2')">拒绝</button>
<button @click="audit(item,'1')">同意</button>
</view>
<!-- <view v-if="item.auditStatus==1 && item.isView == 1" class="func">-->
<!-- <button @click="handleDelete(item)">撤回</button>-->
<!-- </view>-->
</view>
</view>
<view class="nodata" v-if="list.length==0">
<image mode="aspectFit" :src="config.baseUrl_api + '/fs/static/nodata.png'"></image>
<view v-if="list.length==0" class="nodata">
<image :src="config.baseUrl_api + '/fs/static/nodata.png'" mode="aspectFit"></image>
<text>暂无数据</text>
</view>
<!-- <view v-if="userType=='2'" class="block-btn-box">
......@@ -69,29 +88,27 @@
</template>
<script setup>
import * as api from '@/common/api.js'
import config from '@/config.js'
import {
onMounted,
ref
} from 'vue'
import {
onShow
} from '@dcloudio/uni-app'
const app = getApp();
const queryParams = ref({
import * as api from '@/common/api.js'
import config from '@/config.js'
import {ref} from 'vue'
import {onShow} from '@dcloudio/uni-app'
const app = getApp();
const queryParams = ref({
// pageNum: 1,
// pageSize: 10
auditStatus: '0'
})
const navs = ref(['待审核', '审核通过', '审核拒绝', '撤回'])
const current = ref(0)
const list = ref([])
const statistical = ref({})
const total = ref(0)
const deptType = ref('')
const userType = ref('')
onShow(() => {
auditStatus: "1",
auditFlag: "1"
})
const navs = ref(['待审核', '审核通过', '审核拒绝',])
const current = ref(0)
const list = ref([])
const statistical = ref({})
const total = ref(0)
const deptType = ref('')
const userType = ref('')
onShow(() => {
if (app.globalData.isLogin) {
init()
} else {
......@@ -99,54 +116,54 @@
init()
};
}
})
})
function init() {
function init() {
userType.value = app.globalData.userType
deptType.value = app.globalData.deptType
getList()
}
}
function onClickItem(e) {
console.log(e)
queryParams.value.auditStatus = e.currentIndex
function onClickItem(e) {
queryParams.value.auditStatus = e.currentIndex + 1
console.log(queryParams.value.auditStatus)
getList()
}
}
function getList() {
async function getList() {
uni.showLoading({
title: `加载中`,
mask: true
})
if (deptType.value == 2 || deptType.value == 3) {
queryParams.value.mergeFlag = 0
}
const res = await api.auditList(queryParams.value)
list.value = res.rows
total.value = res.total
statistical.value = {
totalCost: 0,
personCount: 0,
newPersonCount: 0,
oldPersonCount: 0,
totalYear: 0
}
if (deptType.value == 2 || deptType.value == 3) {
queryParams.value.mergeFlag = 0
for (const val of list.value) {
statistical.value.totalCost += val.price * 1
statistical.value.personCount += val.allCount * 1
statistical.value.newPersonCount += val.newCount * 1
statistical.value.oldPersonCount += val.oldCount * 1
statistical.value.totalYear += val.yearCount * 1
}
api.getVerifyList(queryParams.value).then(res => {
list.value = res.rows
list.value.forEach(item => {
item.content = JSON.parse(item.content)
statistical.value.personCount += (item.content.personCount * 1)
statistical.value.newPersonCount += (item.content.newPersonCount * 1)
statistical.value.oldPersonCount += (item.content.oldPersonCount * 1)
statistical.value.totalYear += (item.content.totalYear * 1)
})
total.value = res.total
uni.hideLoading()
})
}
function handleDelete(row) {
}
function handleDelete(row) {
uni.showModal({
title: '提示',
content: `确定撤回 ${row.content.name}？`,
success: function(res) {
content: `确定撤回 ${row.name}？`,
success: function (res) {
if (res.confirm) {
api.withDraw({
recordId: row.recordId,
......@@ -160,55 +177,57 @@
}
}
})
}
}
function audit(recordId, flag) {
if (flag == '0') {
function audit(item, flag) {
if (flag == '2') {
// 拒绝
// 弹出框填写理由
uni.showModal({
title: '请输入拒绝理由',
editable: true,
success: function(res) {
success: function (res) {
if (res.confirm) {
if (!res.content) {
uni.showToast({
title: '请输入拒绝理由',
icon: 'none'
})
return
} else {
doApproval(recordId, flag, res.content)
doApproval(item.rangId, flag, res.content)
}
}
}
})
} else if (flag == '1') {
}
if (flag == '1') {
// 二次确认
uni.showModal({
title: '提示',
content: `确定审批通过吗`,
success: function(res) {
success: function (res) {
if (res.confirm) {
doApproval(recordId, flag)
doApproval(item.rangId, flag)
}
}
})
}
}
}
function doApproval(recordId, flag, reason) {
var obj = {
function doApproval(recordId, flag, reason) {
let obj = {
flag: flag,
reason: reason || '',
recordIds: []
ids: []
}
obj.recordIds.push(recordId)
obj.ids.push(recordId)
console.log(obj)
uni.showLoading({
title: '加载中',
mask: true
})
api.audit(obj).then((res) => {
api.auditApi(obj).then((res) => {
uni.hideLoading()
uni.showToast({
title: '操作成功',
......@@ -216,34 +235,40 @@
})
getList()
})
}
}
function goDetail(item) {
function goDetail(item) {
const form = encodeURIComponent(JSON.stringify(item))
// console.log(userType.value)
// let path =
// `/personalVip/auditDetail?form=${form}`
// uni.navigateTo({
// url: path
// });
let path =
`/personalVip/auditDetail?form=${form}`
`/personalVip/paymentDetail?form=${form}`
uni.navigateTo({
url: path
});
}
}
function goMerge() {
function goMerge() {
let path = `/personalVip/sheng/merge`
uni.redirectTo({
url: path
});
}
}
function goMergeUp() {
function goMergeUp() {
let path = `/personalVip/sheng/mergeUp`
uni.redirectTo({
url: path
});
}
}
</script>
<style>
......
personalVip/paymentDetail.vue
<template>
<view>
<view class="wBox">
<view class="tt">{{form.paymentName}}</view>
<view class="tt">{{ form.memName }}</view>
<view class="info" style="flex-wrap: wrap;">
<view class="w45">共
<text class="text-danger"> {{ form?.allCount }}</text>
人
</view>
<view class="w45">新会员
<text class="text-primary"> {{ form?.newCount }}</text>
人
</view>
<view class="w45">续费合计
<text class="text-primary"> {{ form?.oldCount }}</text>
人
</view>
<view class="w45">费用合计
<text class="text-danger">{{ form?.price }}</text>
元
</view>
</view>
</view>
<view class="wBox">
<!-- <view class="tt">{{ // form.paymentName }}</view>-->
<view class="info">
<view>共<text>{{list.length}}</text>人</view>
<view>共
<text>{{ list.length }}</text>
人
</view>
</view>
<view class="userlist">
<view class="item" v-for="(n,index) in list" :key="index">
<view v-for="(n,index) in list" :key="index" class="item">
<view>
<view class="name">{{n.perName}}<text v-if="n.memberInfoName">({{n.memberInfoName || ''}})</text></view>
<view class="date">原有效期至 {{n.originValidityDate ? n.originValidityDate.slice(0,10) : '--'}}</view>
<view class="name">{{ n.perName }}
<text v-if="n.memberInfoName">({{ n.memberInfoName || '' }})</text>
</view>
<view class="date">原有效期至 {{ n.originValidityDate ? n.originValidityDate.slice(0, 10) : '--' }}</view>
</view>
<view class="nian">
{{n.payYear}}年
{{ n.payYear }}年
</view>
</view>
</view>
</view>
<view class="h3-padding" v-if="feelList.length>0">审核流程</view>
<view class="wBox" v-if="feelList.length>0">
<view class="stepItem" v-for="(n,index) in feelList" :key="index">
<view class="time">{{n.auditTime || '待审批'}}</view>
<view v-if="feelList.length>0" class="h3-padding">审核流程</view>
<view v-if="feelList.length>0" class="wBox">
<view v-for="(n,index) in feelList" :key="index" class="stepItem">
<view class="time">{{ n.auditTime || '待审批' }}</view>
<view class="content">
<view class="status">
<text v-if="n.auditResult==0" class="text-primary"> 审核中</text>
......@@ -29,9 +57,9 @@
<text v-if="n.auditResult==2" class="text-danger"> 审核拒绝</text>
<text v-if="n.auditResult==3" class="text-warning"> 已撤回</text>
</view>
<view class="name">第 {{index+1}} 步</view>
<view class="deptName">{{n.auditDeptName || n.auditBy}}</view>
<view>备注：{{n.auditMsg || '/' }}</view>
<view class="name">第 {{ index + 1 }} 步</view>
<view class="deptName">{{ n.auditDeptName || n.auditBy }}</view>
<view>备注：{{ n.auditMsg || '/' }}</view>
</view>
</view>
</view>
......@@ -39,32 +67,33 @@
</template>
<script setup>
import * as api from '@/common/api.js'
import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import * as api from '@/common/api.js'
import {ref} from 'vue'
import {onLoad} from '@dcloudio/uni-app'
// 查询参数（和PC保持一致）
const queryParams = ref({
// 查询参数（和PC保持一致）
const queryParams = ref({
rangeId: '',
pageNum: 1,
pageSize: 999
})
})
const form = ref({})
const list = ref([])
const feelList = ref([])
const form = ref({})
const list = ref([])
const feelList = ref([])
onLoad((option) => {
onLoad((option) => {
if (option.form) {
form.value = JSON.parse(decodeURIComponent(option.form))
queryParams.value.rangeId = form.value.rangId || form.value.rangeId
getList()
getAuditLogs()
}
})
async function getList() {
console.log(form.value)
})
async function getList() {
try {
const res = await api.listAPI(queryParams.value)
list.value = res.rows || []
......@@ -72,9 +101,9 @@
list.value = []
console.error('获取成员失败', e)
}
}
}
function getAuditLogs() {
function getAuditLogs() {
if (form.value.auditLogs) {
try {
feelList.value = JSON.parse(form.value.auditLogs)
......@@ -82,11 +111,11 @@
feelList.value = []
}
}
}
}
</script>
<style scoped lang="scss">
.wBox {
<style lang="scss" scoped>
.wBox {
width: 700rpx;
padding: 30rpx;
margin: 20rpx auto 0;
......@@ -98,9 +127,9 @@
color: #0A1629;
font-size: 30rpx;
}
}
}
.userlist {
.userlist {
.item {
border-bottom: 1px dashed #e5e5e5;
position: relative;
......@@ -114,6 +143,7 @@
.name {
font-size: 30rpx;
text {
margin-left: 1em;
color: #4C5359;
......@@ -129,9 +159,9 @@
color: #AD181F;
}
}
}
}
.info {
.info {
display: flex;
margin: 30rpx 0 20rpx;
font-size: 28rpx;
......@@ -139,19 +169,20 @@
view {
color: #7D8592;
margin-right: 20rpx;
text {
color: #AD181F;
}
}
}
}
.h3-padding {
.h3-padding {
padding: 20rpx 30rpx 0;
font-size: 30rpx;
font-weight: 500;
}
}
.stepItem {
.stepItem {
border-left: 2rpx solid #E60012;
padding-left: 20rpx;
position: relative;
......@@ -190,5 +221,5 @@
color: #666;
}
}
}
}
</style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!