From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
company/src/components/business/OperaCompanyDescWindow.vue | 100 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 76 insertions(+), 24 deletions(-)
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index 9577268..eaf6c4a 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">
@@ -60,7 +64,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 +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}">
@@ -89,14 +98,38 @@
<el-checkbox :true-label="1" :false-label="0" disabled v-model="row.canReduce">鍑忎繚</el-checkbox>
</template>
</el-table-column>
+ <el-table-column
+ align="center"
+ label="绛剧讲鐘舵��">
+ <template slot-scope="{row}">
+ <template v-if="row.signStatus == 0">寰呯缃�</template>
+ <template v-else-if="row.signStatus == 1">宸茬缃�</template>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="signDate"
+ align="center"
+ label="绛剧讲鏃堕棿">
+ </el-table-column>
+ <el-table-column
+ prop="signUserName"
+ align="center"
+ label="绛剧讲浜�">
+ </el-table-column>
+ <el-table-column
+ label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <el-button type="text" v-if="row.signStatus === 1" @click="openFile(row.fileSignUrl)">鏌ョ湅绛剧讲鏂规涔�</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div class="info_list" v-if="JSON.stringify(form) !== '{}'">
<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 +140,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 +149,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 +160,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,13 +172,14 @@
</el-image>
</div>
</div>
- </div>
+ </div>-->
</div>
</div>
<!-- 鏂板缓/淇敼 -->
<OperaCompanyWindow ref="operaCompanyWindow" @success="callback"/>
<!-- 淇敼淇濋櫓鏂规 -->
<modification ref="modification" @success="callback"/>
+ <OperaPdfViewerWindow ref="operaPdfViewerWindow" />
<!-- 淇敼鎵嬫満鍙� -->
<el-dialog
title="鏇存敼缁戝畾鎵嬫満鍙�"
@@ -184,13 +218,14 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import OperaCompanyWindow from '@/components/business/OperaCompanyWindow'
import modification from '@/components/business/modification'
+import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import { getById, updatePhone } from '@/api/business/company'
import { listForCompany } from '@/api/business/solutions'
import { sendSms } from '@/api/business/smsEmail'
export default {
name: 'OperaCompanyDescWindow',
extends: BaseOpera,
- components: { GlobalWindow, OperaCompanyWindow, modification },
+ components: { GlobalWindow, OperaCompanyWindow, modification, OperaPdfViewerWindow },
data () {
return {
ruleForm: {
@@ -216,6 +251,9 @@
})
},
methods: {
+ openFile(url) {
+ this.$refs.operaPdfViewerWindow.open('鏂规纭涔�', url)
+ },
close () {
this.visiblePhone = false
this.phone = ''
@@ -244,6 +282,8 @@
this.code = ''
clearInterval(this.timer)
this.num = 0
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
})
},
send () {
@@ -255,7 +295,9 @@
.then(res => {
this.num = 60
this.setTime()
- })
+ }) .catch(e => {
+ this.$tip.apiFailed(e)
+ })
},
setTime () {
this.timer = setInterval(() => {
@@ -277,7 +319,7 @@
this.getDetail()
},
getDetail () {
- var that =this
+ var that = this
getById(this.dataId)
.then(res => {
this.form = res
@@ -299,21 +341,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,8 +371,10 @@
that.form.solutionListName = resa.map(item => {
return {
solutionName: item.solutionName,
+ shopName: item.shopName,
canAdd: item.canAdd,
- canReduce: item.canReduce
+ canReduce: item.canReduce,
+ ...item
}
})
console.log(that.form)
@@ -401,7 +453,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