From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaCompanyDescWindow.vue | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index b10e676..eaf6c4a 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -98,6 +98,30 @@
<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">
@@ -155,6 +179,7 @@
<OperaCompanyWindow ref="operaCompanyWindow" @success="callback"/>
<!-- 淇敼淇濋櫓鏂规 -->
<modification ref="modification" @success="callback"/>
+ <OperaPdfViewerWindow ref="operaPdfViewerWindow" />
<!-- 淇敼鎵嬫満鍙� -->
<el-dialog
title="鏇存敼缁戝畾鎵嬫満鍙�"
@@ -193,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: {
@@ -225,6 +251,9 @@
})
},
methods: {
+ openFile(url) {
+ this.$refs.operaPdfViewerWindow.open('鏂规纭涔�', url)
+ },
close () {
this.visiblePhone = false
this.phone = ''
@@ -344,7 +373,8 @@
solutionName: item.solutionName,
shopName: item.shopName,
canAdd: item.canAdd,
- canReduce: item.canReduce
+ canReduce: item.canReduce,
+ ...item
}
})
console.log(that.form)
--
Gitblit v1.9.3