From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 company/src/components/business/OperaSettleClaimsWindow.vue |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index 022d158..e6a9076 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -167,7 +167,7 @@
                     <div class="desc_list_item_videos" v-if="model.reportFileList && model.reportFileList.length > 0">
                         <div class="desc_list_item_imgs_video" v-for="(item, index) in model.reportFileList" :key="index">
                             <img :src="item.fileurlFull" v-if="item.type === 0" />
-                            <video controls autoplay :src="item.fileurlFull" v-if="item.type === 1"></video>
+                            <video controls :src="item.fileurlFull" v-if="item.type === 1"></video>
                         </div>
                     </div>
                     <div v-else class="desc_list_item_videos">-</div>
@@ -213,7 +213,7 @@
                   <template   v-if="(model.relationFileList==null|| model.relationFileList.length==0) && (model.status ==1 || model.status ==4)">
                     <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">鏆傛棤鐩稿叧鏉愭枡</span>
                   </template>
-                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 2)" />
+                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 2)" />
 <!--                    <div class="desc_data_list_item">-->
 <!--                      <UploadFileCommon :uploadData="{ folder: 'settle' }" />-->
 <!--                      <div class="desc_data_list_item_upload">-->
@@ -254,7 +254,7 @@
                   <template   v-if="(model.outpatientFileList==null|| model.outpatientFileList.length==0) && (model.status ==2 || model.status ==4)">
                     <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">鏆傛棤鐩稿叧鏉愭枡</span>
                   </template>
-                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 3)" />
+                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 3)" />
 <!--                    <div class="desc_data_list_item">-->
 <!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
 <!--                            <i class="el-icon-plus"></i>-->
@@ -287,7 +287,7 @@
                   <template   v-if="(model.hospitalFileList==null|| model.hospitalFileList.length==0) && (model.status ==2 || model.status ==4)">
                     <span style="height: 40px; width:100%;text-align:center;color: #8c939d;font-size: 12px">鏆傛棤鐩稿叧鏉愭枡</span>
                   </template>
-                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 4)" />
+                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 4)" />
 <!--                    <div class="desc_data_list_item">-->
 <!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
 <!--                            <i class="el-icon-plus"></i>-->
@@ -320,7 +320,7 @@
                   <template   v-if="(model.disabilityFileList==null|| model.disabilityFileList.length==0) && (model.status ==2 || model.status ==4)">
                     <span style=" height: 40px;width:100%;text-align:center;color: #8c939d;font-size: 12px">鏆傛棤鐩稿叧鏉愭枡</span>
                   </template>
-                    <upload  v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 5)" />
+                    <upload  v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 5)" />
 <!--                    <div class="desc_data_list_item">-->
 <!--                      <UploadFileCommon :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />-->
 <!--&lt;!&ndash;                      <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
@@ -357,7 +357,7 @@
                   <template   v-if="(model.compensationFileList==null|| model.compensationFileList.length==0) && (model.status ==2 || model.status ==4)">
                     <span style=" height: 40px;width:100%;text-align:center;color: #8c939d;font-size: 12px">鏆傛棤鐩稿叧鏉愭枡</span>
                   </template>
-                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @success="claimsUploadFile($event, 6)" />
+                    <upload v-if="model.status !=1 && model.status !=4" width="100px" height="100px" :list="[]" accept=".png,.jpg,.jpeg,.mp4,.word,.xlsx,.xls,.pdf,.excel" folder="settle" @loading="loading = true" @success="claimsUploadFile($event, 6)" />
 <!--                    <div class="desc_data_list_item">-->
 <!--                        <div class="desc_data_list_item_img" style="cursor: pointer; background: #8c939d;">-->
 <!--                            <i class="el-icon-plus"></i>-->
@@ -399,7 +399,7 @@
                                         {{activity.content}}
                                  </span>
                                  <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
-                                    鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+                                    鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
                                 </span>
                       </div>
                       <div style="display: flex; flex-direction: column;" v-else>
@@ -410,7 +410,7 @@
                                     </span>
                                 </span>
                                  <span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
-                                    鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+                                    鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
                                 </span>
                       </div>
                     </el-timeline-item>
@@ -545,7 +545,6 @@
             this.$emit('success')
           },
           claimsUploadFile(e, objType) {
-              this.loading = true
                 claimsUploadFile({
                     id: this.model.id,
                     objType,
@@ -833,19 +832,14 @@
                         word-break: break-all;
                         span {
                             &:nth-child(1) {
-                                width: 100%;
-                                word-break: break-all;
+                                width: 160px;
+                                white-space: nowrap;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
                                 font-size: 14px;
                                 color: black;
                                 padding-right: 30px;
                                 box-sizing: border-box;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: normal;
-                                word-wrap: break-word;
-                                -webkit-line-clamp: 2; /* Webkit寮曟搸 */
-                                -webkit-box-orient: vertical; /* Webkit寮曟搸 */
-                                -moz-line-clamp: 2; /* Firefox娴忚鍣� */
                             }
                             &:nth-child(2) {
                                 width: 100%;

--
Gitblit v1.9.3