From df59cad917c6db1db3b36a23f4b3e7be510e9ed0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 11:20:37 +0800
Subject: [PATCH] git ch
---
company/src/components/business/OpearaUnionChange.vue | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index aa953ed..6282bed 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.vue
@@ -15,7 +15,7 @@
<span style="color: #F95601; font-size: 14px;">锛�1. 璇烽�夋嫨淇濋櫓鍗曞悗杩涜鎿嶄綔锛�</span>
</div>
</el-form-item>
- <el-form-item label="鐢宠鏃ユ湡锛�" prop="applyDate" style="margin-left: 40px">
+<!-- <el-form-item label="鐢宠鏃ユ湡锛�" prop="applyDate" style="margin-left: 40px">
<div style="display: flex; flex-direction: column;">
<el-date-picker
v-model="form.applyDate"
@@ -26,7 +26,7 @@
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
- </el-form-item>
+ </el-form-item>-->
<el-form-item label="璐圭敤" v-if="model">
<span>{{model.price}}鍏�</span>
<span v-if="model.timeUnit === 0">/澶�</span>
@@ -66,7 +66,11 @@
</el-table-column>
<el-table-column
prop="applyStartTime"
- label="鏈熸湜淇濋櫓鐢熸晥璧锋湡">
+ label="鎵瑰鐢熸晥鏃ユ湡">
+ </el-table-column>
+ <el-table-column
+ prop="delValidTime"
+ label="鎵瑰噺鐢熸晥鏃ユ湡">
</el-table-column>
<el-table-column
prop="addNum"
@@ -87,11 +91,11 @@
</template>
</el-table-column>
</el-table>
- <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
+ <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�2. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
<div class="info" v-if="model">
- <span v-if="model.specialAgreement">{{model.specialAgreement}}</span>
- <span v-if="model.specialInfo">{{model.specialInfo}}</span>
- <span v-if="model.ortherInfo">{{model.ortherInfo}}</span>
+ <span v-if="model.specialAgreement" v-html="model.specialAgreement"></span>
+ <span v-if="model.specialInfo" v-html="model.specialInfo"> </span>
+ <span v-if="model.ortherInfo" v-html="model.ortherInfo"> </span>
</div>
<!-- 閫夋嫨鐢宠鍗� -->
<ApplyChangeDetails ref="ApplyChangeDetails" @success="getValue" />
@@ -191,9 +195,9 @@
unionApplyId: [
{ required: true, message: '璇烽�夋嫨淇濋櫓鍗�' }
],
- applyDate: [
- { required: true, message: '璇烽�夋嫨淇濋櫓鐢熸晥璧锋湡' }
- ]
+ // applyDate: [
+ // { required: true, message: '璇烽�夋嫨淇濋櫓鐢熸晥璧锋湡' }
+ // ]
}
}
},
--
Gitblit v1.9.3