Эх сурвалжийг харах

fix:任务统计详情增加查询字段

刘恒 1 жил өмнө
parent
commit
d3eed74200

+ 6 - 2
src/components/menu/SideMenu.vue

@@ -30,7 +30,7 @@
             >
               <img
                 src="@/assets/img/new_logo.png"
-                style="width: 30px; height: 30px"
+                style="width: 20px; height: 20px"
               />
               <h1 style="font-size: 18px; margin-left: 5px">掌柜科技</h1>
             </div>
@@ -39,7 +39,7 @@
             <div style="display: flex; align-items: center" @click="toIndex">
               <img
                 src="@/assets/img/title.png"
-                style="width: 30px; height: 30px"
+                style="width: 20px; height: 20px"
               />
               <h1 style="font-size: 18px; margin-left: 5px">晋掌柜控制台</h1>
             </div>
@@ -219,4 +219,8 @@ export default {
   box-shadow: inset 0px 0px 4px 0px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
 }
+/deep/.el-drawer__body{
+  padding: 0 20px;
+  box-sizing: border-box;
+}
 </style>

+ 66 - 2
src/pages/index/index.vue

@@ -3,11 +3,49 @@
     <div class="header">
       <div>
         <div :class="['logo']">
+      <a-dropdown>
+        <div class="header-avatar" style="cursor: pointer">
           <!-- <router-link to="/agreement/agreement"> -->
-          <img src="@/assets/img/title.png" />
-          <p>晋掌柜控制台</p>
+          <div class="logo-title">
+            <img
+              src="@/assets/img/title.png"
+              style="width: 30px; height: 30px"
+            />
+            <h1 style="font-size: 18px; margin-right: 5px">晋掌柜控制台</h1>
+            <a-icon type="caret-down" />
+          </div>
           <!-- </router-link> -->
         </div>
+        <a-menu :class="['avatar-menu']" slot="overlay">
+          切换到
+          <a-menu-item>
+            <div
+              style="display: flex; align-items: center"
+              @click="toShopkeeper"
+            >
+              <img
+                src="@/assets/img/new_logo.png"
+                style="width: 20px; height: 20px"
+              />
+              <h1 style="font-size: 18px; margin-left: 5px">掌柜科技</h1>
+            </div>
+          </a-menu-item>
+          <a-menu-item>
+            <div style="display: flex; align-items: center" @click="toIndex">
+              <img
+                src="@/assets/img/title.png"
+                style="width: 20px; height: 20px"
+              />
+              <h1 style="font-size: 18px; margin-left: 5px">晋掌柜控制台</h1>
+            </div>
+          </a-menu-item>
+          <!-- <a-menu-item @click="Back">
+        <a-icon style="margin-right: 8px" type="poweroff" />
+        <span>返回掌柜</span>
+      </a-menu-item> -->
+        </a-menu>
+      </a-dropdown>
+    </div>
       </div>
       <div>
         <HeaderExpand class="header-item"></HeaderExpand>
@@ -58,6 +96,8 @@
 import HeaderAvatar from "../../layouts/header/HeaderAvatar";
 import HeaderExpand from "../../layouts/header/HeaderExpand";
 import { mapState } from "vuex";
+import Cookies from "js-cookie";
+import CryptoJS from "crypto-js";
 export default {
   components: { HeaderAvatar, HeaderExpand },
 
@@ -76,6 +116,8 @@ export default {
         "电销呼出数据",
         "合伙人数据",
       ],
+      process: process.env.VUE_APP_BASE_URL,
+
     };
   },
   created() {},
@@ -111,6 +153,18 @@ export default {
         path: "/" + item.url + "/" + item.children[0].url,
       });
     },
+    toIndex() {
+      this.$router.replace({
+        path: "/index",
+      });
+    },
+    toShopkeeper() {
+      let token = CryptoJS.AES.encrypt(
+        Cookies.get("Authorization").split(" ")[1],
+        "token"
+      ).toString();
+      window.location.href = this.process + "/#/login?token=" + token;
+    },
   },
 };
 </script>
@@ -213,4 +267,14 @@ export default {
     }
   }
 }
+.logo-title {
+  padding: 10px;
+  display: flex;
+  align-items: center;
+}
+.logo-title:hover {
+  background: #f8f9fd;
+  box-shadow: inset 0px 0px 4px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+}
 </style>

+ 1 - 0
src/pages/personnelManage/channel.vue

@@ -137,6 +137,7 @@
                 </a-tooltip>
               </p>
               <p>管理人名称:{{ item.leaderName }}</p>
+              <p>毛利润:{{ item.estimatedProfit }}</p>
 
               <p>
                 <span>总保费:{{ item.totalPremium || 0 }}</span>

+ 2 - 0
src/pages/task/agent.vue

@@ -510,6 +510,8 @@ export default {
           userId: item.userId,
           beginDate: this.formState.beginDate,
           endDate: this.formState.endDate,
+          days: this.formState.days,
+          managementSource:item.managementSource
         })
         .then((res) => {
           if (res.data.code === 200) {

+ 2 - 1
src/pages/task/channel.vue

@@ -522,8 +522,9 @@ export default {
           pageSize: this.pageInfo.defaultPageSize,
           userId: item.userId,
           beginDate: this.formState.beginDate,
-
+          managementSource:item.managementSource,
           endDate: this.formState.endDate,
+          days: this.formState.days,
         })
         .then((res) => {
           if (res.data.code === 200) {

+ 2 - 2
src/pages/task/dianxiao.vue

@@ -175,7 +175,7 @@
         <div class="custom-title" :style="headerStyle">
           <div>
             <a-icon type="close" @click="onClose" />
-            渠道详情
+            电销详情
           </div>
           <div>
             <a-button style="margin-right: 8px" @click="onClose">取消</a-button>
@@ -522,7 +522,7 @@ export default {
           pageSize: this.pageInfo.defaultPageSize,
           userId: item.userId,
           beginDate: this.formState.beginDate,
-
+          managementSource:item.managementSource,
           endDate: this.formState.endDate,
         })
         .then((res) => {