From b47caf16a0685e5b1b160ba4959e8a9887366741 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Thu, 25 Sep 2025 10:32:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?##=20Opt=20-=20=E5=A5=96=E9=87=91=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settlementCenter/bonusDetail/index.vue | 76 ++----------------- 1 file changed, 5 insertions(+), 71 deletions(-) diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index 2433a1e..553118a 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -183,91 +183,25 @@ /> - - - - - - - - - - - - Date: Thu, 25 Sep 2025 10:50:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?##=20Opt=20-=20=E5=A5=96=E9=87=91=E6=B1=87?= =?UTF-8?q?=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../settlementCenter/totalBonus/index.vue | 97 +------------------ 1 file changed, 5 insertions(+), 92 deletions(-) diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue index 9d2e040..ed835be 100644 --- a/src/views/settlementCenter/totalBonus/index.vue +++ b/src/views/settlementCenter/totalBonus/index.vue @@ -164,109 +164,22 @@ /> - - - - - - - - - - - - - - - Date: Thu, 25 Sep 2025 15:01:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(framework):=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=20=E6=96=B9=E6=A1=88=E4=B8=80=E7=A7=BB?= =?UTF-8?q?=E9=99=A4memberCode=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/framework/architecture/azjg2.vue | 745 +++++++++--------- .../framework/architecture/mixins/tab-bar.js | 4 +- 2 files changed, 354 insertions(+), 395 deletions(-) diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue index 4dab8c4..92d2512 100644 --- a/src/views/framework/architecture/azjg2.vue +++ b/src/views/framework/architecture/azjg2.vue @@ -8,191 +8,114 @@
- - - - - - + /> + + + - + + @blur="getChildNodeList" + /> + + + - - + + - + + + + + + + + + + + + + + + + + - + +
-
-
-
- -
{{ item.name }}
-
+
+
+ +
-
-
-
- -
+
+
+
+
+
- -
-
-
-
- - -
-
-
-
{{ '会员编号' }}
-
{{ treeData.memberCode }}
-
+ -
-
{{ '会员姓名' }}
-
{{ treeData.name }}
-
-
-
安置部门
-
{{ `第${treeData.placeDept}部门` }}
-
-
-
{{ '支付日期' }}
-
{{ treeData.payDate }}
-
-
-
- -
{{ '结算国家' }}
-
-
-
-
-
{{ '业绩' }}({{ isLocals() }})
-
{{ '真实新增' }}
-
首购新增
-
复购新增
-
真实累计
-
首购累计
-
复购累计
-
首购结余
-
复购结余
- -
-
-
左区
-
{{ treeData.leftRealNewPv }}
-
{{ treeData.leftFirstPurchaseAdd }}
-
- {{ treeData.leftRepeatPurchaseAdd }} -
-
{{ treeData.leftRealTotal }}
-
{{ treeData.leftFirstTotal }}
-
- {{ treeData.leftRepeatPurchaseTotal }} -
-
{{ treeData.leftFirstSurplus }}
-
- {{ treeData.leftRepeatPurchaseSurplus }} -
- -
-
-
右区
-
{{ treeData.rightRealNewPv }}
-
- {{ treeData.rightFirstPurchaseAdd }} -
-
- {{ treeData.rightRepeatPurchaseAdd }} -
-
{{ treeData.rightRealTotal }}
-
{{ treeData.rightFirstTotal }}
-
- {{ treeData.rightRepeatPurchaseTotal }} -
-
{{ treeData.rightFirstSurplus }}
-
- {{ treeData.rightRepeatPurchaseSurplus }} -
- -
-
-
-
-
下载图片
-
复制文字
- -
-
-
{{ '会员编号' }}:{{ treeData.memberCode }}
{{ '会员姓名' }}:{{ treeData.name }}
@@ -242,53 +165,39 @@ - diff --git a/src/views/framework/architecture/mixins/tab-bar.js b/src/views/framework/architecture/mixins/tab-bar.js index d2aa412..7fc6d51 100644 --- a/src/views/framework/architecture/mixins/tab-bar.js +++ b/src/views/framework/architecture/mixins/tab-bar.js @@ -7,8 +7,8 @@ export default { path: 'azjg' } // { - // name: '方案五', - // path: 'azjg5' + // name: '方案二', + // path: 'azjg2' // } ] } From 1ab58e618951f6e3e9ee70ae40fec44d4d2b99e5 Mon Sep 17 00:00:00 2001 From: woody Date: Fri, 26 Sep 2025 10:43:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(arch):=20=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E6=96=B9=E6=A1=88=E4=BA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/archityecture.js | 17 + src/views/framework/architecture/azjg2.vue | 1080 +++++++---------- src/views/framework/architecture/index.vue | 10 +- .../framework/architecture/mixins/tab-bar.js | 8 +- src/views/information/member/index.vue | 3 - 5 files changed, 430 insertions(+), 688 deletions(-) diff --git a/src/api/archityecture.js b/src/api/archityecture.js index e5f23c8..c04e11c 100644 --- a/src/api/archityecture.js +++ b/src/api/archityecture.js @@ -61,3 +61,20 @@ export function getChildList(params) { params }) } + +// 查询推荐架构列表 +export function getAzFrameworkList(params) { + return request({ + url: '/member/manage/member-structure/three-framework-list', + method: 'get', + params + }) +} + +export function getAzFramewrokNodeInfo(params) { + return request({ + url: '/member/manage/member-structure/pointDetail', + method: 'get', + params + }) +} diff --git a/src/views/framework/architecture/azjg2.vue b/src/views/framework/architecture/azjg2.vue index 92d2512..d7a4ae9 100644 --- a/src/views/framework/architecture/azjg2.vue +++ b/src/views/framework/architecture/azjg2.vue @@ -13,7 +13,6 @@ @@ -39,7 +37,6 @@ - - - - - - - -
-
- - -
-
-
-
-
- -
-
-
- +
+
+ + -
-
{{ '会员编号' }}:{{ treeData.memberCode }}
-
{{ '会员姓名' }}:{{ treeData.name }}
-
{{ '支付日期' }}:{{ treeData.payDate }}
-
{{ '业绩' }}({{ isLocals() }})  左区  右区
-
- 真实新增  {{ treeData.leftRealNewPv }}  {{ - treeData.rightRealNewPv - }} -
-
- 首购新增  {{ treeData.leftFirstPurchaseAdd }}  {{ - treeData.rightFirstPurchaseAdd - }} -
-
- 复购新增{{ treeData.leftRepeatPurchaseAdd }}   - {{ treeData.rightRepeatPurchaseAdd }} -
-
- 真实累计{{ treeData.leftRealTotal }}  {{ - treeData.rightRealTotal - }} -
-
- 首购累计{{ treeData.leftFirstTotal }}  {{ - treeData.rightFirstTotal - }} -
-
- 复购累计 {{ treeData.leftRepeatPurchaseTotal }}  {{ - treeData.rightRepeatPurchaseTotal - }} -
-
- 首购结余{{ treeData.leftFirstSurplus }}  {{ - treeData.rightFirstSurplus - }} -
-
- 复购结余 {{ treeData.leftRepeatPurchaseSurplus }}  {{ - treeData.rightRepeatPurchaseSurplus - }} + + + + + + + + + + + + + + + +
+ + {{ nodeInfoDialogVisible }} + + + +
+
+ {{ queryParams.memberCode }} + {{ nodeInfo.position }} +
+
+
+ + 会员编号: + {{ nodeInfo.memberCode }} + + + 点位信息: + {{ nodeInfo.memberName }} + + + 荣誉奖衔: + {{ nodeInfo.awardsName }} + + + 隶属体系: + {{ nodeInfo.vertexName }} + + + 创建时间: + {{ nodeInfo.creationTime }} + + +
+ +
+ diff --git a/src/views/framework/architecture/index.vue b/src/views/framework/architecture/index.vue index 6089223..00a9e17 100644 --- a/src/views/framework/architecture/index.vue +++ b/src/views/framework/architecture/index.vue @@ -184,7 +184,7 @@ export default { moren: 'azjg', queryParams: { memberSettlePeriodId: '', // 期数 - memberCode: 'KG71227311', // 会员编号 + memberCode: '', // 会员编号 stage: 1, stageStatus: '', childNode: '' @@ -326,11 +326,7 @@ export default {
) : (
-
- -
空点位
-
)}
@@ -392,14 +388,14 @@ export default { }, resetHandle() { - this.$refs.topMemberSelect.reset() this.queryParams = { memberSettlePeriodId: '', // 期数 memberCode: '', // 会员编号 stage: 7, type: 1 } - this.getSearch() + this.data = {} + this.childNodeList = [] }, getChildNodeList() { if (!this.queryParams.memberCode) { diff --git a/src/views/framework/architecture/mixins/tab-bar.js b/src/views/framework/architecture/mixins/tab-bar.js index 7fc6d51..4cf16f3 100644 --- a/src/views/framework/architecture/mixins/tab-bar.js +++ b/src/views/framework/architecture/mixins/tab-bar.js @@ -5,11 +5,11 @@ export default { { name: '方案一', path: 'azjg' + }, + { + name: '方案二', + path: 'azjg2' } - // { - // name: '方案二', - // path: 'azjg2' - // } ] } } diff --git a/src/views/information/member/index.vue b/src/views/information/member/index.vue index b1fdc01..69d548d 100644 --- a/src/views/information/member/index.vue +++ b/src/views/information/member/index.vue @@ -398,9 +398,6 @@ :data="tableData" :height="isActive ? '480px' : '630px'" > - v-loading="loading" style="width: 100%" :header-cell-style="{ - background: '#EEEEEE' }" :row-class-name="tableRowClassName" - @selection-change="handleSelectionChange" >