diff --git a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue index ccc70d2..725c970 100644 --- a/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue +++ b/src/subpackage/device/components/order/reservation_people_detail/reservation_people_detail.vue @@ -63,18 +63,42 @@ - 验证码{{i+1}}: - - - {{e.verify_code || '-'}} ({{zh_verify_status(e.status)}}) - 恢复 + + 验证码{{i+1}}: + + + {{e.verify_code || '-'}} ({{zh_verify_status(e.status)}}) + 恢复 + + + + + + 核销方式:{{ k.verify_desc || '-' }} + 核销时间:{{ k.verify_time || '-' }} + 离场方式:{{ k.verify_leave_desc || '-' }} + 离场时间:{{ k.verify_leave_time || '-' }} + + + + + + + 核销方式:{{ e.verify_desc || '-' }} + 核销时间:{{ e.verify_time || '-' }} + 离场方式:{{ e.verify_leave_desc || '-' }} + 离场时间:{{ e.verify_leave_time || '-' }} + + - - 核销方式:{{e.verify_desc || '-'}} - 核销时间:{{e.verify_time || '-'}} - 离场方式:{{e.verify_leave_desc || '-'}} - 离场时间:{{e.verify_leave_time || '-'}} - + + + {{ isShowEnterRecord ? '收起' : '查看全部进场记录' }} + @@ -330,9 +354,16 @@ export default { storehouseList: [], //仓库列表 iccardList: [], //ic卡列表 sucInfo: {}, //绑定IC卡成功信息 + + // 20230823 【ID1001365】 次卡多次进出需求 + isShowEnterRecord: false, }; }, methods:{ + filterVerifyRecord(e){ + if(e?.many_enter_record?.length === -1)return []; + return e?.many_enter_record?.filter(e=>e.verify_type != 0) || []; + }, verifyBtn(){ this.$emit('verify'); }, @@ -671,46 +702,82 @@ export default { } .rb-code{ .rc-item{ - display: flex; - justify-content: flex-start; margin-top: 24rpx; - .ri-tit{ - flex-shrink: 0; - color: #9A9A9D; - font-size: 28rpx; - line-height: 46rpx; - } - .ri-section{ - flex-grow: 1; - .rs-view{ - display: flex; - align-items: center; - >view:first-child{ - min-width: 0; - color: #333333; - font-size: 28rpx; - line-height: 46rpx; - @include textHide(1); + .ri-container{ + display: flex; + justify-content: flex-start; + .ri-tit{ + flex-shrink: 0; + color: #9A9A9D; + font-size: 28rpx; + line-height: 46rpx; + } + .ri-section{ + flex-grow: 1; + .rs-view{ + display: flex; + align-items: center; + >view:first-child{ + min-width: 0; + color: #333333; + font-size: 28rpx; + line-height: 46rpx; + @include textHide(1); + } + .s-btn{ + flex-shrink: 0; + margin-left: 10upx; + padding: 0 18upx; + height: 44upx; + line-height: 44upx; + font-size: 28upx; + border-radius: 10upx; + background-color: #68C43B; + color: #fff; + } } - .s-btn{ - flex-shrink: 0; - margin-left: 10upx; - padding: 0 18upx; - height: 44upx; - line-height: 44upx; - font-size: 28upx; - border-radius: 10upx; - background-color: #68C43B; - color: #fff; + .rs-active{ + >view:first-child{ + font-weight: 500; + color: #009874; + } + } + .rs-record{ + padding: 20upx 0; + .rs-view{ + >view{ + line-height: 44upx; + color: #9C9C9F; + } + } + &:not(:last-child){ + border-bottom: 1px solid #F2F2F7; + } } } - .rs-active{ - >view:first-child{ - font-weight: 500; - color: #009874; + } + .ri-bar{ + margin-top: 10upx; + border-top: 1px solid #F2F2F7; + border-bottom: 1px solid #F2F2F7; + height: 80upx; + @include centerFlex(center); + .rb-txt{ + font-size: 24upx; + color: #9a9a9d; + } + .rb-icon{ + margin-left: 10upx; + flex-shrink: 0; + width: 24upx; + height: 24upx; + transform: rotateZ(90deg); + &.rb-active{ + transform: rotateZ(-90deg); } } } + } } .rb-name{ diff --git a/src/subpackage/device/static/images/circular_arrow.png b/src/subpackage/device/static/images/circular_arrow.png new file mode 100644 index 0000000..348852e Binary files /dev/null and b/src/subpackage/device/static/images/circular_arrow.png differ