From ff95e73d12418ee4b1e400eaceac3d4d623f85b6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 29 三月 2024 18:44:04 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaCompanyDescWindow.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index 9577268..8eba06f 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -60,7 +60,7 @@
<div class="info_list_item_val">{{form.invoiceEmail || '-'}}</div>
</div>
<div class="info_list_item" style="width: 100%;">
- <div class="info_list_item_label">鐢靛瓙鍙戠エ鎺ユ敹鍦板潃锛�</div>
+ <div class="info_list_item_label">绾歌川鍙戠エ鎺ユ敹鍦板潃锛�</div>
<div class="info_list_item_val">{{form.invoiceAddr || '-'}}</div>
</div>
</div>
@@ -82,6 +82,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 +99,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 +112,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 +121,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"
@@ -127,10 +132,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 +144,7 @@
</el-image>
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<!-- 鏂板缓/淇敼 -->
@@ -277,7 +282,7 @@
this.getDetail()
},
getDetail () {
- var that =this
+ var that = this
getById(this.dataId)
.then(res => {
this.form = res
@@ -299,21 +304,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>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 => {
that.form.solutionList = resa.map(item => {
return {
solutionBaseId: item.solutionBaseId,
+ shopId: item.shopId,
canAdd: item.canAdd,
canReduce: item.canReduce
}
@@ -321,6 +334,7 @@
that.form.solutionListName = resa.map(item => {
return {
solutionName: item.solutionName,
+ shopName: item.shopName,
canAdd: item.canAdd,
canReduce: item.canReduce
}
@@ -401,7 +415,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