Merge branch '蓝色' into 测试

packageA/accountReceivable/index.js

@@ -59,7 +59,8 @@ Page({
   },
   onLoad(options) {
     this.setData({
-      pointsL: this.data.points.map(v => getApp().globalData.Language.getMapText(v))
+      pointsL: this.data.points.map(v => getApp().globalData.Language.getMapText(v)),
+      name: wx.getStorageSync('userMsg').name
     })
     this.getList()
     getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
@@ -198,6 +199,7 @@ Page({
       this.setData({
         'content.dataid': wx.getStorageSync('userMsg').userid,
         'content.type': 0,
+        name: wx.getStorageSync('userMsg').name
       })
     } else {
       let active = this.selectComponent("#organization").data.result;
@@ -205,6 +207,7 @@ Page({
         dataid = type == 0 ? active.userid : active.departmentid
       this.setData({
         'content.dataid': dataid,
+        name: active.name,
         'content.type': type
       })
     }

packageA/accountReceivable/index.wxml

@@ -14,7 +14,7 @@
 	<view style="flex: 1;" />
 	<view class="item" hover-class="navigator-hover" bind:tap="openFiltrate">
 		<text class="iconfont icon-shaixuan" />
-		{{language['筛选']||'筛选'}}
+		{{language[name]||name}}
 	</view>
 	<view class="item" style="padding: 0 30rpx;" hover-class="navigator-hover" bind:tap="showSearch">
 		<text class="iconfont icon-a-sousuolansousuo" />

packageA/receivables/index.js

@@ -59,8 +59,10 @@ Page({
   },
   onLoad(options) {
     this.setData({
-      pointsL: this.data.points.map(v => getApp().globalData.Language.getMapText(v))
+      pointsL: this.data.points.map(v => getApp().globalData.Language.getMapText(v)),
+      name: wx.getStorageSync('userMsg').name
     })
+
     this.getList()
     getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
     this.setSumWidth()
@@ -98,14 +100,14 @@ Page({
       if (res.data.length) {
         for (const key in obj) {
           showList.push({
-            name:  getApp().globalData.Language.getMapText(obj[key] + '(元)'),
-            value: res.data[0][key] >= 10000 ? (CNY(wx.getStorageSync('languagecode')=='ZH' ? res.data[0][key] / 10000 : res.data[0][key] / 1000) + getApp().globalData.Language.getMapText( '万')) : res.data[0][key]
+            name: getApp().globalData.Language.getMapText(obj[key] + '(元)'),
+            value: res.data[0][key] >= 10000 ? (CNY(wx.getStorageSync('languagecode') == 'ZH' ? res.data[0][key] / 10000 : res.data[0][key] / 1000) + getApp().globalData.Language.getMapText('万')) : res.data[0][key]
           })
         }
       } else {
         for (const key in obj) {
           showList.push({
-            name:  getApp().globalData.Language.getMapText(obj[key] + '(元)'),
+            name: getApp().globalData.Language.getMapText(obj[key] + '(元)'),
             value: CNY(0)
           })
         }
@@ -163,7 +165,9 @@ Page({
     this.getList(true)
   },
   pointChange(e) {
-    this.data.content.point = this.data.points[e.detail.value]
+    this.setData({
+      "content.point": this.data.points[e.detail.value]
+    })
     this.getList(true)
   },
   onReady() {
@@ -187,6 +191,7 @@ Page({
       this.selectComponent("#organization").initDepAndUser()
       this.setData({
         'content.dataid': wx.getStorageSync('userMsg').userid,
+        'name': wx.getStorageSync('userMsg').name,
         'content.type': 0,
       })
     } else {
@@ -195,7 +200,8 @@ Page({
         dataid = type == 0 ? active.userid : active.departmentid
       this.setData({
         'content.dataid': dataid,
-        'content.type': type
+        'content.type': type,
+        name: active.name
       })
     }
 

packageA/receivables/index.wxml

@@ -9,13 +9,13 @@
 	<picker range='{{pointsL}}' value="{{content.point}}" bindchange='pointChange'>
 		<view class="item" hover-class="navigator-hover">
 			<text class="iconfont icon-daoruxialajiantou" />
-			{{language['入账节点']||'入账节点'}}
+			{{language[content.point]||content.point}}
 		</view>
 	</picker>
 
 	<view class="item" hover-class="navigator-hover" bind:tap="openFiltrate">
 		<text class="iconfont icon-shaixuan" />
-		{{language['筛选']||'筛选'}}
+		{{language[name]||name}}
 	</view>
 
 	<view class="item" style="padding: 0 30rpx;" hover-class="navigator-hover" bind:tap="showSearch">