From 44c905672dc5c9e986660396664b7fc9f9a3526c Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Thu, 4 Sep 2025 14:34:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(CashDetails):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=B1=87=E7=8E=87=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/financial/cashDetails/index.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue
index cd9fe55..e2144d0 100644
--- a/src/views/financial/cashDetails/index.vue
+++ b/src/views/financial/cashDetails/index.vue
@@ -357,13 +357,6 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              v-if="showData.exchangeRate"
-              align="center"
-              prop="exchangeRate"
-              :label="'汇率'"
-            />
-
             <!-- lll -->
             <el-table-column
               v-if="showData.creationTime"

From df46562d6e803afb14d1a6e600f94ce2188a927e Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Thu, 11 Sep 2025 10:46:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/deletedeadlock.js                     |  17 ++
 src/router/index.js                           |   7 +
 .../specialBusiness/deleteDeadLock/index.vue  | 162 ++++++++++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 src/api/deletedeadlock.js
 create mode 100644 src/views/information/specialBusiness/deleteDeadLock/index.vue

diff --git a/src/api/deletedeadlock.js b/src/api/deletedeadlock.js
new file mode 100644
index 0000000..fb4d62f
--- /dev/null
+++ b/src/api/deletedeadlock.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+// 删除死点列表查询
+export function getdeleteDeadLockList(params) {
+  return request({
+    url: '/member/manager/deleteDeadLock/list',
+    method: 'get',
+    params
+  })
+}
+
+export function getdeleteDeadLockDel(data) {
+  return request({
+    url: '/member/manager/deleteDeadLock/delete',
+    method: 'post',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 41af54c..2bcbd23 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -461,8 +461,15 @@ export const constantRoutes = [
             name: 'MemberRenewal',
             component: () => import('@/views/information/specialBusiness/memberRenewal/index'),
             meta: { title: '会员续约' }
+          },
+          {
+            path: 'deleteDeadLock',
+            name: 'DeleteDeadLock',
+            component: () => import('@/views/information/specialBusiness/deleteDeadLock/index'),
+            meta: {title: '删除死点'}
           }
 
+
         ]
       },
 
diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue
new file mode 100644
index 0000000..acf82a4
--- /dev/null
+++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="page">
+    <topBar v-if="topList.length > 0" :topList="topList" :moren="moren" />
+
+    <!-- 搜索框 -->
+    <div class="thetopbox">
+      <el-form ref="queryParams" :model="queryParams" label-width="100px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="会员编号" prop="memberCode">
+              <el-input clearable v-model="queryParams.memberCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" style="margin-left: 20px">
+            <div class="searchbox">
+              <el-button class="searchbtn" @click="getSearch">搜索</el-button>
+              <el-button @click="reChongzhi">重置</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+
+    <!-- 表格 -->
+    <div class="main">
+      <div class="maintable">
+        <el-table
+          :data="tableData"
+          height="750px"
+          v-loading="loading"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+        >
+          <el-table-column align="center" prop="memberCode" label="会员编号" />
+          <el-table-column align="center" prop="memberName" label="会员姓名" />
+          <el-table-column align="center" prop="pkSettleGrade" label="结算等级" />
+          <el-table-column align="center" prop="parMemberCode" label="推荐编号" />
+          <el-table-column align="center" prop="placeMemberCode" label="安置编号" />
+          <el-table-column align="center" prop="placeDept" label="安置位置" />
+          <el-table-column align="center" prop="creationTime" label="注册时间" />
+
+          <!-- 删除按钮列 -->
+          <el-table-column label="操作" align="center" width="100">
+            <template slot-scope="scope">
+              <el-button
+                type="text"
+                size="mini"
+                @click="handleDelete(scope.row.memberCode)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
+    <!-- 分页 -->
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getSearch"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from "@/components/topBar";
+import * as spe from "@/api/deletedeadlock";
+
+export default {
+  name: "DeleteDeadLock",
+  components: { topBar },
+  data() {
+    return {
+      loading: false,
+      moren: "deleteDeadLock",
+      topList: [
+        {
+          name: "删除死点",
+          path: "deleteDeadLock",
+        },
+      ],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50,
+        memberCode: "",
+      },
+      total: 0,
+      tableData: [],
+    };
+  },
+  created() {
+    this.getSearch();
+  },
+  methods: {
+    // 查询
+    getSearch() {
+      this.loading = true;
+      spe.getdeleteDeadLockList(this.queryParams).then((res) => {
+        this.loading = false;
+        this.tableData = res.rows;
+        this.total = res.total;
+      });
+    },
+    // 重置
+    reChongzhi() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 50,
+        memberCode: "",
+      };
+      this.getSearch();
+    },
+    // 删除
+    handleDelete(memberCode) {
+      this.$confirm(`是否删除会员编号：${memberCode} ?`, "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        spe.getdeleteDeadLockDel({memberCode:memberCode}).then(() => {
+          this.$message.success("删除成功");
+          this.getSearch();
+        });
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.page {
+  padding: 10px 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .thetopbox {
+    padding-top: 20px;
+    background: #ffffff;
+    border-radius: 8px;
+    .searchbox {
+      display: flex;
+      align-items: center;
+      .searchtitle {
+        margin-right: 10px;
+      }
+      .searchbtn {
+        background: #c8161d;
+        color: #ffffff;
+      }
+    }
+  }
+  .main {
+    // margin-top: 20px;
+    background: #ffffff;
+    border-radius: 8px;
+    box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+  }
+}
+</style>
+  
\ No newline at end of file

From c853b2420738b829eb62e7581a2273691a7efc51 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Thu, 11 Sep 2025 13:34:24 +0800
Subject: [PATCH 3/4] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialBusiness/deleteDeadLock/index.vue           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue
index acf82a4..19ee7f8 100644
--- a/src/views/information/specialBusiness/deleteDeadLock/index.vue
+++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue
@@ -22,7 +22,6 @@
     </div>
 
     <!-- 表格 -->
-    <div class="main">
       <div class="maintable">
         <el-table
           :data="tableData"
@@ -53,7 +52,6 @@
           </el-table-column>
         </el-table>
       </div>
-    </div>
 
     <!-- 分页 -->
     <pagination
@@ -121,8 +119,12 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
-        spe.getdeleteDeadLockDel({memberCode:memberCode}).then(() => {
-          this.$message.success("删除成功");
+        spe.getdeleteDeadLockDel({memberCode:memberCode}).then((res) => {
+          if(res.code == 200){
+            this.$message.success("删除成功");
+          }else{
+            this.$message.error(res.msg);
+          }
           this.getSearch();
         });
       });

From 82dc73366cdd79007434087a95df9d3d6118f387 Mon Sep 17 00:00:00 2001
From: zhangheng <test@test.test>
Date: Thu, 11 Sep 2025 13:54:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=94=E5=9B=9E=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/information/specialBusiness/deleteDeadLock/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/information/specialBusiness/deleteDeadLock/index.vue b/src/views/information/specialBusiness/deleteDeadLock/index.vue
index 19ee7f8..081cadb 100644
--- a/src/views/information/specialBusiness/deleteDeadLock/index.vue
+++ b/src/views/information/specialBusiness/deleteDeadLock/index.vue
@@ -122,8 +122,6 @@ export default {
         spe.getdeleteDeadLockDel({memberCode:memberCode}).then((res) => {
           if(res.code == 200){
             this.$message.success("删除成功");
-          }else{
-            this.$message.error(res.msg);
           }
           this.getSearch();
         });