From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh

---
 admin/src/views/business/managersSheNotice.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/business/managersSheNotice.vue b/admin/src/views/business/managersSheNotice.vue
index 44b59bd..68e973c 100644
--- a/admin/src/views/business/managersSheNotice.vue
+++ b/admin/src/views/business/managersSheNotice.vue
@@ -16,26 +16,34 @@
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:managers:create', 'business:managers:delete']">
         <li><el-button type="primary" @click="$refs.operaManagersWindow.open('鏂板缓浜嬩欢閫氱煡浜虹鐞�',{type:3})" icon="el-icon-plus" v-permissions="['business:managers:create']">鏂板缓</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button></li>
+        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button></li>
       </ul>
       <el-table
           :height="tableHeightNew"
         v-loading="isWorking.search"
         :data="tableData.list"
-        stripe
+        strip
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column prop="memberName" label="浜哄憳濮撳悕" min-width="100px"></el-table-column>
         <el-table-column prop="memberPhone" label="浜哄憳鎵嬫満鍙�" min-width="100px"></el-table-column>
-        <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px"></el-table-column>
+        <el-table-column prop="memberQwId" label="浼佸井ID" min-width="100px"></el-table-column>
+        <el-table-column prop="memberEmail" label="浜哄憳閭" min-width="100px">
+          <template slot-scope="{row}">
+             <div v-if="row.memberEmail">{{row.memberEmail}}</div>
+             <div v-else style="color: #dc362e;cursor: pointer"  title="鏆傛湭閰嶇疆浜哄憳閭锛岃鍓嶅線銆愪汉鍛樼鐞嗐��-銆愬憳宸ョ鐞嗐�戣彍鍗曠紪杈戣鍛樺伐淇℃伅锛岃缃偖绠变俊鎭�">
+                <el-button type="text" style="color: red"  title="鏆傛湭閰嶇疆浜哄憳閭锛岃鍓嶅線銆愪汉鍛樼鐞嗐��-銆愬憳宸ョ鐞嗐�戣彍鍗曠紪杈戣鍛樺伐淇℃伅锛岃缃偖绠变俊鎭�" icon="el-icon-error" >鏈厤缃�</el-button>
+             </div>
+          </template>
+        </el-table-column>
         <el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
         <el-table-column prop="isQw" label="浼佸井閫氱煡" min-width="80px">
           <template slot-scope="{row}">
             <el-switch v-model="row.isQw"  :active-value="1" :inactive-value="0" @change="updateInfo(row)"/>
           </template>
         </el-table-column>
-        <el-table-column prop="isQw" label="閭欢閫氱煡" min-width="80px">
+        <el-table-column prop="isEmail" label="閭欢閫氱煡" min-width="80px">
           <template slot-scope="{row}">
             <el-switch v-model="row.isEmail" :active-value="1" :inactive-value="0" @change="updateEmailInfo(row)"/>
           </template>
@@ -47,12 +55,9 @@
           v-if="containPermissions(['business:managers:update', 'business:managers:delete'])"
           label="鎿嶄綔"
           min-width="120"
-          fixed="right"
-        >
+          fixed="right" >
           <template slot-scope="{row}">
-<!--
-            <el-button type="text" @click="$refs.operaManagersWindow.open('缂栬緫璐d换浜轰俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:managers:update']">缂栬緫</el-button>
--->
+<!--  <el-button type="text" @click="$refs.operaManagersWindow.open('缂栬緫璐d换浜轰俊鎭〃', row)" icon="el-icon-edit" v-permissions="['business:managers:update']">缂栬緫</el-button> -->
             <el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:managers:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>

--
Gitblit v1.9.3