From 64acc8138315de13252d94a18c4dd9f2eeb9afbd Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 23 Mar 2024 16:30:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/component/transverseAside.vue |  5 +++--
 src/views/merchant/list/index.vue        | 10 ++++++----
 src/views/merchant/shoptype/index.vue    | 24 ++++++++++++++++++------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/layout/component/transverseAside.vue b/src/layout/component/transverseAside.vue
index 3b86eaf..24dbed4 100644
--- a/src/layout/component/transverseAside.vue
+++ b/src/layout/component/transverseAside.vue
@@ -204,6 +204,7 @@ export default {
         let asideList = getMenuSider(this.columnsAsideList, HeadName)[0].children;
         const resData = this.setSendChildren(HeadName);
         if (resData.length <= 0) return false;
+      console.log('=======',resData.item);
         this.onColumnsAsideDown(resData.item[0].k);
         this.bus.$emit('oneCatName', resData.item[0].title);
         this.bus.$emit('setSendColumnsChildren', asideList || []);
@@ -219,7 +220,7 @@ export default {
 ::v-deep .el-scrollbar__bar.is-horizontal {
   height: 0;
 }
-.el-menu-horizontal-warp { 
+.el-menu-horizontal-warp {
   .el-menu.el-menu--horizontal {
     display: flex;
     height: 100%;
@@ -305,7 +306,7 @@ export default {
       width: 65px;
       border-radius: 0;
       margin-top: 0px;
-      
+
     }
   }
 }
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index daf56b0..9ea1798 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -82,7 +82,7 @@
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)">搜索</el-button>
-          <el-button size="small" @click="searchReset()">重置</el-button> 
+          <el-button size="small" @click="searchReset()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -133,16 +133,18 @@
             />
           </template>
         </el-table-column>
+        <el-table-column prop="mark" label="采购金额" min-width="120" />
+        <el-table-column prop="mark" label="销售金额" min-width="120" />
         <el-table-column prop="create_time" label="创建时间" min-width="150" />
         <el-table-column prop="margin" label="保证金" min-width="150">
           <template slot-scope="scope">
             <span>{{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}</span>
-            
+
           </template>
         </el-table-column>
         <el-table-column prop="sort" label="排序" min-width="100" />
         <el-table-column prop="mark" label="备注" min-width="200" />
-      
+
         <el-table-column label="操作" min-width="150" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -395,7 +397,7 @@ export default {
       this.drawer = false;
     },
     // 删除
-    handleDelete(id) { 
+    handleDelete(id) {
       this.$modalForm(merchantDeleteForm(id)).then(() => this.getList(""));
     },
     // 扣除保证金
diff --git a/src/views/merchant/shoptype/index.vue b/src/views/merchant/shoptype/index.vue
index 6058083..0ebc191 100644
--- a/src/views/merchant/shoptype/index.vue
+++ b/src/views/merchant/shoptype/index.vue
@@ -35,8 +35,18 @@
                         <span class="t-color red" v-if="scope.row.status == 2">审核不通过</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="审核人姓名" min-width="150" />
-                <el-table-column prop="phone" label="审核人手机号" min-width="150" />
+                <el-table-column label="审核人姓名" min-width="150">
+                    <template slot-scope="scope">
+                        <span class="t-color red" v-if="scope.row.check_name">{{ scope.row.check_name }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="审核人手机号" min-width="150">
+                    <template slot-scope="scope">
+                        <span v-if="scope.row.check_name">{{ scope.row.check_phone }}</span>
+                        <span v-else>-</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="create_time" label="申请时间" min-width="150" />
                 <el-table-column prop="update_time" label="审核时间" min-width="150">
                     <template slot-scope="scope">
@@ -66,7 +76,8 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item label="审核状态：" prop="status">
-                            <el-select v-model="auditForm.status" placeholder="请选择审核状态" style="width:100%;" :disabled="title=='详情'?true:false">
+                            <el-select v-model="auditForm.status" placeholder="请选择审核状态" style="width:100%;"
+                                :disabled="title == '详情' ? true : false">
                                 <el-option label="审核中" :value="0" v-if="title == '详情'"></el-option>
                                 <el-option label="同意" :value="1"></el-option>
                                 <el-option label="拒绝" :value="2"></el-option>
@@ -77,7 +88,7 @@
                         <el-form-item label="备注：" prop="fail_msg"
                             :rules="{ required: auditForm.status == 2 ? true : false, message: '拒绝原因不能为空', trigger: 'change' }">
                             <el-input type="textarea" :rows="2" placeholder="请输入备注:" v-model="auditForm.fail_msg"
-                                style="width:100%;" :disabled="title=='详情'?true:false">
+                                style="width:100%;" :disabled="title == '详情' ? true : false">
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -107,7 +118,8 @@
             </el-form>
             <div slot="footer">
                 <el-button type="primary" size="small" plain @click="statusAuditVisible = false">取消</el-button>
-                <el-button type="primary" class="submission" size="small" @click="handleSubmit()" v-if="title != '详情'">提交</el-button>
+                <el-button type="primary" class="submission" size="small" @click="handleSubmit()"
+                    v-if="title != '详情'">提交</el-button>
             </div>
         </el-dialog>
     </div>
@@ -162,7 +174,7 @@ export default {
         // 审核
         handleAudit(e) {
             this.auditForm = e;
-            this.auditForm.status =1;
+            this.auditForm.status = 1;
             this.statusAuditVisible = true;
             this.title = '修改审核状态';
         },