显示优化

project.private.config.json

@@ -9,12 +9,19 @@
         "miniprogram": {
             "list": [
                 {
-                    "name": "salesPanel/panel/detail",
-                    "pathName": "salesPanel/panel/detail",
+                    "name": "销售数据",
+                    "pathName": "salesPanel/index/index",
                     "query": "",
                     "scene": null,
                     "launchMode": "default"
                 },
+                {
+                    "name": "salesPanel/panel/detail",
+                    "pathName": "salesPanel/panel/detail",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "salesPanel/index/index",
                     "pathName": "salesPanel/index/index",

salesPanel/index/index.js

@@ -15,7 +15,8 @@ Page({
             label: "销售面板",
             model: "#Panel"
         }, {
-            label: "客户账户余额分析"
+            label: "客户账户余额分析",
+            model: "#CustomerBlance"
         }, {
             label: "销售TOP10"
         }, {
@@ -26,10 +27,22 @@ Page({
         dataid: wx.getStorageSync('userMsg').userid,
         username: wx.getStorageSync('userMsg').name,
         type: 0,
+        isleave: 1,
     },
     onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this, '销售数据');
-        this.selectComponent("#organization").initDepAndUser()
+        let organization = this.selectComponent("#organization");
+        organization.setData({
+            tabs: [{
+                value: 1,
+                name: "在职"
+            }, {
+                value: 2,
+                name: "离职"
+            }],
+        })
+
+        organization.initDepAndUser()
         this.partialRenewal();
     }, //tabs 切换
     tabsChange({
@@ -68,17 +81,23 @@ Page({
     }) {
         if (detail.name == "close") return;
         if (detail.name == 'reset') {
+            this.selectComponent("#organization").setData({
+                isleave: 1
+            })
             this.selectComponent("#organization").initDepAndUser()
             this.setData({
                 dataid: wx.getStorageSync('userMsg').userid,
                 'type': 0,
+                isleave: 1,
                 username: wx.getStorageSync('userMsg').name
             })
         } else {
-            let active = this.selectComponent("#organization").data.result;
+            let active = this.selectComponent("#organization").data.result,
+                isleave = this.selectComponent("#organization").data.isleave;
             let type = active.userid ? 0 : 1,
                 dataid = type == 0 ? active.userid : active.departmentid
             this.setData({
+                isleave,
                 dataid,
                 type,
                 username: active.name

salesPanel/index/index.json

@@ -1,6 +1,7 @@
 {
     "usingComponents": {
-        "Panel": "../panel/index"
+        "Panel": "../panel/index",
+        "CustomerBlance": "../customerBlance/index"
     },
     "navigationBarTitleText": "销售数据"
 }

salesPanel/index/index.wxml

@@ -6,13 +6,17 @@
     </view>
     <view class="right">
         <view class="filtrate-box" hover-class="navigator-hover" bindtap="openFiltrate">
-            <text class="iconfont  icon-shaixuan" />
-            {{language['筛选']||'筛选'}}
+            <view class="iconfont  icon-shaixuan" />
+            <view wx:if="{{username}}">
+                {{language[username]||username}}_{{language[isleave==1?'在职':'离职']||isleave==1?'在职':'离职'}}
+            </view>
+            <view wx:else>{{language['筛选']||'筛选'}}</view>
         </view>
     </view>
 </view>
 <Yl_FunTabs id='Yl_FunTabs' safety='{{false}}' list='{{tabsList}}' mode='buts' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Panel slot='销售面板' id='Panel' />
+    <CustomerBlance slot='客户账户余额分析' id='CustomerBlance' />
 </Yl_FunTabs>
 <Yl_Filtrate1 id="Yl_Filtrate1" show='{{showFiltrate}}' list="{{[]}}" bindhandle="handleFilter" bindinterrupt='interrupt'>
     <organization slot='head' defaultIsleave='1' dimissionF id='organization' />

salesPanel/panel/index.js

@@ -77,9 +77,10 @@ Component({
             const {
                 dataid,
                 type,
-                username
+                username,
+                isleave
             } = getCurrentPages()[getCurrentPages().length - 1].data;
-            if (content.dataid != dataid || content.type != type) {
+            if (content.dataid != dataid || content.type != type || isleave != isleave) {
                 init = true
                 this.setData({
                     list: [{
@@ -104,6 +105,7 @@ Component({
             content.dataid = dataid;
             content.type = type;
             content.username = username;
+            content.isleave = isleave;
             if (!init && item.init) return;
             _Http.basic({
                 "id": 20231009125304,

salesPanel/panel/index.scss

@@ -115,6 +115,11 @@
 			font-size: 24rpx;
 			color: #3685FC;
 			margin-top: 10rpx;
+
+			text {
+				font-size: 40rpx;
+				margin-right: 6rpx;
+			}
 		}
 
 		.row {

salesPanel/panel/index.wxml

@@ -11,18 +11,18 @@
                     <view class="iconfont icon-wenhao explain" catch:tap="showExplain" />
                     <view class="chart">
                         <view class="circle">
-                            <view class="circle_left ab" style="{{render.leftRate(item.wcnowTarget_l)}}" />
-                            <view class="circle_right ab" style="{{render.rightRate(item.wcnowTarget_l)}}" />
+                            <view class="circle_left ab" style="{{render.leftRate(item.wcamount)}}" />
+                            <view class="circle_right ab" style="{{render.rightRate(item.wcamount)}}" />
                             <view class="circle_text">
                                 <text class="name">{{language['目标达成率']||'目标达成率'}}</text>
-                                <text class="value">{{item.wcnowTarget_l}}%</text>
+                                <text class="value">{{item.wcamount}}%</text>
                             </view>
                         </view>
                     </view>
                     <view class="card" bind:tap="toDetail">
                         <view class="title">{{language['实际金额']||'实际金额'}}</view>
                         <view class="price">
-                            ￥<text style="font-size: 40rpx;">{{item.amount}}</text>
+                            ￥<text>{{item.amount}}</text>{{language['万']||'万'}}
                         </view>
                         <view class="row">
                             {{language['年同比']||'年同比'}}：{{item.tbxsje}}%
@@ -36,25 +36,25 @@
                     <view class="card">
                         <view class="title">{{language['目标金额']||'目标金额'}}</view>
                         <view class="price">
-                            ￥<text style="font-size: 40rpx;">{{item.target_l}}</text>
+                            ￥<text>{{item.target_l}}</text>{{language['万']||'万'}}
                         </view>
                         <view class="row">
                             {{language['目标达成率']||'目标达成率'}}：{{item.wcamount}}%
                         </view>
                         <view class="row">
-                            {{language['实际与目标差额']||'实际与目标差额'}}：{{item.unamount}}
+                            {{language['实际与目标差额']||'实际与目标差额'}}：{{item.unamount}}{{language['万']||'万'}}
                         </view>
                     </view>
                     <view class="card">
                         <view class="title">{{language['累计目标金额']||'累计目标金额'}}</view>
                         <view class="price">
-                            ￥<text style="font-size: 40rpx;">{{item.nowTarget_l}}</text>
+                            ￥<text>{{item.nowTarget_l}}</text>{{language['万']||'万'}}
                         </view>
                         <view class="row">
                             {{language['目标达成率']||'目标达成率'}}：{{item.wcnowTarget_l}}%
                         </view>
                         <view class="row">
-                            {{language['实际与目标差额']||'实际与目标差额'}}：{{item.unnowTarget_l}}
+                            {{language['实际与目标差额']||'实际与目标差额'}}：{{item.unnowTarget_l}}{{language['万']||'万'}}
                         </view>
                     </view>
                 </view>