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/OpearaUnionChange.vue | 107 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 34 deletions(-)
diff --git a/company/src/components/business/OpearaUnionChange.vue b/company/src/components/business/OpearaUnionChange.vue
index 2a868cd..9720ea7 100644
--- a/company/src/components/business/OpearaUnionChange.vue
+++ b/company/src/components/business/OpearaUnionChange.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">
@@ -91,7 +91,7 @@
</template>
</el-table-column>
</el-table>
- <div style="color: #F95601; font-size: 14px;width: 100%;text-align: left">锛�2. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠锛�</div>
+ <div style="color: orange; font-size: 14px;width: 100%;text-align: left"><i class="el-icon-warning"></i>2. 璇峰厛閫夋嫨鑷冲皯涓�鏉＄敵璇峰悗鎻愪氦鎶曚繚鐢宠</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>
@@ -108,19 +108,19 @@
append-to-body
center>
<div class="desc_item_from" id="selectTable">
+ <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="1" :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"
- row-key="id"
- @selection-change="handleSelectionChange1"
+ :data="tableData"
stripe
>
- <el-table-column
- type="selection"
- width="55">
- </el-table-column>
<el-table-column label="搴忓彿" width="80px">
<template slot-scope="scope">
<span>{{scope.$index + 1}}</span>
@@ -133,16 +133,26 @@
</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="addApplyNum" 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="addApplyNum" label="鐢宠鍗曟暟" min-width="80px"></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.addApplyNum >0" type="primary" @click="selectDo(row)">閫夋嫨</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div class="desc_item_from_page">
<el-pagination
@current-change="handleCurrentChange"
- :current-page="currentPage"
+ :current-page="currentPage1"
:page-size="10"
layout="total, prev, pager, next, jumper"
:total="tableTotal">
@@ -150,7 +160,7 @@
</div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="selectDo()">纭� 瀹�</el-button>
+<!-- <el-button type="primary" @click="selectDo()">纭� 瀹�</el-button>-->
<el-button @click="model=null;visibleSelect=false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -180,12 +190,13 @@
applyDate: null,
businessType: 0
},
+ hasApplying:0,
pickerOptions: {},
- visibleSelect:false,
+ visibleSelect: true,
solutions: [],
- currentPage:0,
+ currentPage1:1,
list: [],
- tableData:[],
+ tableData:null,
tableTotal:0,
endTime: '',
item: null,
@@ -265,7 +276,33 @@
return new Date()
}
},
- selectDo(){
+ selectDo(row){
+ this.model =row
+ if(!this.model){
+ this.$tip.apiFailed({
+ type: 'error',
+ message: '璇烽�夋嫨鑷冲皯涓�鏉＄敵璇疯褰曡繘琛屾搷浣�'
+ })
+ return
+ }
+ this.form.applyDate=null
+ 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)
+ // console.log(end )
+ // console.log(time )
+ return ( time.getTime() < start.getTime() || time.getTime()>end.getTime())
+ }
+ }
+
+ this.getList();
+ },
+ selectDoOld(){
if(!this.model){
this.$tip.apiFailed({
type: 'error',
@@ -353,24 +390,23 @@
},
selectBaoxiandan(){
- this.currentPage = 1
+ this.currentPage1 = 1
this.visibleSelect=true
- this.$refs.multipleTable.clearSelection();
this.getUnionApplyList()
},
- getUnionApplyList(){
+ getUnionApplyList() {
pageUnionList({
capacity: 10,
- page: this.currentPage,
+ page: this.currentPage1,
model: {
- queryFlag:1,
- status: 3,
+ queryFlag: 1,
+ hasApplying: this.hasApplying,
+ status: 3
}
}).then(res => {
- this.tableData.list = res.records
- this.tableTotal = res.total
this.$nextTick(() => {
- console.log(this.$refs.multipleTable1)
+ this.tableData = res.records
+ this.tableTotal = res.total
if (this.$refs.multipleTable1 && this.$refs.multipleTable1.doLayout) {
this.$refs.multipleTable1.doLayout()
}
@@ -379,10 +415,10 @@
},
getList () {
listAll({
- solutionType:1,
- type:0,
- unionApplyId: this.model.id,
- status: 7
+ solutionType: 1,
+ type: 0,
+ unionApplyId: this.model.id,
+ status: 7
}).then(res => {
this.list = res
this.$nextTick(() => {
@@ -393,7 +429,7 @@
})
},
handleCurrentChange (val) {
- this.currentPage = val
+ this.currentPage1 = val
this.getUnionApplyList()
}
}
@@ -418,6 +454,9 @@
::v-deep .desc_item_from .el-table__header .el-checkbox{
display:none!important;
}
+::v-deep .el-checkbox__label{
+ font-size: 12px;
+}
.submit {
width: 100%;
display: flex;
--
Gitblit v1.9.3