From 7ad3d376d3ccb029bb8077725aa70747b0ebb2ad Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期四, 14 三月 2024 16:15:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/components/business/OperaCompanyDescWindow.vue |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index c17dd6d..a0632f9 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -94,9 +94,9 @@
                 <div class="info_list_item">
                     <div class="info_list_item_label" style="width: 100px;">钀ヤ笟鎵х収锛�</div>
                     <div class="info_list_item_val">
-                        <div class="image" v-if="form.businessImg.fileurlFull">
+                        <div class="image" v-if="form.businessImg && form.businessImg.fileurlFull">
                           <el-image
-                              v-if="form.businessImg.fileurlFull!=null"
+                              v-if="form.businessImg!=null&&form.businessImg.fileurlFull!=null"
                               style="width: 90px; height: 90px"
                               :src="form.businessImg.fileurlFull"
                               :preview-src-list="[form.businessImg.fileurlFull]">
@@ -107,7 +107,7 @@
                 <div class="info_list_item">
                     <div class="info_list_item_label" style="width: 100px;">娉曚汉韬唤璇侊細</div>
                     <div class="info_list_item_val">
-                        <div class="image" v-if="form.idcardImgList[0].fileurlFull">
+                        <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[0].fileurlFull">
                           <el-image
                               append-to-body
                               v-if="form.idcardImgList[0].fileurlFull"
@@ -116,7 +116,7 @@
                               :preview-src-list="[form.idcardImgList[0].fileurlFull]">
                           </el-image>
                         </div>
-                        <div class="image" v-if="form.idcardImgList[1].fileurlFull">
+                        <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>2 && form.idcardImgList[1].fileurlFull">
                           <el-image
                               append-to-body
                               v-if="form.idcardImgList[1].fileurlFull"
@@ -130,7 +130,7 @@
                 <div class="info_list_item">
                     <div class="info_list_item_label" style="width: 100px;">浼佷笟绛剧珷锛�</div>
                     <div class="info_list_item_val">
-                        <div class="image" v-if="form.signImg.fileurlFull">
+                        <div class="image" v-if="form.signImg && form.signImg.fileurlFull">
                           <el-image
                               v-if="form.signImg.fileurlFull!=null"
                               style="width: 90px; height: 90px"
@@ -277,7 +277,7 @@
       this.getDetail()
     },
     getDetail () {
-      var that =this
+      var that = this
       getById(this.dataId)
         .then(res => {
           this.form = res
@@ -299,15 +299,22 @@
             imgurl: '',
             imgurlfull: ''
           }
-
-          this.form.file.imgurl = res.businessImg.fileurl
-          this.form.file.imgurlfull = res.businessImg.fileurlFull
-          this.form.file1.imgurl = res.idcardImgList[0].fileurl
-          this.form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
-          this.form.file2.imgurl = res.idcardImgList[1].fileurl
-          this.form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
-          this.form.file3.imgurl = res.signImg.fileurl
-          this.form.file3.imgurlfull = res.signImg.fileurlFull
+          if(res.businessImg){
+            this.form.file.imgurl = res.businessImg.fileurl
+            this.form.file.imgurlfull = res.businessImg.fileurlFull
+          }
+          if (res.idcardImgList&& res.idcardImgList.length>1) {
+            this.form.file1.imgurl = res.idcardImgList[0].fileurl
+            this.form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
+          }
+          if (res.idcardImgList && res.idcardImgList.length>2) {
+            this.form.file2.imgurl = res.idcardImgList[1].fileurl
+            this.form.file2.imgurlfull = res.idcardImgList[1].fileurlFull
+          }
+          if (res.signImg) {
+            this.form.file3.imgurl = res.signImg.fileurl
+            this.form.file3.imgurlfull = res.signImg.fileurlFull
+          }
 
           listForCompany({ companyId: this.dataId })
             .then(resa => {

--
Gitblit v1.9.3