From 02cb47bef10bafc3a591f160f0b286df529c704a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 15:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
wx/pages/report_details/report_details.vue | 77 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 14 deletions(-)
diff --git a/wx/pages/report_details/report_details.vue b/wx/pages/report_details/report_details.vue
index 021ebbd..692cca5 100644
--- a/wx/pages/report_details/report_details.vue
+++ b/wx/pages/report_details/report_details.vue
@@ -94,12 +94,12 @@
<view class="info_list">
<view class="info_list_item f">
<view class="info_list_item_label1">1銆佸憳宸ュ叧绯昏瘉鏄庤祫鏂�</view>
- <view class="info_list_item_tu" v-if="info && info.relationFileList">
+ <view class="info_list_item_tu" v-if="info">
<view class="info_list_item_tu_img" v-for="(item,index) in info.relationFileList" :key="index">
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type == 0"></image>
<video :src="item.fileurlFull" v-if="item.type == 1" />
</view>
- <view class="info_list_item_tu_up">
+ <view class="info_list_item_tu_up" @click="upload(2)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
</view>
<view class="info_list_item_tu_zw"></view>
@@ -109,12 +109,12 @@
</view>
<view class="info_list_item f">
<view class="info_list_item_label1">2銆佸尰鐤楄祫鏂�</view>
- <view class="info_list_item_tu" v-if="info && [...info.outpatientFileList, ...info.hospitalFileList, ...info.disabilityFileList].length > 0">
+ <view class="info_list_item_tu" v-if="info">
<view class="info_list_item_tu_img" v-for="(item, index) in [].concat(info.outpatientFileList).concat(info.hospitalFileList).concat(info.disabilityFileList)" :key="index">
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
<video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up">
+ <view class="info_list_item_tu_up" @click="upload(3)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
</view>
<view class="info_list_item_tu_zw"></view>
@@ -124,12 +124,12 @@
</view>
<view class="info_list_item f">
<view class="info_list_item_label1">3銆佽禂浠樼粨妗堣祫鏂�</view>
- <view class="info_list_item_tu" v-if="info && info.compensationFileList">
+ <view class="info_list_item_tu" v-if="info">
<view class="info_list_item_tu_img" v-for="(item, index) in info.compensationFileList" :key="index">
<image :src="item.fileurlFull" mode="widthFix" v-if="item.type === 0"></image>
- <video :src="item.fileurlFull" v-if="item.type === 0"></video>
+ <video :src="item.fileurlFull" v-if="item.type === 1"></video>
</view>
- <view class="info_list_item_tu_up">
+ <view class="info_list_item_tu_up" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
<u-icon name="plus" color="#222222" size="20"></u-icon>
</view>
<view class="info_list_item_tu_zw"></view>
@@ -166,7 +166,8 @@
<view class="info_list_row_info_nr" v-if="item.content">
<view class="info_list_row_info_nr_title" :style="{ color: info.settleClaimsLogList.length - 1 === index ? '#437CB3' : '' }">澶勭悊杩涘睍锛�</view>
<view class="info_list_row_info_nr_val">
- {{item.content}}
+ <text>{{item.content}}</text>
+ <text v-if="item.objType === 3">鍖荤枟鐞嗚禂:{{JSON.parse(item.afterContent).ylClaimAccount}}鍏冿紝璇伐鐞嗚禂:{{JSON.parse(item.afterContent).wgClaimAccount}}鍏冿紝浼ゆ畫鐞嗚禂:{{JSON.parse(item.afterContent).scClaimAccount}}鍏冿紝姝讳骸鐞嗚禂:{{JSON.parse(item.afterContent).swClaimAccount}}鍏冿紝鐞嗚禂鎬婚:{{JSON.parse(item.afterContent).claimAccount}}鍏冦��</text>
</view>
</view>
</view>
@@ -194,6 +195,7 @@
</template>
<script>
+ import { mapState } from 'vuex'
export default {
data() {
return {
@@ -209,8 +211,48 @@
onLoad(option) {
this.id = option.id
this.getDetails()
+ uni.$on('update', (data) => {
+ this.getDetails()
+ })
+ },
+ computed: {
+ ...mapState(['cookies'])
},
methods: {
+ // 涓婁紶鏉愭枡
+ upload(type) {
+ var that = this
+ uni.chooseMedia({
+ count: 1,
+ maxDuration: 60,
+ success(res) {
+ uni.uploadFile({
+ url: that.$baseUrl + 'public/upload',
+ filePath: res.tempFiles[0].tempFilePath,
+ name: 'file',
+ header: {
+ 'doumee-auth-token': that.cookies
+ },
+ formData: {
+ 'folder': 'settle'
+ },
+ success: (uploadFileRes) => {
+ let data = JSON.parse(uploadFileRes.data).data
+ console.log(JSON.parse(uploadFileRes.data).data)
+ that.$u.api.claimsUploadFile({
+ fileName: '',
+ fileType: data.type,
+ fileUrl: data.imgaddr,
+ id: that.id,
+ objType: type
+ }).then(result => {
+ that.getDetails()
+ })
+ }
+ });
+ }
+ })
+ },
openBC() {
this.value = ''
this.show = true
@@ -357,12 +399,11 @@
bottom: 0;
left: 0;
z-index: 99;
- padding: 10rpx 30rpx;
+ padding: 10rpx 30rpx calc(env(safe-area-inset-bottom) + 10rpx) 30rpx;
box-sizing: border-box;
background-color: #ffffff;
display: flex;
align-items: center;
- padding-bottom: env(safe-area-inset-bottom);
}
.box_head_infoA {
width: 100%;
@@ -465,11 +506,19 @@
font-style: normal;
}
.info_list_row_info_nr_val {
- font-weight: 400;
- font-size: 26rpx;
- color: #666666;
- font-style: normal;
+ display: flex;
+ flex-direction: column;
margin-top: 12rpx;
+ text {
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #666666;
+ font-style: normal;
+ margin-bottom: 20rpx;
+ &:last-child {
+ margin: 0 !important;
+ }
+ }
}
}
}
--
Gitblit v1.9.3