From 781a39d137d2b7bbddb1fbe2d02180c3b654b4c3 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sun, 4 Aug 2024 08:47:22 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E9=94=80=E5=94=AE=EF=BC=88=E5=BD=92?=
 =?UTF-8?q?=E5=B1=9E=E4=BA=BA=EF=BC=89=E6=98=BE=E7=A4=BA=202=EF=BC=9B?=
 =?UTF-8?q?=E6=B5=81=E6=B0=B4=E9=A1=B5=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/market/self/index.vue  |  9 +++++----
 ruoyi-ui/src/views/market/whole/index.vue |  9 +++++----
 ruoyi-ui/src/views/point/detail/index.vue | 20 +++++++++++---------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue
index 5a865d1..11a4091 100644
--- a/ruoyi-ui/src/views/market/self/index.vue
+++ b/ruoyi-ui/src/views/market/self/index.vue
@@ -202,7 +202,7 @@
       <el-table-column label="昨日H评比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
       <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
       <el-table-column label="评分" prop="score" align="center"  width="55" />
-      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="65" />
+      <el-table-column label="归属" prop="saleBindName" align="center" :formatter="idToName"  width="65" />
       <el-table-column label="创建时间" align="center" prop="bindTime" width="160">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime) }}</span>
@@ -555,9 +555,10 @@ export default {
     },
     idToName(row, column, cellValue) {
         // 查找对应 ID 的姓名
-      const person = this.saleList.find(p => p.id === parseInt(cellValue));
-      // 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
-      return person ? person.saleName : '--';
+      // const person = this.saleList.find(p => p.id === parseInt(cellValue));
+      // // 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
+      // return person ? person.saleName : '--';
+      return cellValue ? cellValue : '--';
     },
     handleOpen(row) {
       this.queryParams.id = row.id;
diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue
index bab50e5..eb12bc5 100644
--- a/ruoyi-ui/src/views/market/whole/index.vue
+++ b/ruoyi-ui/src/views/market/whole/index.vue
@@ -219,7 +219,7 @@
       <el-table-column label="昨日H评比(%)" prop="lastReturnVisitRate" align="center" :render-header="renderPrice"  width="120" />
       <el-table-column label="今日回访量" prop="todayReturnVisitNum" align="center" width="85" />
       <el-table-column label="评分" prop="score" align="center"  width="55" />
-      <el-table-column label="归属" prop="saleBindId" align="center"  :formatter="idToName"  width="75" />
+      <el-table-column label="归属" prop="saleBindName" align="center"  :formatter="idToName"  width="75" />
       <el-table-column label="创建时间" align="center" prop="bindTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.bindTime) }}</span>
@@ -636,9 +636,10 @@ export default {
     },
     idToName(row, column, cellValue) {
         // 查找对应 ID 的姓名
-      const person = this.saleList.find(p => p.id === parseInt(cellValue));
-      // 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
-      return person ? person.saleName : '--';
+      // const person = this.saleList.find(p => p.id === parseInt(cellValue));
+      // // 如果找到了对应的人员信息，返回姓名，否则返回空字符串或者错误提示
+      // return person ? person.saleBindName : '--';
+      return cellValue ? cellValue : '--';
     },
     handleOpen(row) {
       this.queryParams.id = row.id;
diff --git a/ruoyi-ui/src/views/point/detail/index.vue b/ruoyi-ui/src/views/point/detail/index.vue
index 7d57178..9e25e1b 100644
--- a/ruoyi-ui/src/views/point/detail/index.vue
+++ b/ruoyi-ui/src/views/point/detail/index.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-     <!-- <el-form-item label="分配账户" prop="account">
-       <el-input
-         v-model="queryParams.account"
-         placeholder="分配账户"
-         clearable
-         @keyup.enter.native="handleQuery"
-       />
-     </el-form-item> -->
       <el-form-item label="变更时间" prop="integralUpdateTime">
         <el-date-picker clearable
           v-model="queryParams.integralUpdateTime"
@@ -33,6 +25,14 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="营销账户" prop="account" v-if="userAccount =='admin' ">
+        <el-input
+          v-model="queryParams.account"
+          placeholder="请输入营销账户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -208,10 +208,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      userAccount:undefined
     };
   },
   created() {
+    this.userAccount = this.$store.state.user.name;
     this.getList();
   },
   methods: {