Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-05-30 cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8

 wx/pages/report_details/report_details.vue

@@ -82,7 +82,7 @@
         <view class="box_tuihui" v-if="[10,11,12].includes(info.status)">
            <view class="box_tuihui_label">
               收款账户信息确认
               <text>修改</text>
               <text @click="openInfo">修改</text>
            </view>
            <view class="box_tuihui_list">
               <view class="box_tuihui_list_row">
@@ -231,9 +231,9 @@
                        <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" @click="upload(2)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                     <!-- <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> -->
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
@@ -249,9 +249,9 @@
                        <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" @click="upload(3)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                     <!-- <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> -->
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
@@ -267,9 +267,9 @@
                        <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" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                     <!-- <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> -->
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
@@ -285,9 +285,9 @@
                        <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" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                     <!-- <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> -->
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
@@ -303,9 +303,9 @@
                        <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" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                     <!-- <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> -->
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
                     <view class="info_list_item_tu_zw"></view>
@@ -320,9 +320,9 @@
                           <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" @click="upload(6)" v-if="info.status == 0 || info.status == 2 || info.status == 3">
                        <!-- <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> -->
                        <view class="info_list_item_tu_zw"></view>
                        <view class="info_list_item_tu_zw"></view>
                        <view class="info_list_item_tu_zw"></view>
@@ -405,6 +405,27 @@
         content='是否确认赔付金额?'
         @confirm="confirmPrice"
         @cancel="show1 = false" />
      <!-- 修改收款信息 -->
      <u-popup :show="show2" round="20" mode="bottom" closeable @close="show2 = false">
         <view class="sk">
            <view class="sk_head">
               修改收款帐户信息
            </view>
            <u--form :model="form" :rules="rules" ref="uForm">
               <u-form-item label="开户银行" labelWidth="80" required prop="receiveBank" borderBottom ref="item">
                  <u--input v-model="form.receiveBank" border="none" placeholder="请输入"></u--input>
               </u-form-item>
               <u-form-item label="账号" labelWidth="80" required prop="receiveAccount" borderBottom ref="item">
                  <u--input v-model="form.receiveAccount" border="none" placeholder="请输入"></u--input>
               </u-form-item>
               <u-form-item label="户名" labelWidth="80" required prop="receiveUserName" borderBottom ref="item">
                  <u--input v-model="form.receiveUserName" border="none" placeholder="请输入"></u--input>
               </u-form-item>
            </u--form>
            <view style="width: 100%; height: 40rpx;"></view>
            <u-button type="primary" text="保存" @click="submitInfo"></u-button>
         </view>
      </u-popup>
   </view>
</template>

@@ -417,10 +438,36 @@
            info: null,
            show: false,
            show1: false,
            show2: false,
            height: 'auto',
            height1: 'auto',
            height2: 'auto',
            fileList: []
            fileList: [],
            form: {
               receiveBank: '',
               receiveAccount: '',
               receiveUserName: ''
            },
            rules: {
               receiveBank: {
                  type: 'string',
                  required: true,
                  message: '请输入开户银行',
                  trigger: ['blur']
               },
               receiveAccount: {
                  type: 'string',
                  required: true,
                  message: '请输入账号',
                  trigger: ['blur']
               },
               receiveUserName: {
                  type: 'string',
                  required: true,
                  message: '请输入户名',
                  trigger: ['blur']
               }
            }
         };
      },
      onLoad(option) {
@@ -434,6 +481,26 @@
         ...mapState(['cookies'])
      },
      methods: {
         openInfo() {
            this.form.receiveBank = this.info.receiveBank
            this.form.receiveAccount = this.info.receiveAccount
            this.form.receiveUserName = this.info.receiveUserName
            this.show2 = true
         },
         submitInfo() {
            this.$refs.uForm.validate().then(res => {
               this.$u.api.updReceiveInfo({
                  ...this.form,
                  id: this.id
               }).then(res => {
                  this.show2 = false
                  uni.showToast({ title: '修改成功', icon: 'success' })
                  this.getDetails()
               })
            }).catch(errors => {
					
            })
         },
         queren() {
            this.show1 = true
         },
@@ -615,6 +682,20 @@
<style lang="scss" scoped>
   .box {
      width: 100%;
      .sk {
         width: 100%;
         padding: 30rpx;
         box-sizing: border-box;
         .sk_head {
            width: 100%;
            height: 50rpx;
            line-height: 50rpx;
            text-align: center;
            font-size: 34rpx;
            color: #222222;
            margin-bottom: 30rpx;
         }
      }
      .meade {
         width: 100%;
         display: flex;
@@ -982,9 +1063,11 @@
               .info_list_row {
                  width: 100%;
                  min-height: 80rpx;
                  padding-left: 50rpx;
                  display: flex;
                  align-items: flex-start;
                  margin-bottom: 40rpx;
                  position: relative;
                  &:last-child {
                     margin: 0 !important;
                  }
@@ -993,7 +1076,11 @@
                     width: 20rpx;
                     min-height: 80rpx;
                     margin-right: 20rpx;
                     position: relative;
                     position: absolute;
                     top: 5rpx;
                     left: 0;
                     height: 100%;
                     // position: relative;
                     .info_list_row_xian_d {
                        width: 28rpx;
                        height: 28rpx;
@@ -1021,7 +1108,8 @@
                     }
                  }
                  .info_list_row_info {
                     flex: 1;
                     // flex: 1;
                     width: 100%;
                     display: flex;
                     flex-direction: column;
                     .info_list_row_info_top {