From 09da100729793848bc01b51f7b05ca3f1e7ec64f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 14:05:35 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaCompanyDescWindow.vue | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index df59907..b10e676 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -28,6 +28,10 @@
<div class="info_list_item_label">鍏徃璐﹀彿锛�</div>
<div class="info_list_item_val">{{form.username || '-'}}</div>
</div>
+ <div class="info_list_item">
+ <div class="info_list_item_label">娉曚汉濮撳悕锛�</div>
+ <div class="info_list_item_val">{{form.legalName || '-'}}</div>
+ </div>
<div class="info_list_item">
<div class="info_list_item_label">缁戝畾鎵嬫満鍙凤細</div>
<div class="info_list_item_val">
@@ -82,6 +86,11 @@
label="淇濋櫓鏂规">
</el-table-column>
<el-table-column
+ prop="shopName"
+ align="center"
+ label="濮旀墭鍟嗘埛">
+ </el-table-column>
+ <el-table-column
align="center"
label="鍔犲噺淇濆姛鑳�">
<template slot-scope="{row}">
@@ -94,9 +103,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,8 +116,8 @@
<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">
- <el-image
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>0 && form.idcardImgList[0].fileurlFull">
+ <el-image
append-to-body
v-if="form.idcardImgList[0].fileurlFull"
style="width: 90px; height: 90px"
@@ -116,8 +125,8 @@
:preview-src-list="[form.idcardImgList[0].fileurlFull]">
</el-image>
</div>
- <div class="image" v-if="form.idcardImgList[1].fileurlFull">
- <el-image
+ <div class="image" v-if="form.idcardImgList && form.idcardImgList .length>1 && form.idcardImgList[1].fileurlFull">
+ <el-image
append-to-body
v-if="form.idcardImgList[1].fileurlFull"
style="width: 90px; height: 90px"
@@ -127,10 +136,10 @@
</div>
</div>
</div>
- <div class="info_list_item">
+<!-- <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"
@@ -139,7 +148,7 @@
</el-image>
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<!-- 鏂板缓/淇敼 -->
@@ -244,6 +253,8 @@
this.code = ''
clearInterval(this.timer)
this.num = 0
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
})
},
send () {
@@ -255,7 +266,9 @@
.then(res => {
this.num = 60
this.setTime()
- })
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
+ })
},
setTime () {
this.timer = setInterval(() => {
@@ -277,7 +290,7 @@
this.getDetail()
},
getDetail () {
- var that =this
+ var that = this
getById(this.dataId)
.then(res => {
this.form = res
@@ -299,21 +312,29 @@
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>0) {
+ this.form.file1.imgurl = res.idcardImgList[0].fileurl
+ this.form.file1.imgurlfull = res.idcardImgList[0].fileurlFull
+ }
+ if (res.idcardImgList && res.idcardImgList.length>1) {
+ 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 => {
that.form.solutionList = resa.map(item => {
return {
solutionBaseId: item.solutionBaseId,
+ shopId: item.shopId,
canAdd: item.canAdd,
canReduce: item.canReduce
}
@@ -321,6 +342,7 @@
that.form.solutionListName = resa.map(item => {
return {
solutionName: item.solutionName,
+ shopName: item.shopName,
canAdd: item.canAdd,
canReduce: item.canReduce
}
@@ -401,7 +423,7 @@
align-items: start;
margin-bottom: 20px;
.info_list_item_label {
- width: 150px;
+ /*width: 150px;*/
flex-shrink: 0;
}
.info_list_item_val {
--
Gitblit v1.9.3