From 3011b9800d6c5bee031d87bc4e225b5b1fb52571 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 23 十一月 2024 09:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaSolutionsDescWindow.vue | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index bacd9ca..67a8b60 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -57,8 +57,10 @@
<div class="info_list_item_val" ><a v-if="form.fanganFile && form.fanganFile.fileurlFull" style="cursor: pointer;color: #2E68EC" title="鐐瑰嚮鏌ョ湅" @click="openFile(form.fanganFile.fileurlFull)">{{ form.fanganFile.name || '鐐瑰嚮鏌ョ湅' }}</a></div>
</div>
</div>
+ <div style="font-size: 18px; font-weight: bold; margin-bottom: 10px;" v-if="userInfo.type === 0">鏂规浣跨敤鎯呭喌</div>
<el-table
- :data="form.worktypeList"
+ v-if="userInfo.type === 0"
+ :data="list"
border
style="width: 100%; margin-bottom: 20px;">
<el-table-column
@@ -70,11 +72,37 @@
</template>
</el-table-column>
<el-table-column
- prop="worktypeName"
+ prop="companyName"
align="center"
- label="宸ョ鍚嶇О">
+ label="浼佷笟鍚嶇О">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ label="绛剧珷鎯呭喌">
+ <template slot-scope="{row}">
+ <span v-if="row.signStatus === 0">寰呯绔�</span>
+ <span v-if="row.signStatus === 1">宸茬绔�</span>
+ </template>
</el-table-column>
</el-table>
+<!-- <el-table-->
+<!-- :data="form.worktypeList"-->
+<!-- border-->
+<!-- style="width: 100%; margin-bottom: 20px;">-->
+<!-- <el-table-column-->
+<!-- label="搴忓彿"-->
+<!-- align="center"-->
+<!-- width="80">-->
+<!-- <template slot-scope="scope">-->
+<!-- <span>{{scope.$index + 1}}</span>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column-->
+<!-- prop="worktypeName"-->
+<!-- align="center"-->
+<!-- label="宸ョ鍚嶇О">-->
+<!-- </el-table-column>-->
+<!-- </el-table>-->
</div>
<!-- 淇敼 -->
<OperaSolutionsWindow ref="operaSolutionsWindow" @success="callback"/>
@@ -89,7 +117,7 @@
import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
import OperaPdfViewerWindow from '@/components/business/OperaPdfViewerWindow'
import OperaSolutionsBaseDescWindow from '@/components/business/OperaSolutionsBaseDescWindow'
-import { solutionsId } from '@/api/business/solutions'
+import { solutionsId, listForCompany } from '@/api/business/solutions'
import { mapState } from 'vuex'
export default {
name: 'OperaSolutionsDescWindow',
@@ -130,7 +158,8 @@
signKeyword: '',
worktypeList: [],
worktypeIdList: []
- }
+ },
+ list: []
}
},
computed: {
@@ -186,8 +215,15 @@
this.form[key] = target[key]
}
this.getDetails()
+ this.getList()
})
},
+ getList() {
+ listForCompany({ solutionId: this.form.id })
+ .then(res => {
+ this.list = res
+ })
+ },
openFile (url) {
setTimeout(() => {
this.$refs.OperaPdfViewerWindow.open('鏂规纭涔�',url)
--
Gitblit v1.9.3