修改薪资单发布测试

myPackageA/salary/salaryList.vue

@@ -5,7 +5,7 @@
 		
 		<view class="wapperBox">
 			<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">
 					<CommonTimePicker :timeData="startDate" :visible="showTime1" @confirmDate="changeStartTime"
 						@closeTime="showTime1=false" :showMonth="false" iconColor="#2A36AE"/>
@@ -30,7 +30,7 @@
 							<!-- <text class="label">{{ item.statusName }}</text> -->
 							<view class="money" @click="showMoney(index)">
 								<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>
@@ -44,31 +44,31 @@
 						<!-- <view style="border-top:2px solid #dce3ed; margin:0px 0;"></view> -->
 						<view class="detail-grid">
 
-							<view class="grid-row">
+							<view class="grid-row" v-if=" item.detail.grossAmount">
 								<text class="label">应发金额</text>
 								<text class="value">{{ item.detail.grossAmount.toFixed(2) }} (HKD)</text>
 							</view>
-							<view class="grid-row">
+							<view class="grid-row" v-if=" item.detail.mpfAmount">
 								<text class="label">MPF事项金额</text>
 								<text class="value">{{ item.detail.mpfAmount.toFixed(2) }} (HKD)</text>
 							</view>
-							<view class="grid-row">
+							<view class="grid-row"  v-if=" item.detail.otherAmount">
 								<text class="label">其他调整总金额</text>
 								<text class="value">{{ item.detail.otherAmount.toFixed(2) }} (HKD)</text>
 							</view>
-							<view class="grid-row">
+							<view class="grid-row" v-if=" item.detail.paidAmount">
 								<text class="label">实发金额</text>
 								<text class="value">{{ item.detail.paidAmount.toFixed(2) }}(HKD)</text>
 							</view>
-							<view class="grid-row">
+							<view class="grid-row" v-if=" item.detail.remark">
 								<text class="label">备注</text>
 								<text class="value txtValue">{{ item.detail.remark || '--'}}</text>
 							</view>
-							<view class="grid-row">
+							<view class="grid-row" v-if=" item.detail.otherRemark">
 								<text class="label">其他调整备注</text>
 								<text class="value txtValue">{{ item.detail.otherRemark || '--' }}</text>
 							</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="value txtValue">{{ item.detail.cancelRemark || '--' }}</text>
 							</view>
@@ -92,33 +92,36 @@
 						<view class="detail-grid"
 							v-for="(bank,index) in item.detail.apiSalaryRemittanceFzDTO.salaryRemittanceDTOList"
 							:key="bank.salaryRemittanceBizId">
-							<view class="detail-title">
-								打款信息{{index+1}}
-							</view>
-							<view class="grid-row">
-								<text class="label">收款银行</text>
-								<text class="value txtValue">{{ bank.bankName}}</text>
-							</view>
-							<view class="grid-row">
-								<text class="label">账户尾号</text>
-								<text class="value">{{ bank.accountEndNo}}</text>
-							</view>
-							<view class="grid-row">
-								<text class="label">发放金额</text>
-								<text class="value">{{ bank.amount.toFixed(2) }} <text v-if="bank.currency">({{bank.currency}}) </text></text>
-							</view>
-							<view class="grid-row">
-								<text class="label">币种</text>
-								<text class="value">{{ bank.currency}}</text>
-							</view>
-							<view class="grid-row">
-								<text class="label">汇率</text>
-								<text class="value">{{ bank.exchangeRate.toFixed(4)}}</text>
-							</view>
-							<view class="grid-row">
-								<text class="label">备注</text>
-								<text class="value txtValue">{{ bank.remark || '--'}}</text>
+							<view class="" v-if="bank.amount">
+								<view class="detail-title">
+									打款信息{{index+1}}
+								</view>
+								<view class="grid-row">
+									<text class="label">收款银行</text>
+									<text class="value txtValue">{{ bank.bankName}}</text>
+								</view>
+								<view class="grid-row">
+									<text class="label">账户尾号</text>
+									<text class="value">{{ bank.accountEndNo}}</text>
+								</view>
+								<view class="grid-row">
+									<text class="label">发放金额</text>
+									<text class="value">{{ bank.amount.toFixed(2) }} <text v-if="bank.currency">({{bank.currency}}) </text></text>
+								</view>
+								<view class="grid-row">
+									<text class="label">币种</text>
+									<text class="value">{{ bank.currency}}</text>
+								</view>
+								<view class="grid-row">
+									<text class="label">汇率</text>
+									<text class="value">{{ bank.exchangeRate.toFixed(4)}}</text>
+								</view>
+								<view class="grid-row" v-if="bank.remark">
+									<text class="label">备注</text>
+									<text class="value txtValue">{{ bank.remark || '--'}}</text>
+								</view>
 							</view>
+							
 
 
 						</view>