From 9748f3f74f9f5d49d23528e9005bd82577591992 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 10 四月 2024 18:24:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OpearaUnionChangeUnit.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index 61c4110..8513e06 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -20,8 +20,9 @@
<el-date-picker
v-model="form.applyDate"
placeholder="鍓嶉�夋嫨鏃ユ湡"
+ :picker-options="pickerOptions"
type="date"
- format="yyyy 骞� MM 鏈� dd 鏃�"
+ format="yyyy-MM-dd"
value-format="yyyy-MM-dd" />
<span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
</div>
@@ -97,7 +98,7 @@
<el-dialog
title="閫夋嫨淇濋櫓鍗�"
:visible.sync="visibleSelect"
- width="70%"
+ width="80%"
:modal="true"
:show-close="false"
append-to-body
@@ -129,6 +130,7 @@
<el-table-column prop="code" label="淇濆崟鍙�" min-width="100px"></el-table-column>
<el-table-column prop="solutionName" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
<el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
+ <el-table-column prop="changeApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
<el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="100px"></el-table-column>
</el-table>
@@ -176,6 +178,7 @@
solutions: [],
currentPage:0,
list: [],
+ pickerOptions: {},
tableData:[],
tableTotal:0,
endTime: '',
@@ -247,6 +250,15 @@
}
this.visibleSelect=false
this.form.unionApplyId = this.model.id
+ var that =this
+ this.pickerOptions = {
+ disabledDate (time) {
+ var start = new Date(that.model.startTime)
+ start.setDate(start.getDate() + 1);
+ var end = new Date(that.model.endTime)
+ return ( time.getTime() < start.getTime() || time.getTime()>end.getTime())
+ }
+ }
this.getList();
},
confirm () {
@@ -322,6 +334,7 @@
capacity: 10,
page: this.currentPage,
model: {
+ queryFlag:2,
status: 3,
}
}).then(res => {
@@ -373,6 +386,9 @@
align-items: center;
}
}
+::v-deep .desc_item_from .el-table__header .el-checkbox{
+ display:none!important;
+}
.submit {
width: 100%;
display: flex;
--
Gitblit v1.9.3