From 4bf36a5912b9470383adaa96bcded2d4febe4f3c Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 9 Jun 2022 14:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/parner/index.vue     |  7 +++++++
 src/views/parner/staff.vue     | 38 ++++++++++++++++++++++++++++++++++
 src/views/system/addLog.vue    |  1 +
 src/views/system/manageLog.vue | 11 ++--------
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/views/parner/index.vue b/src/views/parner/index.vue
index 980741a..df54743 100644
--- a/src/views/parner/index.vue
+++ b/src/views/parner/index.vue
@@ -36,6 +36,13 @@ export default {
     methods: {
         tabChange(index) {
             this.active = index
+            this.$router.push({
+                path: 'parner',
+                query: {
+                    ...this.$route.query,
+                    type: index
+                }
+            })
         },
         initTabs() {
           const btns = this.$store.state.btns
diff --git a/src/views/parner/staff.vue b/src/views/parner/staff.vue
index 28d5de7..db306a4 100644
--- a/src/views/parner/staff.vue
+++ b/src/views/parner/staff.vue
@@ -100,6 +100,13 @@
               <el-table-column prop="phone" label="手机号" align="center" width="120"></el-table-column>
               <el-table-column prop="partnerClassificationName" label="团队名称" align="center" min-width="200" show-overflow-tooltip></el-table-column>
               <el-table-column prop="roleName" label="授权角色" align="center" min-width="200" show-overflow-tooltip></el-table-column>
+              <el-table-column label="操作" align="center" width="300">
+                <template slot-scope="scope">
+                  <el-button type="text" v-auth="'/system:后台账号:重置密码'" @click="resetPassword(scope.row)">重置密码</el-button>
+                  <el-button type="text" v-auth="'/system:后台账号:删除'" @click="delStaff(scope.row)">删除</el-button>
+                  <el-button type="text" v-auth="'/system:后台账号:删除'" @click="remove(scope.row)">移除</el-button>
+                </template>
+              </el-table-column>
           </el-table>
           <div class="pagination">
               <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
@@ -419,6 +426,37 @@ export default {
         this.page = 1
         this.getList()
       },
+      // 删除
+      del(row) { 
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(`${this.api.delPartnerAccount}?accountIds=${row.accountId}`).then(res => {
+            util.successMsg("删除成功")
+            this.getList()
+          }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 移除
+      remove(row) { 
+        this.$confirm("确定要移除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(`${this.api.delPartnerAccount}?accountIds=${row.accountId}`).then(res => {
+            util.successMsg("移除成功")
+            this.getList()
+          }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 重置密码
+      resetPassword(row) {
+        const newPwd = Setting.initialPassword
+        this.$confirm(`重置后的密码为：${newPwd}，确定重置？`, "提示", { type: "warning" }).then(() => {
+          this.$get(`${this.api.resetPwd}?userId=${row.userId}&newPwd=${newPwd}`).then(res => {
+            util.successMsg("重置成功")
+          }).catch(res => {})
+        }).catch(() => {})
+      },
       // 添加
       add() {
         const curNode = this.$refs.orgTree.getCurrentNode()
diff --git a/src/views/system/addLog.vue b/src/views/system/addLog.vue
index 7040204..5310b02 100644
--- a/src/views/system/addLog.vue
+++ b/src/views/system/addLog.vue
@@ -182,6 +182,7 @@ export default {
                 versionName,
                 coverUrl: this.form.coverUrl,
                 logContents,
+                withdraw: 0,
                 open: draft, // 启用禁用，0:启用，1:禁用
                 draft // 状态，0:发布，1:草稿
             }
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index 151e37d..c995293 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -43,12 +43,11 @@
                             </div>
                             <div>
                               <template v-if="!i">
-                                <span class="withdraw" v-if="item.withdraw && !item.revoke">已撤回</span>
-                                <el-button v-if="item.revoke" style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button>
+                                <span class="withdraw" v-if="item.withdraw">已撤回</span>
+                                <el-button v-else style="margin-right: 10px" type="primary" size="small" @click="revoke(item)">撤销</el-button>
                               </template>
                               <el-switch v-model="item.open" :active-value="0" :inactive-value="1" @change="switchOff($event, item)" v-auth="'/system:日志更新:管理:开启日志'"></el-switch>
                             </div>
-                            
                         </div>
                         <ul class="detail">
                             <li v-for="(item, i) in item.logContents" :key="i">
@@ -107,13 +106,7 @@ export default {
                   const vers = []
                   const platformName = Setting.platformList.find(e => e.id === logList[0].platformId).name
                   this.platformName = platformName
-                  let isRevoke = 0
                   logList.map((e, i) => {
-                    // 是否显示撤销按钮，第一个已发布的才显示
-                    if (!e.open && !isRevoke) {
-                      e.revoke = 1
-                      isRevoke = 1
-                    }
                     e.logContents.map(n => {
                       n.content = n.content.split('\n')
                     })