From d5fc82b308f1e4eea70f35d9684d0f26b8511013 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 14:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/business/OperaIdentityDetailWindow.vue | 72 +++++++++++------------------------
1 files changed, 23 insertions(+), 49 deletions(-)
diff --git a/admin/src/components/business/OperaIdentityDetailWindow.vue b/admin/src/components/business/OperaIdentityDetailWindow.vue
index 5866f44..3406795 100644
--- a/admin/src/components/business/OperaIdentityDetailWindow.vue
+++ b/admin/src/components/business/OperaIdentityDetailWindow.vue
@@ -72,17 +72,17 @@
<span class="label"> 瀹℃牳浜猴細</span> <span class="txt">{{item.editorName}} </span><span class="label">{{item.auditTime || '' }} </span>
<div style="margin-top: 20px"> <span class="label"> 瀹℃牳淇℃伅锛�</span> <span class="txt">{{item.auditRemark || '' }}</span></div>
</div>
- <div class="line bottom" v-if="item.auditStatus == 1" >
- <el-form :model="form" ref="form" :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>
</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)" :loading="dealing" type="primary" class="status-red">鍚屾剰</el-button>
+ <el-button @click="checkDo(3)" :loading="dealing" type="danger" >鎷掔粷</el-button>
+ </div>
</div>
</GlobalWindow>
</template>
@@ -91,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,approveDo } from '@/api/business/identityInfo'
+import { fetchList as renzhengList, audit } from '@/api/business/identityInfo'
export default {
components: {
GlobalWindow
@@ -99,6 +99,7 @@
extends: BaseOpera,
data () {
return {
+ dealing: false,
form: {
id: null,
auditRemark: null
@@ -110,50 +111,19 @@
activeTabs: 0,
type: 0,
info: {},
- pageSize: 10,
- page: 1,
- total: 0,
- tableData: {},
- tableData1: {},
tableData2: [],
- page0: 1,
- page1: 1,
- loading: false,
- export0: false,
- searchForm: {
- type: 0,
- startTime: null,
- endTime: null,
- optType: null,
- acceptMemberId: -1,
- releaseMemberId: -1,
- transactionNo: null
- }
+ loading: false
}
},
methods: {
open (title, row) {
this.title = title
this.visible = true
- this.activeTabs = 0
- this.type = 0
- this.page0 = 1
- this.pageSize = 10
- this.tableData = {}
- this.tableData1 = {}
this.tableData2 = []
this.id = row.id
this.form.id = this.id
+ this.form.auditRemark =null
this.memberId = row.memberId
- this.searchForm = {
- type: 0,
- startTime: null,
- endTime: null,
- optType: null,
- acceptMemberId: -1,
- releaseMemberId: -1,
- transactionNo: null
- }
this.getData()
},
getData () {
@@ -168,22 +138,26 @@
},
checkDo (status) {
- this.$refs.form.validate((valid) => {
+ console.log(this.$refs.formCheck.length)
+ this.$refs.formCheck.validate((valid) => {
if (!valid) {
return
}
- this.$dialog.actionConfirm('鎿嶄綔纭', '鎮ㄧ‘璁ゃ��' + (status == 3 ? '鎷掔粷' : '鍚屾剰') + '銆戣鐢宠鍚楋紵')
+ this.$dialog.actionConfirm('鎮ㄧ‘璁ゃ��' + (status === 3 ? '鎷掔粷' : '鍚屾剰') + '銆戣鐢宠鍚楋紵', '鎿嶄綔纭')
.then(() => {
this.dealing = true
- approveDo({
- id: this.dataId,
+ audit({
+ id: this.id,
auditStatus: status,
auditRemark: this.form.auditRemark
})
.then(res => {
- this.$tip.apiSuccess('澶勭悊鎴愬姛')
+ this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
this.getData()
- this.isShowProblem = false
+ this.$emit('success')
+ })
+ .catch(e => {
+ this.$tip.apiFailed(e)
})
.finally(() => {
this.dealing = false
--
Gitblit v1.9.3