From b97396dd6d3f296be261f11b1f94220b76bded92 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sat, 27 Jul 2024 16:02:29 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9Badmin=E8=B4=A6=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=A1=B5=E9=9D=A2=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E5=BD=92=E5=B1=9E=E4=BA=BA=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E4=BB=A3=E7=90=86=E8=B4=A6=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/business/req/ReqBusStoreInfo.java   |  5 ++++
 ruoyi-ui/src/api/agent/info.js                | 11 ++++++-
 ruoyi-ui/src/views/market/self/index.vue      | 26 ++++++++++++++++-
 ruoyi-ui/src/views/market/whole/index.vue     | 27 ++++++++++++++++-
 ruoyi-ui/src/views/statistics/shop/index.vue  | 29 ++++++++++++++++++-
 5 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java
index 464e6e6..3b3cc17 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/business/req/ReqBusStoreInfo.java
@@ -28,6 +28,11 @@ public class ReqBusStoreInfo extends BaseEntity {
     @ApiModelProperty(name = "店铺名称")
     private String storeName;
 
+    /** 店铺归属 */
+    @ApiModelProperty(name = "绑定代理id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long bindId;
+
     /** 店铺归属 */
     @ApiModelProperty(name = "店铺归属人id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
diff --git a/ruoyi-ui/src/api/agent/info.js b/ruoyi-ui/src/api/agent/info.js
index 240d84f..72023a3 100644
--- a/ruoyi-ui/src/api/agent/info.js
+++ b/ruoyi-ui/src/api/agent/info.js
@@ -9,6 +9,15 @@ export function listInfo(query) {
   })
 }
 
+// 查询代理人列表
+export function listA(query) {
+  return request({
+    url: '/system/info/listA',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询代理管理详细
 export function getInfo(id) {
   return request({
@@ -50,4 +59,4 @@ export function deptList() {
     url: '/system/info/deptList',
     method: 'get'
   })
-}
\ No newline at end of file
+}
diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue
index b0b7841..ddd766b 100644
--- a/ruoyi-ui/src/views/market/self/index.vue
+++ b/ruoyi-ui/src/views/market/self/index.vue
@@ -42,7 +42,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="店铺归属" prop="saleBindId">
+          <el-form-item label="店铺归属" prop="saleBindId"  v-if="userAccount !='admin' ">
             <el-select
               v-model="queryParams.saleBindId"
               placeholder="店铺归属"
@@ -58,6 +58,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="店铺代理" prop="bindId"  v-if="userAccount =='admin' ">
+            <el-select
+              v-model="queryParams.bindId"
+              placeholder="店铺代理"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in agentList"
+                :key="dict.id"
+                :label="dict.agentAccount+' ：'+dict.agentName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="2"><el-form-item label="门店数量" ><span>{{map.storeCount}}</span></el-form-item></el-col>
         <el-col :span="2"><el-form-item label="掉线数量" ><span>{{map.noGrantCount}}</span></el-form-item></el-col>
@@ -398,6 +414,7 @@
 <script>
 import { listStore, changeReturnVisitStatus, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig, nowIntegral, getStoreStatistics } from "@/api/business/store";
 import { listSaleA} from "@/api/business/sale";
+import { listA} from "@/api/agent/info";
 
 export default {
   name: "Role",
@@ -478,6 +495,7 @@ export default {
     this.userAccount = this.$store.state.user.name;
     if(this.$store.state.user.name == 'admin'){
       this.isDisabled = true;
+      this.getListAgent();
     }
     this.getListSale();
     this.getList();
@@ -523,6 +541,12 @@ export default {
         }
       );
     },
+    getListAgent(){
+      listA(this.queryParams).then(response => {
+        this.agentList = response.data;
+        }
+      );
+    },
     getListSale() {
       listSaleA(this.queryParams).then(response => {
         this.saleList = response.data;
diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue
index 12d64b0..d2f6dde 100644
--- a/ruoyi-ui/src/views/market/whole/index.vue
+++ b/ruoyi-ui/src/views/market/whole/index.vue
@@ -42,7 +42,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="店铺归属" prop="saleBindId">
+          <el-form-item label="店铺归属" prop="saleBindId"  v-if="userAccount !='admin' ">
             <el-select
               v-model="queryParams.saleBindId"
               placeholder="店铺归属"
@@ -58,6 +58,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="店铺代理" prop="bindId"  v-if="userAccount =='admin' ">
+            <el-select
+              v-model="queryParams.bindId"
+              placeholder="店铺代理"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in agentList"
+                :key="dict.id"
+                :label="dict.agentAccount+' ：'+dict.agentName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="2"><el-form-item label="门店数量："><span>{{map.storeCount}}</span></el-form-item></el-col>
         <el-col :span="2"><el-form-item label="掉线数量："><span>{{map.noGrantCount}}</span></el-form-item></el-col>
@@ -464,6 +480,7 @@
 
 import { listStore, changeReturnVisitStatus, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig, refresh,getComment, getStoreStatistics,nowIntegral,updateProjectsConfig } from "@/api/business/store";
 import { listSaleA} from "@/api/business/sale";
+import { listA} from "@/api/agent/info";
 
 export default {
   name: "Role",
@@ -521,6 +538,7 @@ export default {
         content: undefined
       },
       saleList: [],
+      agentList:[],
       timeRange: ['00:00:00','23:59:59'],
       // 表单参数
       form: {quotaStatus:'1'},
@@ -550,6 +568,7 @@ export default {
     this.userAccount = this.$store.state.user.name;
     if(this.$store.state.user.name == 'admin'){
       this.isDisabled = true;
+      this.getListAgent();
     }
     this.getListSale();
     this.getList();
@@ -595,6 +614,12 @@ export default {
         }
       );
     },
+    getListAgent(){
+      listA(this.queryParams).then(response => {
+        this.agentList = response.data;
+        }
+      );
+    },
     storeStatistics() {
       getStoreStatistics().then(response => {
           this.map.storeCount = response.data.storeCount;
diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue
index 866d827..c79228c 100644
--- a/ruoyi-ui/src/views/statistics/shop/index.vue
+++ b/ruoyi-ui/src/views/statistics/shop/index.vue
@@ -42,7 +42,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-          <el-form-item label="店铺归属" prop="saleBindId">
+          <el-form-item label="店铺归属" prop="saleBindId"  v-if="userAccount !='admin' ">
             <el-select
               v-model="queryParams.saleBindId"
               placeholder="店铺归属"
@@ -58,6 +58,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="店铺代理" prop="bindId"  v-if="userAccount =='admin' ">
+            <el-select
+              v-model="queryParams.bindId"
+              placeholder="店铺代理"
+              filterable
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in agentList"
+                :key="dict.id"
+                :label="dict.agentAccount+' ：'+dict.agentName"
+                :value="dict.id"
+              />
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="2"><el-form-item label="门店数量：" ><span>{{map.storeCount}}</span></el-form-item></el-col>
         <el-col :span="2"><el-form-item label="掉线数量：" ><span>{{map.noGrantCount}}</span></el-form-item></el-col>
@@ -372,6 +388,7 @@
 
 import { listStore, changeReturnVisitStatus, getMtUrl, changeSelfDeliveryStatus, getStoreConfig, updateStoreConfig, getStoreStatistics, generateWord, nowIntegral, setUpPrize } from "@/api/business/store";
 import { listSaleA} from "@/api/business/sale";
+import { listA} from "@/api/agent/info";
 
 export default {
   name: "Role",
@@ -459,6 +476,10 @@ export default {
     };
   },
   created() {
+    this.userAccount = this.$store.state.user.name;
+    if(this.$store.state.user.name == 'admin'){
+      this.getListAgent();
+    }
     this.getListSale();
     this.getList();
     this.storeStatistics();
@@ -504,6 +525,12 @@ export default {
         }
       );
     },
+    getListAgent(){
+      listA(this.queryParams).then(response => {
+        this.agentList = response.data;
+        }
+      );
+    },
     getListSale() {
       listSaleA(this.queryParams).then(response => {
         this.saleList = response.data;