From 4ac55b3e4ccd35aad6ce395222683fd80b1aab79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 18:05:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/enterprise/OperaInsuranceApplyWindow.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
index e54e7a8..fa9d0fd 100644
--- a/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/enterprise/OperaInsuranceApplyWindow.vue
@@ -24,11 +24,13 @@
<el-date-picker
@change="getTimeVal"
v-model="form.applyStartTime"
- type="date"
+ type="datetime"
+ class="date_picker"
+ default-time="00:00:00"
:disabled="!form.solutionId"
:picker-options="pickerOptions"
- value-format="yyyy-MM-dd"
- format="yyyy 骞� MM 鏈� dd 鏃�"
+ value-format="yyyy-MM-dd hh:mm:ss"
+ format="yyyy-MM-dd hh:mm:ss"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
<span style="color: #F95601; font-size: 14px;">锛堟鏃ョ敓鏁堟姇淇濊浜�17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
@@ -38,9 +40,10 @@
<el-date-picker
disabled
v-model="form.applyEndTime"
- type="date"
- value-format="yyyy-MM-dd"
- format="yyyy 骞� MM 鏈� dd 鏃�"
+ type="datetime"
+ default-time="00:00:00"
+ value-format="yyyy-MM-dd hh:mm:ss"
+ format="yyyy-MM-dd hh:mm:ss"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
@@ -468,6 +471,12 @@
}
</script>
+<style>
+ .el-picker-panel__footer .el-button--text.el-picker-panel__link-btn {
+ display: none;
+ }
+</style>
+
<style lang="scss" scoped>
.list {
width: 100%;
--
Gitblit v1.9.3