Skip to content

C
CFFP-HB
Commit 59fc4c16 by yuzhenWang
Options

合并薪资单，发布测试

parents e073acad eb7b9350
Showing with 19 additions and 16 deletions
myPackageA/salary/salaryList.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<view class="wapperBox"> <view class="wapperBox">
<view class="header"> <view class="header">
<text class="title">薪资<text class="highlight">单</text></text> <text class="title"><text class="highlight">积分</text></text>
<view class="year-badge" @click="showTime1=true"> <view class="year-badge" @click="showTime1=true">
<CommonTimePicker :timeData="startDate" :visible="showTime1" @confirmDate="changeStartTime" <CommonTimePicker :timeData="startDate" :visible="showTime1" @confirmDate="changeStartTime"
@closeTime="showTime1=false" :showMonth="false" iconColor="#2A36AE"/> @closeTime="showTime1=false" :showMonth="false" iconColor="#2A36AE"/>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<!-- <text class="label">{{ item.statusName }}</text> --> <!-- <text class="label">{{ item.statusName }}</text> -->
<view class="money" @click="showMoney(index)"> <view class="money" @click="showMoney(index)">
<text v-if="item.mask" class="mask-text">*****</text> <text v-if="item.mask" class="mask-text">*****</text>
<text v-else class="real-text">¥ {{ item.paidAmount.toFixed(2) }}</text> <text v-else class="real-text">{{ item.paidAmount.toFixed(2) }}(HKD)</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -44,31 +44,31 @@ ...@@ -44,31 +44,31 @@
<!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> --> <!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> -->
<view class="detail-grid"> <view class="detail-grid">
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.grossAmount">
<text class="label">应发金额</text> <text class="label">应发金额</text>
<text class="value">{{ item.detail.grossAmount.toFixed(2) }} (HKD)</text> <text class="value">{{ item.detail.grossAmount.toFixed(2) }} (HKD)</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.mpfAmount">
<text class="label">MPF事项金额</text> <text class="label">MPF事项金额</text>
<text class="value">{{ item.detail.mpfAmount.toFixed(2) }} (HKD)</text> <text class="value">{{ item.detail.mpfAmount.toFixed(2) }} (HKD)</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.otherAmount">
<text class="label">其他调整总金额</text> <text class="label">其他调整总金额</text>
<text class="value">{{ item.detail.otherAmount.toFixed(2) }} (HKD)</text> <text class="value">{{ item.detail.otherAmount.toFixed(2) }} (HKD)</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.paidAmount">
<text class="label">实发金额</text> <text class="label">实发金额</text>
<text class="value">{{ item.detail.paidAmount.toFixed(2) }}(HKD)</text> <text class="value">{{ item.detail.paidAmount.toFixed(2) }}(HKD)</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.remark">
<text class="label">备注</text> <text class="label">备注</text>
<text class="value txtValue">{{ item.detail.remark || '--'}}</text> <text class="value txtValue">{{ item.detail.remark || '--'}}</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if=" item.detail.otherRemark">
<text class="label">其他调整备注</text> <text class="label">其他调整备注</text>
<text class="value txtValue">{{ item.detail.otherRemark || '--' }}</text> <text class="value txtValue">{{ item.detail.otherRemark || '--' }}</text>
</view> </view>
<view class="grid-row" style="margin-bottom: 10rpx;"> <view class="grid-row" style="margin-bottom: 10rpx;" v-if=" item.detail.cancelRemark">
<text class="label">取消理由</text> <text class="label">取消理由</text>
<text class="value txtValue">{{ item.detail.cancelRemark || '--' }}</text> <text class="value txtValue">{{ item.detail.cancelRemark || '--' }}</text>
</view> </view>
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
<view class="detail-grid" <view class="detail-grid"
v-for="(bank,index) in item.detail.apiSalaryRemittanceFzDTO.salaryRemittanceDTOList" v-for="(bank,index) in item.detail.apiSalaryRemittanceFzDTO.salaryRemittanceDTOList"
:key="bank.salaryRemittanceBizId"> :key="bank.salaryRemittanceBizId">
<view class="" v-if="bank.amount">
<view class="detail-title"> <view class="detail-title">
打款信息{{index+1}} 打款信息{{index+1}}
</view> </view>
...@@ -115,10 +116,12 @@ ...@@ -115,10 +116,12 @@
<text class="label">汇率</text> <text class="label">汇率</text>
<text class="value">{{ bank.exchangeRate.toFixed(4)}}</text> <text class="value">{{ bank.exchangeRate.toFixed(4)}}</text>
</view> </view>
<view class="grid-row"> <view class="grid-row" v-if="bank.remark">
<text class="label">备注</text> <text class="label">备注</text>
<text class="value txtValue">{{ bank.remark || '--'}}</text> <text class="value txtValue">{{ bank.remark || '--'}}</text>
</view> </view>
</view>
</view> </view>
......
sfp/housePurchase/housePurchase.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<view class="banner" id="banner"> <view class="banner" id="banner">
<!--头部技术支持组件--> <!--头部技术支持组件-->
<!-- <commonHead></commonHead> --> <!-- <commonHead></commonHead> -->
<image src="../../static/images/banner.png" mode="widthFix"></image> <image src="../../static/images/banner.webp" mode="widthFix"></image>
</view> </view>
<scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer" > <scroll-view scroll-y="true" class="formInfoContainer" id="formInfoContainer" >
<form> <form>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
<view v-if="resultInfos.code == 'B001' || resultInfos.code =='B002'" style="display: flex;align-items: center;"> <view v-if="resultInfos.code == 'B001' || resultInfos.code =='B002'" style="display: flex;align-items: center;">
<!-- <view style="display: flex;align-items: center;"> --> <!-- <view style="display: flex;align-items: center;"> -->
<view style="margin-right: 16rpx;"> <view style="margin-right: 16rpx;">
<image src="../../static/images/happy.png" mode="widthFix"></image> <image src="../../static/images/happy.webp" mode="widthFix"></image>
</view> </view>
<view> <view>
<view>恭喜您！</view> <view>恭喜您！</view>
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<view v-if="resultInfos.code == 'A001' || resultInfos.code =='A002'" style="display: flex;align-items: center;"> <view v-if="resultInfos.code == 'A001' || resultInfos.code =='A002'" style="display: flex;align-items: center;">
<!-- <view style="display: flex;align-items: center;"> --> <!-- <view style="display: flex;align-items: center;"> -->
<view style="margin-right: 16rpx;"> <view style="margin-right: 16rpx;">
<image src="../../static/images/sad.png" mode="widthFix"></image> <image src="../../static/images/sad.webp" mode="widthFix"></image>
</view> </view>
<view> <view>
<view>很遗憾！</view> <view>很遗憾！</view>
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
</view> </view>
<view class="line" v-for="houseItem in housePurchasePrices"> <view class="line" v-for="houseItem in housePurchasePrices">
<view class="line_title">{{getResultTitle(houseItem.priceType)}} <view class="line_title">{{getResultTitle(houseItem.priceType)}}
<image src="../../static/images/can.png" v-show="houseItem.fvDifference <= 0" mode="widthFix"></image> <image src="../../static/images/can.webp" v-show="houseItem.fvDifference <= 0" mode="widthFix"></image>
<image src="../../static/images/cannot.png" v-show="houseItem.fvDifference > 0" mode="widthFix"></image> <image src="../../static/images/cannot.webp" v-show="houseItem.fvDifference > 0" mode="widthFix"></image>
</view> </view>
<view class="content"> <view class="content">
<view class="left"> <view class="left">
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
现值：{{numberConverter(houseItem.pvPriceRealization)}}元 现值：{{numberConverter(houseItem.pvPriceRealization)}}元
</view> --> </view> -->
</view> </view>
<image src="../../static/images/vs.png" mode="widthFix"></image> <image src="../../static/images/vs.webp" mode="widthFix"></image>
<view class="right"> <view class="right">
<view class="realizable">你想要的</view> <view class="realizable">你想要的</view>
<view>{{housePurchaseInfo.nyear}}年后：{{formatFloat(houseItem.fvPriceDesired/10000)}}万元</view> <view>{{housePurchaseInfo.nyear}}年后：{{formatFloat(houseItem.fvPriceDesired/10000)}}万元</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment