Merge branch '绿色' into 测试

packageA/account/detail.js

@@ -21,7 +21,8 @@ Page({
   onLoad(options) {
     let item = JSON.parse(options.item);
     this.setData({
-      detail: item
+      detail: item,
+      userrole:wx.getStorageSync('userrole')
     })
     this.getList(true);
   },
@@ -47,6 +48,7 @@ Page({
         v.showPayapplyamount = CNY(v.payapplyamount) //已发放金额
         v.showUnpayapplyamount = CNY(v.unpayapplyamount) //未发放金额
         v.showOrderamount = CNY(v.orderamount)
+        v.showsubhrcashbilldetailamount = CNY(v.subhrcashbilldetailamount)
         return v
       })
       this.setData({

packageA/account/detail.wxml

@@ -79,6 +79,9 @@
 			<view wx:else class="col">
 				未发放金额：{{item.showUnpayapplyamount}}
 			</view>
+			<view wx:if="{{userrole =='业务员'}}" class="col">
+				调整后差额:{{item.showsubhrcashbilldetailamount}}
+			</view>
 		</view>
 	</view>
 	<Yl_Empty wx:if="{{list.length === 0}}" />