From f7a3d41075e00498f7033475108c0bcd86cda733 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/OperaSolutionsBaseDescWindow.vue | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/company/src/components/business/OperaSolutionsBaseDescWindow.vue b/company/src/components/business/OperaSolutionsBaseDescWindow.vue
index 852982d..28cdaf2 100644
--- a/company/src/components/business/OperaSolutionsBaseDescWindow.vue
+++ b/company/src/components/business/OperaSolutionsBaseDescWindow.vue
@@ -2,8 +2,7 @@
<GlobalWindow
:title="title"
width="100%"
- text="淇敼"
- :withFooter="userInfo.type !== 1"
+ :withFooter="false"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="$refs.operaSolutionsWindow.open('缂栬緫鏂规', form)"
@@ -22,10 +21,6 @@
<div class="info_list_item_label">鎵夸繚鍏徃锛�</div>
<div class="info_list_item_val">{{form.companyName}}</div>
</div>
-<!-- <div class="info_list_item">-->
-<!-- <div class="info_list_item_label">鎶曚繚鍛ㄦ湡锛�</div>-->
-<!-- <div class="info_list_item_val">1鏈�</div>-->
-<!-- </div>-->
<div class="info_list_item">
<div class="info_list_item_label">鎵规敼鎻愰啋鏃堕棿锛�</div>
<div class="info_list_item_val">{{form.correctWarnTime}}</div>
@@ -36,9 +31,9 @@
</div>
<div class="info_list_item">
<div class="info_list_item_label">鎵瑰噺鐢熸晥锛�</div>
- <div class="info_list_item_val">{{form.delOnlyReplace === 1 ? '鏄�' : '鍚�'}}</div>
+ <div class="info_list_item_val">{{form.delValidDays||0}} 澶�</div>
</div>
- <div class="info_list_item">
+<!-- <div class="info_list_item">
<div class="info_list_item_label">鎵规敼鏀寔锛�</div>
<div class="info_list_item_val">
<span style="margin-right: 50px">鍔犱繚 <i :class="form.canAdd ==1?'el-icon-circle-check':'el-icon-circle-close'" :style="form.canAdd ==1?'color:green;font-weight:bold':'color:red;font-weight:bold'"></i></span>
@@ -49,7 +44,7 @@
<div class="info_list_item">
<div class="info_list_item_label">鎵瑰噺浠呮敮鎸佹浛鎹細</div>
<div class="info_list_item_val">鏄�</div>
- </div>
+ </div>-->
</div>
<el-table
:data="form.worktypeList"
--
Gitblit v1.9.3