From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 admin/src/components/business/OperaWithdrawDetailWindow.vue |   42 ++++++++++++++++++++++++++----------------
 1 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/admin/src/components/business/OperaWithdrawDetailWindow.vue b/admin/src/components/business/OperaWithdrawDetailWindow.vue
index 0d60c66..c662578 100644
--- a/admin/src/components/business/OperaWithdrawDetailWindow.vue
+++ b/admin/src/components/business/OperaWithdrawDetailWindow.vue
@@ -15,7 +15,7 @@
             {{ getStatusText(detailInfo.status) }}
           </span>
         </div>
-        <div class="info-grid">
+        <div class="info-grid" v-if="detailInfo.memberType ==2">
           <div class="info-item">
             <span class="label">闂ㄥ簵鍚嶇О锛�</span>
             <span class="value">{{ detailInfo.shopName }}</span>
@@ -23,6 +23,20 @@
           <div class="info-item">
             <span class="label">闂ㄥ簵鑱旂郴浜猴細</span>
             <span class="value">{{ detailInfo.linkName }}</span>
+          </div>
+          <div class="info-item">
+            <span class="label">鐢宠鏃堕棿锛�</span>
+            <span class="value">{{ detailInfo.createTime }}</span>
+          </div>
+        </div>
+        <div class="info-grid" v-if="detailInfo.memberType == 1">
+          <div class="info-item">
+            <span class="label">鍙告満濮撳悕锛�</span>
+            <span class="value">{{ detailInfo.memberName ||''}}</span>
+          </div>
+          <div class="info-item">
+            <span class="label">鍙告満鐢佃瘽锛�</span>
+            <span class="value">{{ detailInfo.memberTelephone||'' }}</span>
           </div>
           <div class="info-item">
             <span class="label">鐢宠鏃堕棿锛�</span>
@@ -42,7 +56,7 @@
           </div>
           <div class="info-item">
             <span class="label">鎻愮幇璐︽埛锛�</span>
-            <span class="value">{{ detailInfo.aliAccount }}</span>
+            <span class="value">{{ detailInfo.aliAccount || '' }}</span>
           </div>
           <div class="info-item">
             <span class="label">瀹℃牳浜猴細</span>
@@ -81,9 +95,9 @@
     </div>
 
     <div class="approval-form" v-if="detailInfo.status === 0">
-      <el-form ref="approvalForm" :model="approvalForm" :rules="approvalRules">
+      <el-form ref="approvalForm" :model="approvalForm" :rules="approvalForm.status == 1?approvalRules:approvalRules1" >
         <el-form-item label="瀹℃壒缁撴灉" prop="status">
-          <el-radio-group v-model="approvalForm.status">
+          <el-radio-group v-model="approvalForm.status" @change="changeRadio">
             <el-radio :label="1">閫氳繃</el-radio>
             <el-radio :label="2">椹冲洖</el-radio>
           </el-radio-group>
@@ -134,30 +148,26 @@
       approvalRules: {
         status: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'change' }]
       },
+      approvalRules1: {
+        status: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'change' }],
+        approveRemark: [{ required: true, message: '璇疯緭鍏ュ娉�', trigger: 'change' }]
+      },
       isWorking: {
         submit: false
       }
     }
   },
   methods: {
+    changeRadio(){
+      this.$refs.approvalForm.clearValidate()
+    },
     open (title, row) {
       this.title = title
       this.approvalForm.id = row.id
       this.approvalForm.status = 1
       this.approvalForm.approveRemark = ''
       getById(row.id).then(res => {
-        this.detailInfo = {
-          status: res.status,
-          shopName: res.shopName,
-          linkName: res.linkName,
-          createTime: res.createTime,
-          amount: res.amount,
-          bankCardNo: res.bankCardNo,
-          auditLogs: res.auditLogs || [],
-          updateUserName: res.updateUserName,
-          updateTime: res.updateTime,
-          approveRemark: res.approveRemark
-        }
+        this.detailInfo = res || {}
         this.visible = true
       }).catch(e => {
         this.$tip.apiFailed(e)

--
Gitblit v1.9.3