From 3c456949b70671cc2ad95ad5395dfaceda519f17 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 23 二月 2024 10:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaSolutionsDescWindow.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsDescWindow.vue b/company/src/components/business/OperaSolutionsDescWindow.vue
index adb5dfd..1cefecd 100644
--- a/company/src/components/business/OperaSolutionsDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsDescWindow.vue
@@ -2,7 +2,8 @@
<GlobalWindow
:title="title"
width="50%"
- submitText="淇敼"
+ text="淇敼"
+ :visible="userInfo.type !== 1"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="$refs.operaSolutionsWindow.open('缂栬緫鏂规', form)"
@@ -51,7 +52,7 @@
</div>
<div class="info_list_item">
<div class="info_list_item_label">鐢熸晥鏃堕棿锛�</div>
- <div class="info_list_item_val">{{form.validType === 0 ? '鏃ュ悗鐢熸晥' : '娆℃湀鐢熸晥'}}</div>
+ <div class="info_list_item_val">{{form.validType === 0 ? form.validTypeNum + '鏃ュ悗鐢熸晥' : '娆℃湀鐢熸晥'}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">鎶曚繚绫诲瀷锛�</div>
@@ -81,11 +82,9 @@
</el-table-column>
</el-table>
<div class="info_agree">
- <div class="info_agree_label">淇濋櫓澹版槑锛�</div>
- <div class="info_agree_label">鐗瑰埆绾﹀畾锛�</div>
- <div class="info_agree_val">
- {{form.specialAgreement}}
- </div>
+ <div class="info_agree_label">鐗瑰埆绾﹀畾锛歿{form.specialAgreement}}</div>
+ <div class="info_agree_label">鐗瑰埆璇存槑锛歿{form.specialInfo}}</div>
+ <div class="info_agree_label">鍏朵粬璇存槑锛歿{form.ortherInfo}}</div>
</div>
</div>
<!-- 淇敼 -->
@@ -98,6 +97,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import OperaSolutionsWindow from '@/components/business/OperaSolutionsWindow'
import { solutionsId } from '@/api/business/solutions'
+ import {mapState} from "vuex";
export default {
name: 'OperaSolutionsDescWindow',
extends: BaseOpera,
@@ -118,6 +118,7 @@
timeUnit: '',
insureCycle: '',
insureCycleUnit: '',
+ validTypeNum: '',
email: '',
specialAgreement: '',
specialInfo: '',
@@ -128,6 +129,9 @@
worktypeIdList: []
}
}
+ },
+ computed: {
+ ...mapState(['userInfo'])
},
created () {
this.config({
@@ -215,7 +219,7 @@
align-items: start;
margin-bottom: 20px;
.info_list_item_label {
- width: 130px;
+
flex-shrink: 0;
}
.info_list_item_val {
--
Gitblit v1.9.3