From 3f0e76780f5db123a279e3cd3fa8df47a9ac84c3 Mon Sep 17 00:00:00 2001
From: TonyStark <651027268@qq.com>
Date: Wed, 21 May 2025 15:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E4=BC=81=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9C=AC=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=86=85=E5=AE=B9=E4=B8=BA=EF=BC=8C=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E3=80=81=E9=87=8D=E5=AE=A1=EF=BC=8C=E5=8F=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E3=80=81=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E5=90=88=E7=90=86=E6=80=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/merchantVerification.js      | 13 +--
 src/api/business/userVerification.js          | 15 +---
 .../business/merchantVerification/index.vue   | 86 +++++++++----------
 src/views/business/userInfoBus/index.vue      | 18 ----
 src/views/business/userVerification/index.vue | 45 ++++++----
 5 files changed, 72 insertions(+), 105 deletions(-)

diff --git a/src/api/business/merchantVerification.js b/src/api/business/merchantVerification.js
index 70dce78..cd3a0bd 100644
--- a/src/api/business/merchantVerification.js
+++ b/src/api/business/merchantVerification.js
@@ -44,18 +44,9 @@ export function delMerchantVerification(id) {
 }
 
 // 实名认证不通过
-export function auditBusRefuse(data) {
+export function merchantAudit(data) {
   return request({
-    url: '/business/userVerification/auditRefuse' ,
-    method: 'post',
-    data:data
-  })
-}
-
-// 实名认证通过
-export function auditBusPass(data) {
-  return request({
-    url: '/business/userVerification/auditPass' ,
+    url: '/business/merchantVerification/merchantVerificationAudit' ,
     method: 'post',
     data:data
   })
diff --git a/src/api/business/userVerification.js b/src/api/business/userVerification.js
index 7f1bb91..713207b 100644
--- a/src/api/business/userVerification.js
+++ b/src/api/business/userVerification.js
@@ -43,19 +43,10 @@ export function delUserVerification(id) {
   })
 }
 
-// 实名认证不通过
-export function auditRefuse(data) {
+// 实名认证审核
+export function userVerificationAudit(data) {
   return request({
-    url: '/business/userVerification/auditRefuse' ,
-    method: 'post',
-    data:data
-  })
-}
-
-// 实名认证通过
-export function auditPass(data) {
-  return request({
-    url: '/business/userVerification/auditPass' ,
+    url: '/business/userVerification/userVerificationAudit' ,
     method: 'post',
     data:data
   })
diff --git a/src/views/business/merchantVerification/index.vue b/src/views/business/merchantVerification/index.vue
index 9762f8c..31aedb4 100644
--- a/src/views/business/merchantVerification/index.vue
+++ b/src/views/business/merchantVerification/index.vue
@@ -61,11 +61,7 @@
           <el-tag type="warning" v-if="scope.row.status == '3'">待审核</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="认证时间" align="center" prop="authenticationDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.authenticationDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="审核时间" align="center" prop="authenticationDate" width="180"/>
       <el-table-column label="失败原因" align="center" prop="failureReason"/>
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -124,34 +120,23 @@
     <!--  认证审核  -->
     <el-dialog :title="title" :visible.sync="auditOpen" width="700px" append-to-body>
       <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="auto">
-        <el-form-item label="注册姓名：">
-          {{auditForm.userInfoName}}
-        </el-form-item>
-        <el-form-item label="认证姓名：">
-          {{auditForm.fullName}}
-        </el-form-item>
-        <el-form-item label="注册身份证号：">
-          {{auditForm.idCardShow}}
-        </el-form-item>
-        <el-form-item label="认证身份证号：">
-          {{auditForm.idCardNumber}}
+        <el-form-item label="注册商企名称：">
+          {{auditForm.merchantInfoName}}
         </el-form-item>
-        <el-form-item label="国籍简码：">
-          {{auditForm.nationality}}
+        <el-form-item label="认证商企名称：">
+          {{auditForm.merchantName}}
         </el-form-item>
-        <el-form-item label="出生日期：">
-          <template slot-scope="scope">
-            <span>{{ parseTime(auditForm.birthDate, '{y}-{m}-{d}') }}</span>
-          </template>
+        <el-form-item label="注册法人名称：">
+          {{auditForm.legalPersonInfoName}}
         </el-form-item>
-        <el-form-item label="身份证正面照：">
-          {{auditForm.idCardFrontImagePath}}
+        <el-form-item label="认证法人名称：">
+          {{auditForm.legalPersonName}}
         </el-form-item>
-        <el-form-item label="身份证反面照：">
-          {{auditForm.idCardBackImagePath}}
+        <el-form-item label="法人身份证号：">
+          {{auditForm.legalPersonIdCardShow}}
         </el-form-item>
-        <el-form-item label="手持身份证照：">
-          {{auditForm.userWithIdCardImagePath}}
+        <el-form-item label="营业执照：">
+          {{auditForm.businessLicenseNumber}}
         </el-form-item>
         <el-form-item label="认证失败原因：" prop="failureReason">
           <el-input v-model="auditForm.failureReason" placeholder="请输入认证失败原因" />
@@ -200,7 +185,7 @@
         <el-form-item label="开户银行：">
           {{ form.bankName }}
         </el-form-item>
-        <el-form-item label="认证时间" prop="authenticationDate">
+        <el-form-item label="审核时间" prop="authenticationDate">
           <el-date-picker clearable
                           v-model="form.authenticationDate"
                           type="datetime"
@@ -225,7 +210,8 @@ import {
   getMerchantVerification,
   delMerchantVerification,
   addMerchantVerification,
-  updateMerchantVerification
+  updateMerchantVerification,
+  merchantAudit
 } from "@/api/business/merchantVerification";
 
 export default {
@@ -290,6 +276,9 @@ export default {
         legalPersonIdCard: [
           { required: true, message: "法人身份证号不能为空", trigger: "blur" }
         ],
+        failureReason: [
+          { required: true, message: "审核失败原因不能为空", trigger: "blur" }
+        ],
       }
     };
   },
@@ -310,6 +299,7 @@ export default {
     cancel() {
       this.open = false;
       this.detailOpen = false;
+      this.auditOpen = false;
       this.reset();
     },
     // 表单重置
@@ -442,27 +432,33 @@ export default {
     submitRefuse() {
       this.$refs["auditForm"].validate(valid => {
         if (valid) {
-          this.buttonLoading = true;
-          auditBusRefuse(this.auditForm).then(response => {
-            this.$modal.msgSuccess("审核结果：拒绝");
-            this.auditOpen = false;
-            this.getList();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
+          this.$modal.confirm('是否【拒绝】商户"' + this.auditForm.merchantName + '"的认证申请？').then(() => {
+              this.buttonLoading = true;
+              this.auditForm.status = "2";
+              merchantAudit(this.auditForm).then(response => {
+                this.$modal.msgSuccess("审核结果：拒绝");
+                this.auditOpen = false;
+                this.getList();
+              }).finally(() => {
+                this.buttonLoading = false;
+              });
+          })
         }
       });
     },
     /** 审核通过*/
     submitPass() {
       this.buttonLoading = true;
-      auditBusPass(this.auditForm).then(response => {
-        this.$modal.msgSuccess("审核结果：通过");
-        this.auditOpen = false;
-        this.getList();
-      }).finally(() => {
-        this.buttonLoading = false;
-      });
+      this.auditForm.status = "1";
+      this.$modal.confirm('是否【通过】商户"' + this.auditForm.merchantName + '"的认证申请？').then(() => {
+          merchantAudit(this.auditForm).then(response => {
+            this.$modal.msgSuccess("审核结果：通过");
+            this.auditOpen = false;
+            this.getList();
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+      })
     }
   }
 };
diff --git a/src/views/business/userInfoBus/index.vue b/src/views/business/userInfoBus/index.vue
index 504e461..9b72916 100644
--- a/src/views/business/userInfoBus/index.vue
+++ b/src/views/business/userInfoBus/index.vue
@@ -49,17 +49,6 @@
           v-hasPermi="['business:userInfoBus:edit']"
         >{{ $t('common.button.edit') }}</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['business:userInfoBus:remove']"
-        >{{ $t('common.button.delete') }}</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -91,13 +80,6 @@
             @click="handleUpdate(scope.row)"
             v-hasPermi="['business:userInfoBus:edit']"
           >{{ $t('common.button.edit') }}</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['business:userInfoBus:remove']"
-          >{{ $t('common.button.delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/business/userVerification/index.vue b/src/views/business/userVerification/index.vue
index c1467d6..e438fa4 100644
--- a/src/views/business/userVerification/index.vue
+++ b/src/views/business/userVerification/index.vue
@@ -65,7 +65,7 @@
           <el-tag type="warning" v-if="scope.row.status == '3'">待审核</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="认证时间" align="center" prop="authenticationDate" width="180">
+      <el-table-column label="审核时间" align="center" prop="authenticationDate" width="180">
       </el-table-column>
       <el-table-column label="失败原因" align="center" prop="failureReason" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
@@ -208,7 +208,7 @@
                   <el-tag type="danger" v-if="form.biometrics == '0'">未认证</el-tag>
                   <el-tag type="success" v-if="form.biometrics == '1'">已认证</el-tag>
                 </el-form-item>
-                <el-form-item label="认证时间：">
+                <el-form-item label="审核时间：">
                   {{ form.authenticationDate}}
                 </el-form-item>
               </el-form>
@@ -220,7 +220,8 @@
 </template>
 
 <script>
-import { listUserVerification, getUserVerification, delUserVerification, addUserVerification, updateUserVerification, auditRefuse, auditPass } from "@/api/business/userVerification";
+import { listUserVerification, getUserVerification, delUserVerification, addUserVerification, updateUserVerification, userVerificationAudit } from "@/api/business/userVerification";
+import {merchantAudit} from "@/api/business/merchantVerification";
 
 export default {
   name: "UserVerification",
@@ -451,27 +452,33 @@ export default {
     submitRefuse() {
       this.$refs["auditForm"].validate(valid => {
         if (valid) {
-          this.buttonLoading = true;
-          auditRefuse(this.auditForm).then(response => {
-            this.$modal.msgSuccess("审核结果：拒绝");
-            this.auditOpen = false;
-            this.getList();
-          }).finally(() => {
-            this.buttonLoading = false;
-          });
+          this.$modal.confirm('是否【拒绝】用户"' + this.auditForm.userInfoName + '"的认证申请？').then(() => {
+            this.buttonLoading = true;
+            this.auditForm.status = "2";
+            userVerificationAudit(this.auditForm).then(response => {
+              this.$modal.msgSuccess("审核结果：拒绝");
+              this.auditOpen = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          })
         }
       });
     },
     /** 审核通过*/
     submitPass() {
-      this.buttonLoading = true;
-      auditPass(this.auditForm).then(response => {
-        this.$modal.msgSuccess("审核结果：通过");
-        this.auditOpen = false;
-        this.getList();
-      }).finally(() => {
-        this.buttonLoading = false;
-      });
+      this.$modal.confirm('是否【通过】用户"' + this.auditForm.userInfoName + '"的认证申请？').then(() => {
+        this.buttonLoading = true;
+        this.auditForm.status = "1";
+        userVerificationAudit(this.auditForm).then(response => {
+          this.$modal.msgSuccess("审核结果：通过");
+          this.auditOpen = false;
+          this.getList();
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      })
     },
   }
 };