From cffe7729a3c9f77ad1423bee2da82505a323ffa1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 20 六月 2024 14:08:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
company/src/components/business/OpearaUnionChangeUnit.vue | 68 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChangeUnit.vue b/company/src/components/business/OpearaUnionChangeUnit.vue
index 669154c..a623ece 100644
--- a/company/src/components/business/OpearaUnionChangeUnit.vue
+++ b/company/src/components/business/OpearaUnionChangeUnit.vue
@@ -12,7 +12,7 @@
<el-form-item label=" " prop="unionApplyId" >
<div style=" display: flex; flex-direction: column;">
<el-button type="primary" size="small" @click="selectBaoxiandan"> 閫夋嫨淇濋櫓鍗�</el-button>
- <span style="color: #F95601; font-size: 14px;">锛�1. 璇烽�夋嫨淇濋櫓鍗曞悗杩涜鎿嶄綔锛�</span>
+ <span style="color: orange; font-size: 14px;"><i class="el-icon-warning"></i>1. 璇烽�夋嫨淇濋櫓鍗曞悗杩涜鎿嶄綔</span>
</div>
</el-form-item>
<el-form-item label="鎵瑰崟鐢熸晥璧锋湡锛�" prop="applyDate" style="margin-left: 40px">
@@ -24,7 +24,8 @@
type="date"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd" />
- <span style="color: #F95601; font-size: 14px;">锛�2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯锛�</span>
+ <span style="color: orange; font-size: 14px;">
+ <i class="el-icon-warning"></i>2. 娆℃棩鐢熸晥鎶曚繚璇蜂簬17:30鍓嶆彁浜わ紝瓒呮椂鎻愪氦浠ヤ繚闄╁崟涓哄噯</span>
</div>
</el-form-item>
<el-form-item label="璐圭敤" v-if="model">
@@ -87,7 +88,7 @@
</template>
</el-table-column>
</el-table>
- <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�3. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
+ <div style="color: orange; font-size: 14px;width: 100%;text-align: left"><i class="el-icon-warning"></i>3. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠</div>
<div class="info" v-if="model">
<span v-if="model.specialAgreement" v-html="model.specialAgreement"></span>
<span v-if="model.specialInfo" v-html="model.specialInfo"> </span>
@@ -104,13 +105,18 @@
append-to-body
center>
<div class="desc_item_from">
+ <div style="width: 100%; text-align: right; align-items: center;margin-bottom: 10px">
+ <span class="tip-warn" style="color: orange; font-size: 14px; margin-right: 20px ;text-align: left">
+ <i class="el-icon-warning"></i>娉細鍙兘閫夋嫨鐢宠鍗曟暟澶т簬0鐨勭敵璇疯褰曡繘琛屾搷浣�
+ </span>
+ <el-checkbox :true-label="2" :false-label="0" v-model="hasApplying" style="font-size: 12px;" @change="handleCurrentChange(1)">鍙樉绀烘湁鐢宠鍗曡褰�</el-checkbox>
+ </div>
<el-table
+ border
ref="multipleTable1"
v-loading="isWorking.search"
- :data="tableData.list"
- @row-click="rowselect1"
+ :data="tableData"
row-key="id"
- @selection-change="handleSelectionChange1"
stripe
>
<el-table-column
@@ -129,11 +135,21 @@
</el-table-column>
<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="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="100px"></el-table-column>
- <el-table-column prop="changeApplyNum" label="鐢宠鍗曟暟" min-width="100px"></el-table-column>
+ <el-table-column prop="insureNum" label="鎶曚繚浜烘暟" min-width="90px"></el-table-column>
+ <el-table-column prop="guaranteeNum" label="鍦ㄤ繚浜烘暟" min-width="90px"></el-table-column>
+ <el-table-column prop="changeApplyNum" label="鐢宠鍗曟暟" min-width="90px"></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-column prop="createDate" label="鎻愪氦鏃堕棿" min-width="180px"></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ min-width="100"
+ fixed="right"
+ align="center"
+ >
+ <template slot-scope="{row}">
+ <el-button v-if="row.changeApplyNum >0" type="primary" @click="selectDo(row)">閫夋嫨</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div class="desc_item_from_page">
<el-pagination
@@ -146,7 +162,9 @@
</div>
</div>
<span slot="footer" class="dialog-footer">
+<!--
<el-button type="primary" @click="selectDo()">纭� 瀹�</el-button>
+-->
<el-button @click="model=null;visibleSelect=false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -181,6 +199,7 @@
list: [],
pickerOptions: {},
tableData: [],
+ hasApplying: 0,
tableTotal: 0,
endTime: '',
item: null,
@@ -241,7 +260,29 @@
this.model = null
}
},
- selectDo () {
+ selectDo (row){
+ this.model =row
+ if (!this.model) {
+ this.$tip.apiFailed({
+ type: 'error',
+ message: '璇烽�夋嫨鑷冲皯涓�鏉＄敵璇疯褰曡繘琛屾搷浣�'
+ })
+ return
+ }
+ 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()
+ },
+ selectDo1 () {
if (!this.model) {
this.$tip.apiFailed({
type: 'error',
@@ -305,6 +346,7 @@
this.model = null
this.list = []
this.visibleSelect = false
+ this.hasApplying= 0
this.tableData = []
this.tableTotal = 0
this.item = null
@@ -335,14 +377,14 @@
capacity: 10,
page: this.currentPage,
model: {
+ hasApplying:this.hasApplying,
queryFlag: 2,
status: 3
}
}).then(res => {
- this.tableData.list = res.records
+ this.tableData = res.records
this.tableTotal = res.total
this.$nextTick(() => {
- console.log(this.$refs.multipleTable1)
if (this.$refs.multipleTable1 && this.$refs.multipleTable1.doLayout) {
this.$refs.multipleTable1.doLayout()
}
--
Gitblit v1.9.3