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

@@ -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
+  })
+}

 <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>