From 9d7979a2933632bc2083c7f0b3e4a793b0dc3f3e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 12:10:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaIdentityDetailWindow.vue | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/admin/src/components/business/OperaIdentityDetailWindow.vue b/admin/src/components/business/OperaIdentityDetailWindow.vue
index 698e2be..3872416 100644
--- a/admin/src/components/business/OperaIdentityDetailWindow.vue
+++ b/admin/src/components/business/OperaIdentityDetailWindow.vue
@@ -7,7 +7,7 @@
:confirm-working="isWorking"
@close="close"
@confirm="confirm">
- <div style="width: 100%; position: sticky;padding: 12px 16px; top: 0px; left: 0; z-index: 999; background-color: white">
+ <div style="width: calc(100% - 32px); position: sticky;padding: 12px 16px; top: 0px; left: 0; z-index: 999; background-color: white">
<div style="display: flex;background: #e4ecfe;padding: 20px">
<div style="width: 60px;">
<div class="home_title" v-if="info">
@@ -21,8 +21,7 @@
<div style="width: calc(100% - 60px);">
<div class="home_title" v-if="info">
<div class="left">
- <span class="m10">鏄电О锛歿{info.nickName }}</span>
- <span class="mr10 bluebtn" :title="'濮撳悕锛�'+(info.name||'鏈缃鍚�')" >({{(info.name||'鏈缃鍚�') }})</span>
+ <span class="m10">鏄电О锛歿{info.nickName }} <span class="ml10 bluebtn" :title="'濮撳悕锛�'+(info.name||'鏈缃鍚�')" >({{(info.name||'鏈缃鍚�') }})</span></span>
<el-tag type="primary" class="mr10 tag1">鍙戝崟鏂�</el-tag>
<el-tag type="success" class="mr10 tag1" v-if="info.workerIdentity == 2 || info.driverIdentity == 2 || info.chefIdentity == 2">鎺ュ崟鏂�</el-tag>
</div>
@@ -41,7 +40,7 @@
<span class="m10" v-if="item.type ==0">鐢ㄥ伐璁よ瘉</span>
<span class="m10" v-if="item.type ==1">璐ц繍璁よ瘉</span>
<span class="m10" v-if="item.type ==2">渚涢璁よ瘉</span>
- <el-tag type="primary" class="ml10 tag2" v-if="item.auditStatus == 1">璁よ瘉涓�</el-tag>
+ <el-tag type="primary" class="ml10 tag2" v-if="item.auditStatus == 1">鐢宠涓�</el-tag>
<el-tag type="success" class="ml10 tag2" v-if="item.auditStatus == 2">璁よ瘉閫氳繃</el-tag>
<el-tag type="danger" class="ml10 tag2" v-if="item.auditStatus == 3">璁よ瘉澶辫触</el-tag>
</div>
@@ -50,6 +49,7 @@
<span class="label"> 璁よ瘉绫诲瀷锛�</span> <span class="txt">{{item.authType == 0? '涓汉':'浼佷笟' }}</span>
<span class="label"> 鑱旂郴浜猴細</span> <span class="txt">{{item.linkName || '' }}</span>
<span class="label"> 鑱旂郴鏂瑰紡锛�</span> <span class="txt">{{item.telephone || '' }}</span>
+ <span class="label"> 鐢宠鏃堕棿锛�</span> <span class="txt">{{item.createTime || '' }}</span>
</div>
<template v-if="item.authType ==1">
<div class="line">
@@ -74,6 +74,15 @@
</div>
</div>
</div>
+ <div class="line bottom" v-if="tableData2&& tableData2.length>0 && tableData2[0].auditStatus == 1 && containPermissions(['business:identityinfo:audit'])" >
+ <el-form :model="form" ref="formCheck" :rules="rules">
+ <el-form-item label="璁よ瘉瀹℃牳璇存槑" style="font-size: 14px" prop="auditRemark">
+ <el-input type="textarea" rows="5" v-model="form.auditRemark" placeholder="璇疯緭鍏ヨ璇佸鏍稿娉�" v-trim/>
+ </el-form-item>
+ </el-form>
+ <el-button @click="checkDo(2)" type="primary" class="status-red">鍚屾剰</el-button>
+ <el-button @click="checkDo(3)" type="danger" >鎷掔粷</el-button>
+ </div>
</div>
</GlobalWindow>
</template>
@@ -82,7 +91,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import { getById } from '@/api/business/member'
-import { fetchList as renzhengList} from '@/api/business/identityInfo'
+import { fetchList as renzhengList,audit } from '@/api/business/identityInfo'
export default {
components: {
GlobalWindow
@@ -90,6 +99,11 @@
extends: BaseOpera,
data () {
return {
+ form: {
+ id: null,
+ auditRemark: null
+ },
+ rules: { auditRemark: [{ required: true, message: '璇疯緭鍏ヨ璇佸鏍稿娉�' }] },
id: '',
memberId: '',
visible: false,
@@ -101,7 +115,7 @@
total: 0,
tableData: {},
tableData1: {},
- tableData2:[],
+ tableData2: [],
page0: 1,
page1: 1,
loading: false,
@@ -129,6 +143,7 @@
this.tableData1 = {}
this.tableData2 = []
this.id = row.id
+ this.form.id = this.id
this.memberId = row.memberId
this.searchForm = {
type: 0,
@@ -152,12 +167,37 @@
close () {
},
+ checkDo (status) {
+ console.log( this.$refs.formCheck.length)
+ this.$refs.formCheck.validate((valid) => {
+ if (!valid) {
+ return
+ }
+ this.$dialog.actionConfirm('鎮ㄧ‘璁ゃ��' + (status === 3 ? '鎷掔粷' : '鍚屾剰') + '銆戣鐢宠鍚楋紵','鎿嶄綔纭')
+ .then(() => {
+ this.dealing = true
+ audit({
+ id: this.id,
+ auditStatus: status,
+ auditRemark: this.form.auditRemark
+ })
+ .then(res => {
+ this.$tip.apiSuccess('澶勭悊鎴愬姛')
+ this.getData()
+ this.isShowProblem = false
+ })
+ .finally(() => {
+ this.dealing = false
+ })
+ })
+ })
+ },
getRenzhengList () {
this.loading = true
renzhengList({
page: 1,
capacity: 1000000,
- model:{
+ model: {
memberId: this.memberId || -1,
id: this.id || -1
}
@@ -176,6 +216,15 @@
<style lang="scss" scoped>
@import '@/assets/style/variables.scss';
+.bottom{
+ text-align: center;
+ display: block;
+ height: auto;
+ background-color: #e4ecfe;
+ width: calc(100% - 32px);
+ z-index: 999;
+ padding: 16px;
+}
.renzheng{
margin: 0px 0px 50px 20px;
width: calc(100% - 60px);
--
Gitblit v1.9.3