From f3cd7cfc310d5ef87ca79c26d7a77dfb1eacb388 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 六月 2024 11:21:42 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OpearaUnionChange.vue | 107 ++++--
company/src/components/enterprise/additionSubtractionApplication.vue | 21
company/src/views/business/unionApply.vue | 4
company/src/components/business/OpearaUnionChangeUnit.vue | 68 +++
company/src/components/enterprise/addEmployeeWithDu.vue | 1
company/.env.developmentCom | 5
company/.env.developmentShop | 4
company/src/components/business/OperaUnionChangeDetailWindow.vue | 2
company/src/components/business/OpearaUnionApply.vue | 6
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 9
/dev/null | 651 -------------------------------------------
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
company/src/components/business/OperaPolicyListWindow.vue | 2
company/.env.development | 4
14 files changed, 161 insertions(+), 725 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index d29e70c..7abe4de 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -10,6 +10,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-VUE_APP_API = 'http://localhost:10030/'
-#VUE_APP_API = 'http://192.168.0.135:10030/'
+#VUE_APP_API = 'http://localhost:10030/'
+VUE_APP_API = 'http://192.168.0.135:10030/'
#VUE_APP_API = 'https://www.yyb.red/yyb_admin_api/'
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index 89f0353..7cd8616 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -8,6 +8,7 @@
VUE_APP_COOKIE_NAME='doumee-auth-token'
# VUE_APP_API = 'https://dmtest.ahapp.net/yyb_admin_api/'
-VUE_APP_API = 'http://localhost:10031/'
-#VUE_APP_API = 'http://192.168.0.135:10031/'
+#VUE_APP_API = 'http://localhost:10031/'
+VUE_APP_API = 'http://192.168.0.135:10031/'
+
#VUE_APP_API = 'https://www.yyb.red/yyb_web_api/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 3b11ef7..1c61b78 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -7,8 +7,8 @@
VUE_APP_SYSTEM_TITLE = '浜戞槗淇濆鎴锋湇鍔＄郴缁�-鍟嗘埛绔�'
#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
-# VUE_APP_API = 'http://192.168.0.135:10032/'
+ VUE_APP_API = 'http://192.168.0.135:10032/'
-VUE_APP_API = 'http://localhost:10032/'
+#VUE_APP_API = 'http://localhost:10032/'
#VUE_APP_API = 'https://www.yyb.red/yyb_shop_api/'
diff --git a/company/src/components/business/OpearaUnionApply.vue b/company/src/components/business/OpearaUnionApply.vue
index f1fe42c..db5f01a 100644
--- a/company/src/components/business/OpearaUnionApply.vue
+++ b/company/src/components/business/OpearaUnionApply.vue
@@ -19,7 +19,7 @@
:value="item.id">
</el-option>
</el-select>
- <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="startDate" style="margin-left: 40px">
@@ -33,7 +33,7 @@
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡" />
- <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="item">
@@ -101,7 +101,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="item">
<span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
<span v-if="item.specialInfo" v-html="item.specialInfo"></span>
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;
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()
}
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index e4765a1..1a9731c 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -163,7 +163,7 @@
</el-table-column>
<el-table-column
prop="fee"
- label="宸蹭骇鐢熻垂鐢紙鍏冿級">
+ label="璐圭敤鍙樻洿锛堝厓锛�">
</el-table-column>
<el-table-column
prop="remark"
diff --git a/company/src/components/business/OperaPolicyListWindow.vue b/company/src/components/business/OperaPolicyListWindow.vue
index 32a9d1d..e8c6f84 100644
--- a/company/src/components/business/OperaPolicyListWindow.vue
+++ b/company/src/components/business/OperaPolicyListWindow.vue
@@ -157,7 +157,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="宸蹭骇鐢熻垂鐢紙鍏冿級">
+ label="璐圭敤鍙樻洿锛堝厓锛�">
</el-table-column>
</el-table>
<div class="desc_item_from_page">
diff --git a/company/src/components/business/OperaUnionChangeDetailWindow.vue b/company/src/components/business/OperaUnionChangeDetailWindow.vue
index 5ca5ec3..9960cd5 100644
--- a/company/src/components/business/OperaUnionChangeDetailWindow.vue
+++ b/company/src/components/business/OperaUnionChangeDetailWindow.vue
@@ -153,7 +153,7 @@
</el-table-column>
<el-table-column
prop="fee"
- label="宸蹭骇鐢熻垂鐢紙鍏冿級">
+ label="璐圭敤鍙樻洿锛堝厓锛�">
</el-table-column>
<el-table-column
prop="remark"
diff --git a/company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue b/company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue
deleted file mode 100644
index 7e8a4ab..0000000
--- a/company/src/components/enterprise/OperaInsuranceApplyAddWindowNew.vue
+++ /dev/null
@@ -1,651 +0,0 @@
-<template>
- <GlobalWindow
- :title="title"
- width="100%"
- text="鎶曚繚鐢宠"
- :visible.sync="visible"
- :confirm-working="isWorking"
- @confirm="confirm"
- >
- <div class="list">
- <el-form :inline="true" ref="form" :model="form" :rules="rules" class="demo-form-inline">
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="form.solutionId" @change="changeSolution" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in company"
- :key="item.id"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏈熸湜淇濋櫓鐢熸晥璧锋湡" prop="applyStartTime">
- <div style="display: flex; flex-direction: column;">
- <el-date-picker
- @change="getTimeVal"
- v-model="form.applyStartTime"
- type="date"
- class="date_picker"
- :clearable="false"
- :disabled="!form.solutionId"
- :picker-options="pickerOptions"
- 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>
- </div>
- </el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥姝㈡湡" prop="applyEndTime">
- <el-date-picker
- disabled
- v-model="form.applyEndTime"
- type="date"
- class="date_picker"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd HH:mm:ss"
- format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
-<!-- <el-form-item label="鎶曚繚骞撮緞" v-if="item && item.id !=null">
- <span>{{item.minAge}} 鑷� {{item.maxAge}}</span>
- </el-form-item>
- <el-form-item label="璐圭敤" v-if="item && item.id !=null">
- <span>{{item.price}}鍏�</span>
- <span v-if="item.timeUnit === 0">/澶�</span>
- <span v-if="item.timeUnit === 1">/鍗婃湀</span>
- <span v-if="item.timeUnit === 2">/鏈�</span>
- <span v-if="item.timeUnit === 3">/骞�</span>
- <span>/浜�</span>
- </el-form-item>-->
- </el-form>
- </div>
- <div class="btns">
- <div class="btns_item">
- <el-button type="primary" @click="seleUser">閫夊彇鍛樺伐</el-button>
- <el-button type="primary" @click="uploadUser">瀵煎叆鍛樺伐</el-button>
- <el-button type="primary" @click="addUser">娣诲姞鍛樺伐</el-button>
- <el-button type="danger" @click="deleItem">鍒犻櫎</el-button>
- </div>
- <div class="btns_item">
- <div style="display: inline-block;margin-right: 30px;font-size: 14px" v-if="item && item.id !=null">
- <span>鎶曚繚骞撮緞锛�</span>
- <span>{{item.minAge}} 鑷� {{item.maxAge}}鍛ㄥ瞾</span>
- <span style="margin-left: 20px">璐圭敤锛�</span>
- <span>{{item.price}}鍏�</span>
- <span v-if="item.timeUnit === 0">/澶�</span>
- <span v-if="item.timeUnit === 1">/鍗婃湀</span>
- <span v-if="item.timeUnit === 2">/鏈�</span>
- <span v-if="item.timeUnit === 3">/骞�</span>
- <span>/浜�</span>
- </div>
- <div style="display: inline-block;margin-right: 30px;font-size: 14px"><span>鍚堣璐圭敤锛�</span>
- <span style="font-weight: bold;color: red">{{sumFee}}</span>鍏�
- </div>
- <el-button type="primary" @click="sele">閫夊彇娲鹃仯鍗曚綅</el-button>
- </div>
- </div>
-<!-- show-summary
- :summary-method="getSummaries"-->
- <u-table
- :data="tableData"
- border
- use-virtual
- :row-height="30"
- :height="680"
- ref="multipleTable"
- @selection-change="handleSelectionChange"
- style="width: 100%;margin-bottom: 15px;">
- <u-table-column
- type="selection"
- width="55">
- </u-table-column>
- <u-table-column label="搴忓彿" width="80px">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </u-table-column>
- <u-table-column
- prop="memberName"
- label="濮撳悕">
- </u-table-column>
- <u-table-column
- prop="idCard"
- label="韬唤璇佸彿">
- </u-table-column>
- <u-table-column
- label="骞撮緞">
- <template slot-scope="{row}">
- <template v-if="item">
- <span style="color: red;" v-if="row.idCard && (getAgeByIdCard(row.idCard) < item.minAge || getAgeByIdCard(row.idCard) > item.maxAge)">{{ getAgeByIdCard(row.idCard) }}</span>
- <span v-else>{{ getAgeByIdCard(row.idCard) }}</span>
- </template>
- </template>
- </u-table-column>
- <u-table-column
- prop="duName"
- label="娲鹃仯鍗曚綅">
- </u-table-column>
- <u-table-column
- prop="workTypeName"
- label="鎵�灞炲伐绉�">
- </u-table-column>
- <u-table-column
- prop="fee"
- label="璐圭敤">
- <template slot-scope="{row}">
- {{row.fee}}
- </template>
- </u-table-column>
- <u-table-column
- prop="remark"
- align="center"
- label="澶囨敞">
- <template slot-scope="{row}">
- <el-input v-model="row.remark" placeholder="璇疯緭鍏�"></el-input>
- </template>
- </u-table-column>
- <u-table-column
- label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button type="text" style="color: red;" @click="dele(scope.$index)">鍒犻櫎</el-button>
- </template>
- </u-table-column>
- </u-table>
- <div class="info" v-if="item">
- <span v-if="item.specialAgreement" v-html="item.specialAgreement"></span>
- <span v-if="item.specialInfo" v-html="item.specialInfo"> </span>
- <span v-if="item.ortherInfo" v-html="item.ortherInfo"></span>
- </div>
- <!-- 閫夋嫨鍛樺伐 -->
- <selectEmployees ref="selectEmployees" @result="getValue" />
- <!-- 娣诲姞鍛樺伐 -->
- <addEmployee ref="addEmployee" @result="getValue" />
- <!-- 瀵煎叆鍚嶅崟 -->
- <importEmployees ref="importEmployees" @result="getValue" />
- <!-- 纭宸ョ -->
- <confirmJobType ref="confirmJobType" @result="getUser" />
- <!-- 鏌ョ湅璇﹀崟 -->
- <detailsPolicyholder ref="detailsPolicyholder" @success="successEvent" />
- <!-- 鐩翠繚鎶曚繚璇︽儏 -->
- <OperaInsuranceApplyDetails ref="OperaInsuranceApplyDetails" />
- <!-- 濮旀墭鎶曚繚璇︽儏 -->
- <OperaWtbApplyShopWindow ref="OperaWtbApplyShopWindow" />
- </GlobalWindow>
-</template>
-
-<script>
-import BaseOpera from '@/components/base/BaseOpera'
-import GlobalWindow from '@/components/common/GlobalWindow'
-import selectEmployees from '@/components/enterprise/selectEmployees'
-import addEmployee from '@/components/enterprise/addEmployee'
-import importEmployees from '@/components/enterprise/importEmployees'
-import confirmJobType from '@/components/enterprise/confirmJobType'
-import detailsPolicyholder from '@/components/business/detailsPolicyholder'
-import OperaInsuranceApplyDetails from '@/components/business/OperaInsuranceApplyWindow'
-import OperaWtbApplyShopWindow from '@/components/business/OperaWtbApplyShopWindow'
-import { all, getNewVersion } from '@/api/business/solutions'
-import { mapState } from 'vuex'
-import { create, getCountCyclePriceVO, getDetail, findList, updateData } from '@/api/business/insuranceApply'
-import { UTable, UTableColumn } from 'umy-ui'
-// Vue.component(UTable.name, UTable);
-// Vue.component(UTableColumn.name, UTableColumn);
-export default {
- name: 'OperaInsuranceApplyAddWindowNew',
- extends: BaseOpera,
- components: {
- GlobalWindow, selectEmployees, addEmployee, importEmployees, confirmJobType, detailsPolicyholder, UTable, UTableColumn
- , OperaWtbApplyShopWindow, OperaInsuranceApplyDetails
- },
- data () {
- return {
- sumFee:0,
- form: {
- id: null,
- ID: null,
- solutionId: '',
- applyStartTime: '',
- applyEndTime: ''
- },
- solutionName: '',
- type: '',
- pickerOptions: {}, // 瀛樻斁picker options鐨勫彉閲�
- price: '',
- company: [],
- seleData: [],
- item: null,
- // 楠岃瘉瑙勫垯
- rules: {
- solutionId: [
- { required: true, message: '璇烽�夋嫨淇濋櫓鏂规' }
- ],
- applyStartTime: [
- { required: true, message: '璇烽�夋嫨鏈熸湜淇濋櫓鐢熸晥璧锋湡' }
- ]
- },
- tableData: []
- }
- },
- created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
- },
- computed: {
- ...mapState(['userInfo'])
- },
- watch: {
- // 鐩戝惉tableData鐨勫彉鍖�
- tableData: {
- deep: true,
- handler(newVal, oldVal) {
- // 鏁版嵁鍙樺寲鏃剁殑澶勭悊閫昏緫
- this.getSummaries2()
- console.log(this.tableData.length)
- }
- }
- },
- methods: {
- successEvent () {
- const arr = JSON.parse(JSON.stringify(this.tableData))
- arr.forEach(item => {
- item.idcardNo = item.idCard
- })
- this.isWorking = true
- // if (!this.form.id) {
- create({
- applyDetailList: arr,
- applyStartTime: this.form.applyStartTime,
- applyEndTime: this.form.applyEndTime,
- solutionId: this.form.solutionId
- }).then(res => {
- console.log(res)
- this.visible = false
- if (this.item.type == 1) {
- this.$emit('success', 1, { id: res })
- this.$refs.OperaWtbApplyShopWindow.open('濮旀墭鎶曚繚璇︽儏', { id: res })
- } else {
- this.$emit('success', 1, { id: res })
- this.$refs.OperaInsuranceApplyDetails.open('鎶曚繚璇︽儏', { id: res })
- }
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success','濮旀墭鎶曚繚璇︽儏', { id: res })
- })
- .catch(e => {
- this.$tip.apiFailed(e)
- })
- .finally(() => {
- this.isWorking = false
- })
- // } else {
- // updateData({
- // id: this.form.id,
- // applyDetailList: arr,
- // applyStartTime: this.form.applyStartTime,
- // applyEndTime: this.form.applyEndTime,
- // solutionId: this.form.solutionId
- // }).then(() => {
- // this.visible = false
- // this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
- // this.$emit('success')
- // }).catch(e => {
- // this.$tip.apiFailed(e)
- // })
- // .finally(() => {
- // this.isWorking = false
- // })
- // }
- },
- open (title, target) {
- this.title = title
- this.tableData = []
- this.form.id = null
- this.item = {}
- if (target.type) {
- this.type = target.type
- }
- this.form.solutionId = ''
- this.form.applyStartTime = ''
- this.form.applyEndTime = ''
- if (target && target.id) {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form.id = target.id
- this.getDetails()
- })
- } else {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form[this.configData['field.id']] = null
- })
- }
- this.getCompany()
- this.visible = true
- this.updatePickerOptions()
- },
- // 鑾峰彇鎶曚繚璇︽儏
- getDetails () {
- findList({ applyId: this.form.id })
- .then(res => {
- res.forEach(item => {
- console.log(item)
- item.idCard = item.idcardNo
- item.fee = ''
- if (this.type === 1) {
- // item.duName = ''
- // item.duId = ''
- // item.worktypeId = ''
- // item.workTypeName = ''
- }
- })
- this.tableData = res
- })
- getDetail(this.form.id)
- .then(res => {
- // this.form.solutionId = res.solutionId
- this.changeSolution1(res.solutionId)
- })
- },
- getSummaries ({ columns, data }) {
- const sums = []
- // this.currentData = data; //璁板綍褰撳墠椤垫暟鎹�;
- columns.forEach((column, index) => {
- if (index == 0) {
- sums[index] = '鎬讳环'
- } else if (index == 7) {
- // if (this.item || this.item.type == 1) {
- // sums[index] = '-'
- // } else {
- let total = 0
- this.tableData.forEach(item => {
- total += item.fee
- })
- sums[index] = total.toFixed(2)
- // }
- }else {
- sums[index] = ''
- }
- })
- console.log(sums)
- return sums
- },
- getSummaries2 () {
- this.sumFee = 0;
- if(this.tableData&&this.tableData.length){
- this.tableData.forEach((column, index) => {
- this.sumFee = parseFloat(this.sumFee) + parseFloat(column.fee)
- })
- this.sumFee = (this.sumFee || 0).toFixed(2)
- }
- },
- deleItem () {
- if (this.seleData.length === 0) {
- this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
- return
- }
- this.seleData.forEach(item => {
- this.tableData.forEach((row, index) => {
- if (item === row.idCard) {
- this.tableData.splice(index, 1)
- }
- })
- })
- // this.getSummaries2()
- },
- confirm () {
- this.$refs.form.validate((valid) => {
- if (valid) {
- if (this.tableData.length === 0) {
- this.$message.warning('鑷冲皯娣诲姞涓�椤瑰憳宸�')
- return
- }
- for (let i = 0; i < this.tableData.length; i++) {
- console.log(this.tableData[i].worktypeId)
- console.log(this.tableData[i].duId)
- if (!this.tableData[i].worktypeId || !this.tableData[i].duId) {
- this.$message.warning('璇峰畬鍠勬淳閬ｅ崟浣嶅拰宸ョ淇℃伅')
- return
- }
- }
-
- let price = 0
- // if (this.item && this.item.type != 1) {
- this.tableData.forEach(item => {
- price = price + item.fee
- })
- // }
- this.$refs.detailsPolicyholder.open('鎶曚繚璇︽儏鍗�', {
- companyName: this.userInfo.company.name,
- solutionName: this.item.name,
- solutionType: this.item.type,
- applyStartTime: this.form.applyStartTime,
- applyEndTime: this.form.applyEndTime,
- insureNum: this.tableData.length,
- totalPrice: price,
- detailList: this.tableData
- })
- }
- })
- },
- // 鑾峰彇缁撴潫鏃堕棿鍜屼环鏍�
- getTimeVal (time) {
- getCountCyclePriceVO({
- solutionsId: this.form.solutionId,
- startDate: time
- }).then(res => {
- this.price = res.cyclePrice
- this.form.applyEndTime = res.endDate
- this.tableData.forEach(item => {
- item.fee = res.cyclePrice
- })
- this.$forceUpdate()
- })
- },
- getDate (n) { // n涓哄灏戝ぉ锛�-浠ｈ〃寰�鍓嶏紝+浠ｈ〃寰�鍚�
- const date1 = new Date()
- const time1 = date1.getFullYear() + '-' + (date1.getMonth() + 1) + '-' + date1.getDate()// time1琛ㄧず褰撳墠鏃堕棿
- const date2 = new Date(date1)
- date2.setDate(date1.getDate() + n)
- const time2 = date2.getFullYear() + '-' + ('0' + (date2.getMonth() + 1)).slice(-2) + '-' + ('0' + date2.getDate()).slice(-2)
- return time2
- },
- updatePickerOptions () {
- var that = this
- this.pickerOptions = {
- disabledDate (time) {
- if (!that.item) return
- if (that.item.validType === 1) {
- // 娆℃湀
- const currentDate = new Date()
- currentDate.setMonth(currentDate.getMonth() + 1)
- currentDate.setDate(1)
- return time.getTime() <= new Date(currentDate.toLocaleString()).getTime() - 8.64e7
- } else if (that.item.validType === 0) {
- // 澶氬皯鏃ュ悗鐢熸晥
- return time.getTime() <= new Date(that.getDate(that.item.validTypeNum - 1)).getTime()
- }
- }
- }
- },
- seleUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.selectEmployees.open('閫夊彇鍛樺伐', { arr: this.tableData, price: this.price, type: 1 })
- },
- addUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.addEmployee.open('娣诲姞鍛樺伐', { arr: this.tableData, price: this.price })
- },
- uploadUser () {
- if (!this.form.solutionId) {
- this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
- return
- }
- this.$refs.importEmployees.open('涓婁紶鍚嶅崟', { arr: this.tableData, solutionId: this.form.solutionId, type: 1, price: this.price })
- },
- // 鍒囨崲鏂规
- changeSolution (e) {
- this.sumFee =0;
- this.form.applyEndTime = ''
- this.form.applyStartTime = ''
- if (!this.form.id) {
- this.tableData = []
- } else {
- this.price = 0
- this.tableData.forEach(item => {
- item.fee = 0
- item.duName = ''
- item.duId = ''
- item.workTypeName = ''
- item.workTypeId = ''
- })
- }
- this.company.forEach(item => {
- if (item.id === e) {
- this.price = item.price
- this.item = item
- // if (this.item && this.item.type == 1) {
- // this.item.fee = 0
- // }
- this.updatePickerOptions()
- }
- })
- this.tableData.forEach(item => {
- item.fee = this.price
- })
- },
- // 鍒囨崲鏂规
- changeSolution1 (e) {
- getNewVersion(e)
- .then(res => {
- this.form.solutionId = res.id
- this.company.forEach(item => {
- if (item.id === res.id) {
- this.price = item.price
- this.item = item
- this.updatePickerOptions()
- }
- })
- })
- this.tableData.forEach(item => {
- // if (this.item.type != 0) {
- item.fee = this.price
- // }
- })
- },
- dele (index) {
- this.tableData.splice(index, 1)
- // this.getSummaries2()
- },
- getUser (obj) {
- this.seleData.forEach(id => {
- this.tableData.forEach(row => {
- if (id === row.idCard) {
- row.workTypeName = obj.workTypeName
- row.worktypeId = obj.worktypeId
- row.duName = obj.duName
- row.duId = obj.duId
- }
- })
- })
- this.seleData = []
- this.$refs.multipleTable.clearSelection()
- },
- // 閫夋嫨鍛樺伐
- sele () {
- if (!this.form.solutionId) {
- this.$message.warning('璇烽�夋嫨淇濋櫓鏂规')
- return
- }
- if (this.seleData.length === 0) {
- this.$message.warning('璇烽�夋嫨鍛樺伐')
- return
- }
- this.$refs.confirmJobType.open('纭宸ョ', { solutionId: this.form.solutionId })
- },
- // 鏌ヨ鍏ㄩ儴鏂规
- getCompany () {
- all({})
- .then(res => {
- this.company = res
- })
- },
- getAgeByIdCard (idCard) {
- const sexAndAge = {}
- // 鑾峰彇鐢ㄦ埛韬唤璇佸彿鐮�
- const userCard = idCard
- // 濡傛灉鐢ㄦ埛韬唤璇佸彿鐮佷负undefined鍒欒繑鍥炵┖
- if (!userCard) {
- return sexAndAge
- }
- // 鑾峰彇鍑虹敓鏃ユ湡
- const yearBirth = userCard.substring(6, 10)
- const monthBirth = userCard.substring(10, 12)
- const dayBirth = userCard.substring(12, 14)
- // 鑾峰彇褰撳墠骞存湀鏃ュ苟璁＄畻骞撮緞
- const myDate = new Date()
- const monthNow = myDate.getMonth() + 1
- const dayNow = myDate.getDate()
- let age = myDate.getFullYear() - yearBirth
- if (monthNow < monthBirth || (monthNow == monthBirth && dayNow < dayBirth)) {
- age--
- }
- // 寰楀埌骞撮緞
- sexAndAge.age = age
- return sexAndAge.age
- },
- handleSelectionChange (e) {
- this.seleData = e.map(item => item.idCard)
- },
- getValue (list) {
- this.tableData.push(...list)
- this.getSummaries2()
- }
- }
-}
-</script>
-
-<style>
-.el-picker-panel__footer .el-button--text.el-picker-panel__link-btn {
- display: none;
-}
-</style>
-
-<style lang="scss" scoped>
-.list {
- width: 100%;
-}
-.btns {
- width: 100%;
- margin-bottom: 15px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .btns_item {
- display: flex;
- align-items: center;
- }
-}
-.submit {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-bottom: 15px;
-}
-.info {
- width: 100%;
- font-size: 14px;
- color: black;
- span{
- display: block;
- }
-}
-</style>
diff --git a/company/src/components/enterprise/addEmployeeWithDu.vue b/company/src/components/enterprise/addEmployeeWithDu.vue
index e181877..2ffc3b7 100644
--- a/company/src/components/enterprise/addEmployeeWithDu.vue
+++ b/company/src/components/enterprise/addEmployeeWithDu.vue
@@ -79,6 +79,7 @@
this.visible = true
this.tempIndex = tempIndex
this.solutionId = obj.solutionId
+ this.dispatching=[]
this.list = [
{
memberName: '',
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index f382fa1..647d7a6 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -195,7 +195,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import selectEmployees from '@/components/enterprise/selectEmployees'
-import addEmployee from '@/components/enterprise/addEmployee'
+import addEmployee from '@/components/enterprise/addEmployeeWithDu'
import importEmployees from '@/components/enterprise/importEmployees'
import confirmJobType from '@/components/enterprise/confirmJobType'
import ApplyChangeDetails1 from '@/components/business/ApplyChangeDetails1'
@@ -284,7 +284,7 @@
validTime: e
}).then(res => {
this.price = res.cyclePrice
- this.reducePrice= 0
+ this.reducePrice = 0
this.form.addDetailList.forEach(item => {
item.fee = res.cyclePrice
})
@@ -352,12 +352,12 @@
this.form.addDetailList.forEach(item => {
total += item.fee || 0
})
- sums[index] = (total || 0).toFixed(2)
+ sums[index] = (total || 0).toFixed(2)
} else {
this.form.delDetailList.forEach(item => {
total += item.reducePrice
})
- sums[index] = (total || 0).toFixed(2)
+ sums[index] = (total || 0).toFixed(2)
}
}
})
@@ -480,10 +480,10 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
- /* if (!this.form.applyStartTime) {
+ /* if (!this.form.applyStartTime) {
this.$message.warning('璇峰厛閫夋嫨鎵瑰崟鐢熸晥璧锋湡')
return
- }*/
+ } */
if (this.activeName === '0') {
this.$refs.selectEmployees.open('閫夊彇鍔犱繚鍛樺伐', { arr: this.form.addDetailList, price: this.price, notInInsuranceApplyId: this.form.id, validTime: this.form.applyStartTime })
} else {
@@ -496,9 +496,9 @@
return
}
if (this.activeName === '0') {
- this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, price: this.price })
+ this.$refs.addEmployee.open('娣诲姞鍔犱繚鍛樺伐', { arr: this.form.addDetailList, solutionId: this.item.newVersionSolutionId, price: this.price })
} else {
- this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, price: this.reducePrice })
+ this.$refs.addEmployee.open('娣诲姞鍑忎繚鍛樺伐', { arr: this.form.delDetailList, solutionId: this.item.newVersionSolutionId, price: this.reducePrice })
}
},
uploadUser () {
@@ -506,10 +506,11 @@
this.$message.warning('璇峰厛閫夋嫨淇濋櫓鏂规')
return
}
+
if (this.activeName === '0') {
- this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList,type:1, price: this.price, solutionId: this.form.solutionId })
+ this.$refs.importEmployees.open('鍔犱繚鍛樺伐鍚嶅崟', { arr: this.form.addDetailList, type: 1, price: this.price, solutionId: this.item.newVersionSolutionId })
} else {
- this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList,type:0, price: this.reducePrice, solutionId: this.form.solutionId,insuranceApplyId: this.form.id })
+ this.$refs.importEmployees.open('鍑忎繚鍛樺伐鍚嶅崟', { arr: this.form.delDetailList, type: 0, price: this.reducePrice, solutionId: this.item.newVersionSolutionId, insuranceApplyId: this.form.id })
}
},
// 鍒囨崲鏂规
diff --git a/company/src/views/business/unionApply.vue b/company/src/views/business/unionApply.vue
index 4c93380..671e449 100644
--- a/company/src/views/business/unionApply.vue
+++ b/company/src/views/business/unionApply.vue
@@ -39,8 +39,8 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:insurance:create']">
- <li><el-button type="primary" @click="$refs.OpearaUnionApply.open('濮旀墭鎶曚繚鐢宠')" v-permissions="['business:insurance:create']">鎻愪氦鐢宠</el-button></li>
+ <ul class="toolbar" v-if="userInfo.type==2" v-permissions="['business:unionapply:create']">
+ <li><el-button type="primary" @click="$refs.OpearaUnionApply.open('濮旀墭鎶曚繚鐢宠')" v-permissions="['business:unionapply:create']">鎻愪氦鐢宠</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 8963283..f781686 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -410,7 +410,7 @@
Map<String,String> idCardMap = new HashMap<>();
for(MemberReduceImport model : dataList){
//鏍￠獙鍙傛暟鏄惁鍚堟硶
- validReduceImportParam(model,idCardMap,dataList,index);
+ validReduceImportParam(model,idCardMap,index);
index += 1;
}
index = Constants.TWO;
@@ -431,7 +431,10 @@
.le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))
.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
if(detail == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屽娉曡繘琛岃鎿嶄綔");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ if(!StringUtils.equals(model.getName(), detail.getMemberName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" +model.getName()+ model.getIdCard() + "銆戜笌鍏剁櫥璁板湪淇濊褰曞鍚嶄笉涓�鑷达紝璇锋牳瀹炲～鍐欐纭啀鎿嶄綔");
}
model.setDuId(detail.getDuId());
model.setDuName(detail.getDuName());
@@ -447,7 +450,7 @@
return dataList;
}
- private void validReduceImportParam(MemberReduceImport model, Map<String, String> idCardMap, List<MemberReduceImport> dataList, int index) {
+ private void validReduceImportParam(MemberReduceImport model, Map<String, String> idCardMap, int index) {
if(StringUtils.isBlank(model.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹鍚嶄笉鑳戒负绌猴紒");
}
--
Gitblit v1.9.3