From 74225654b1d1dba53fe00b3a5e9b9e91cfa0c922 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 02 四月 2024 15:56:21 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 14 +
server/service/src/main/java/com/doumee/core/utils/Constants.java | 8
company/src/components/business/detailsEntrustedInsurance.vue | 2
company/src/assets/style/style.scss | 2
company/src/components/common/UploadFileLink.vue | 174 +++++++++++++++++++++
company/src/components/business/OperaUnionApplyCheckWindow.vue | 202 +++++++++++++++++++++++--
company/src/components/common/UploadFile.vue | 10 +
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 15 +
8 files changed, 390 insertions(+), 37 deletions(-)
diff --git a/company/src/assets/style/style.scss b/company/src/assets/style/style.scss
index 2c50d01..4edc7ed 100644
--- a/company/src/assets/style/style.scss
+++ b/company/src/assets/style/style.scss
@@ -96,6 +96,6 @@
color: #F95601 !important;
}
.apply-status5,.apply-status27,.change-status7,.settle-status7,
- .tax-status1,.du-status1,.settle-status4 .union-apply-status3 {
+ .tax-status1,.du-status1,.settle-status4 ,.union-apply-status3 {
color: #00BA92 !important;
}
diff --git a/company/src/components/business/OperaUnionApplyCheckWindow.vue b/company/src/components/business/OperaUnionApplyCheckWindow.vue
index 2f0cacd..a84674d 100644
--- a/company/src/components/business/OperaUnionApplyCheckWindow.vue
+++ b/company/src/components/business/OperaUnionApplyCheckWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="50%"
+ width="60%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
@@ -18,14 +18,14 @@
</el-form-item>
<div v-for="(item,index) in this.model.applyList" :key="index">
<el-form-item :label="(index+1)+'.琚繚闄╀汉锛�'+item.companyName+')锛�'" prop="tbdMultifileList[index]">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList" @uploadSuccess="toubaoFileUploaded2" />
+ <UploadFile @remove="deleIndex(0,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList" @uploadSuccess="toubaoFileUploaded2" />
</el-form-item>
</div>
</el-form>
<!-- 涓婁紶淇濋櫓鍗� -->
<el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
- <el-form-item label="瀹㈡埛鏈熸湜淇濋櫓鐢熸晥璧锋湡锛�">
- {{ model.applyStartTime }}
+ <el-form-item label="鏈熸湜淇濋櫓鐢熸晥鏈燂細">
+ <span >{{( form.startTime|| '-') +' 鑷� '+( form.endTime|| '-')}}</span>
</el-form-item>
<el-form-item label="" >
<el-radio-group v-model="form.selectRadio" @change="selectChange">
@@ -41,20 +41,46 @@
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
</el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
- {{ form.startTime }}
+ <el-form-item label="淇濋櫓鐢熸晥姝㈡湡锛�" prop="endTime" v-if="form.selectRadio === 1">
+ <el-date-picker
+ v-model="form.endTime"
+ type="date"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鏃ユ湡">
+ </el-date-picker>
</el-form-item>
<el-form-item label="淇濆崟鍙凤細" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
<el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="baoxianFile">
- <UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
+ <UploadFile @remove="dele3" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
</el-form-item>
- <div v-for="(item,index) in this.model.applyList" :key="index">
+ <div class="box_table">
+ <div class="box_table_head">
+ <div class="box_table_head_item">搴忓彿</div>
+ <div class="box_table_head_item">琚繚闄╀汉</div>
+ <div class="box_table_head_item">鎶曚繚浜烘暟</div>
+ <div class="box_table_head_item">鎿嶄綔</div>
+ <div class="box_table_head_item">鏈嶅姟璐�(褰撳墠淇濆崟)</div>
+ </div>
+ <div class="box_table_content" v-for="(item, index) in model.applyList" :key="index">
+ <div class="box_table_content_item">{{index + 1}}</div>
+ <div class="box_table_content_item" >{{ item.companyName }}</div>
+ <div class="box_table_content_item">{{ item.insureNum }}</div>
+ <div class="box_table_content_item">
+ <el-form-item label="" prop="bxdMultifileList[index]">
+ <UploadFileLink @remove="deleIndex(1,index)" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
+ </el-form-item>
+ </div>
+ <div class="box_table_content_item"> <el-input style="width: 60%" v-model="form.bxdMultifileList[index].serverMoney" placeholder="璇疯緭鍏�" ></el-input>
+ <span style="margin-left: 15px">鍏�/浜�</span></div>
+ </div>
+ </div>
+<!-- <div v-for="(item,index) in this.model.applyList" :key="index">
<el-form-item :label="item.companyName" prop="bxdMultifileList[index]">
<UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileIndex="index" :showTips="showTips" :fileList="model.applyList[index].fileList1" @uploadSuccess="baoxianFileUploaded2" />
</el-form-item>
- </div>
+ </div>-->
</el-form>
<template v-slot:footer>
<el-button type="primary" @click="doSubmit">纭� 瀹�</el-button>
@@ -72,11 +98,12 @@
uploadToubaodan
} from '@/api/business/unionApply'
import UploadFile from '@/components/common/UploadFile'
+import UploadFileLink from '@/components/common/UploadFileLink'
export default {
name: 'OperaUnionApplyCheckWindow',
extends: BaseOpera,
- components: { UploadFile, GlobalWindow },
+ components: { UploadFile, GlobalWindow ,UploadFileLink},
data () {
return {
// 琛ㄥ崟鏁版嵁
@@ -100,6 +127,9 @@
startTime: [
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
],
+ endTime: [
+ { required: true, message: '璇峰畬鍠勪俊鎭�' }
+ ],
baoxianFile: [
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
]
@@ -109,6 +139,7 @@
backCheckInfo: '',
editCheckInfo: '',
startTime: null,
+ endTime: null,
code: null,
toubaodanFile: null,
baoxianFile: null,
@@ -134,9 +165,14 @@
this.form.toubaodanFile= null
},
deleIndex (flag,index) {
- if(flag == 0)
- this.form.tbdMultifileList[index].fileurl = null
- this.form.tbdMultifileList[index].name = null
+ alert(index)
+ if(flag == 0){
+ this.form.tbdMultifileList[index].fileurl = null
+ this.form.tbdMultifileList[index].name = null
+ }else if(flag ==1){
+ this.form.bxdMultifileList[index].fileUrl = null
+ this.form.bxdMultifileList[index].fileName = null
+ }
},
dele3 () {
this.form.baoxianFile = null
@@ -152,10 +188,13 @@
editDate: '',
editCode: '',
startTime: null,
+ endTime: null,
code: null,
toubaodanFile: null,
baoxianFile: null,
editBaoxianFile: null,
+ tbdMultifileList:[],
+ bxdMultifileList:[],
fileList: [],
fileList1: [],
selectRadio: 0
@@ -163,6 +202,7 @@
this.model = target
this.form.startTime = target.startTime
+ this.form.endTime = target.endTime
this.title = title
this.flag = flag
this.visible1 = false
@@ -188,7 +228,7 @@
if(this.model.applyList){
this.model.applyList.forEach(item =>{
item.fileList1 =[]
- this.form.bxdMultifileList.push({objId:item.id,fileurl:null,name:null})
+ this.form.bxdMultifileList.push({applyId:item.id,serverMoney:0,fileUrl:null,fileName:null})
})
}
}
@@ -223,8 +263,10 @@
selectChange () {
if (this.form.selectRadio == 0) {
this.form.startTime = this.model.startTime
+ this.form.endTime = this.model.endTime
} else {
- this.form.startTime = ''
+ // this.form.startTime = ''
+ // this.form.endTime = ''
}
},
toubaoFileUploaded (data) {
@@ -238,8 +280,8 @@
this.form.baoxianFile = data
},
baoxianFileUploaded2 (data) {
- this.form.bxdMultifileList[data.index].fileurl = data.fileurl
- this.form.bxdMultifileList[data.index].name = data.name
+ this.form.bxdMultifileList[data.index].fileUrl = data.fileurl
+ this.form.bxdMultifileList[data.index].fileName = data.name
},
backDo () {
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
@@ -273,7 +315,17 @@
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
.then(() => {
this.isWorking = true
- uploadBXD({ id: this.model.id, startTime: this.form.startTime, code: this.form.code, baoxiandanFile: this.form.baoxianFile })
+ var param ={
+ id: this.model.id,
+ startTime: this.form.startTime,
+ endTime: this.form.endTime,
+ code: this.form.code,
+ fileUrl: this.form.baoxianFile.fileurl,
+ fileName: this.form.baoxianFile.name,
+ unionApplyBXDDDetailDTOList:this.form.bxdMultifileList
+ }
+ console.log(param)
+ uploadBXD(param)
.then(response => {
this.visible = false
this.$emit('success')
@@ -428,4 +480,118 @@
}
}
}
+ .box_table {
+ width: 100%;
+ border-top: 1px solid #b4bbc5;
+ border-left: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ .box_table_head {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .box_table_head_item1 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ }
+ .box_table_head_item {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(1) {
+ flex: 0.5;;
+ }
+ &:nth-child(2) {
+ flex:1.5;
+ }
+ &:nth-child(4) {
+ flex:1.5;
+ }
+ &:nth-child(5) {
+ flex: 1.5;;
+ }
+ }
+ .box_table_head_item5 {
+ flex: 1;
+ height: 50px;
+ background: #f2f2f2;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(2) {
+ flex: 5;
+ }
+ }
+ .box_form_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(1) {
+ //flex: 0.5;
+ }
+ }
+ }
+ .box_table_content {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ .box_table_content_header{
+ border-bottom: 0px solid #b4bbc5 !important;
+ }
+ .box_table_content_item {
+ flex: 1;
+ height: 50px;
+ background: #ffffff;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: 14px;
+ color: black;
+ border-right: 1px solid #b4bbc5;
+ border-bottom: 1px solid #b4bbc5;
+ box-sizing: border-box;
+ &:nth-child(1) {
+ flex: 0.5;;
+ }
+ &:nth-child(2) {
+ flex:1.5;
+ }
+ &:nth-child(4) {
+ flex: 1.5;
+ }
+ &:nth-child(5) {
+ flex: 1.5;
+ }
+ }
+ }
+ }
</style>
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index effc518..c8cddd3 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -29,8 +29,8 @@
<el-button v-if="model.status == 24" type="primary" @click="closeOrder">鍏抽棴璁㈠崟</el-button>
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
<el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
- <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="[3].includes(model.unionApplyTbdStatus) " type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<!-- goSign-->
<el-button v-if="model.status == 20" type="primary" @click="getSignLink(0)">绛剧讲鏂规纭涔�</el-button>
<el-button v-if="model.status == 21" type="primary" @click="getSignLink(1)">绛剧讲鐢宠鍗�</el-button>
@@ -39,15 +39,17 @@
<template v-if="userInfo.type === 2">
<el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
<el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 22" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
<el-button v-if="[20,21,22].includes(model.status)" type="danger" @click="$refs.OperaWtbApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炵敵璇�</el-button>
<el-button v-if="model.status == 23" type="danger" @click="$refs.OperaWtbApplyCheckWindow.open('鍏抽棴鐢宠',model,2)">鍏抽棴鐢宠</el-button>
</template>
<template v-if="userInfo.type === 0">
- <el-button v-if="[27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
- <el-button v-if="[27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
- <el-button v-if="[27].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="[27].includes(model.status)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <el-button v-if="[21,22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewFanganshu">鏌ョ湅纭涔�</el-button>
+ <el-button v-if="[22,23,24,25,26,27].includes(model.status)" type="primary" @click="viewShenqingdan">鏌ョ湅鐢宠鍗�</el-button>
+ <el-button v-if="[1,2,3].includes(model.unionApplyTbdStatus) &&(model.toubaodanFile || model.oubaodanSignedFile)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="[3].includes(model.unionApplyTbdStatus) &&(model.baoxiandanFile)" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
</template>
</div>
</div>
diff --git a/company/src/components/business/detailsEntrustedInsurance.vue b/company/src/components/business/detailsEntrustedInsurance.vue
index b14675d..57a3387 100644
--- a/company/src/components/business/detailsEntrustedInsurance.vue
+++ b/company/src/components/business/detailsEntrustedInsurance.vue
@@ -11,7 +11,7 @@
<div class="desc_item_label">
<div class="desc_item_label_left">
<span>鎶曚繚浜猴細{{ model.companyName }}</span>
- <span>淇濆崟鐘舵�侊細<span :class="'apply-status'+model.status" >{{ model.statusInfo }}</span></span>
+ <span>淇濆崟鐘舵�侊細<span :class="'union-apply-status'+model.status" >{{ model.statusInfo }}</span></span>
<span>鎻愪氦鏃堕棿锛歿{ model.createDate }}</span>
</div>
<div class="desc_item_label_right">
diff --git a/company/src/components/common/UploadFile.vue b/company/src/components/common/UploadFile.vue
index 21f8838..8624fa0 100644
--- a/company/src/components/common/UploadFile.vue
+++ b/company/src/components/common/UploadFile.vue
@@ -12,7 +12,7 @@
:on-error="uploadError"
:before-upload="beforeFileUpload"
:file-list="fileList">
- <el-button size="small" type="primary" >鐐瑰嚮涓婁紶</el-button>
+ <el-button size="small" type="primary" >鐐瑰嚮涓婁紶</el-button>
<div style="display: inline-block;position: absolute" slot="tip" class="el-upload__tip" v-if="showTips">{{'(鍙兘涓婁紶'+uploadData.fileType +'鏂囦欢锛屼笖涓嶈秴杩�5mb)'}}</div>
</el-upload>
</div>
@@ -46,6 +46,7 @@
},
data() {
return {
+ uploaded:false,
// fileList:[],
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload?folder='+this.uploadData.folder
}
@@ -54,6 +55,11 @@
fileList (nv,ov) {
if(this.fileList ==null){
this.fileList = new Array();
+ }
+ if(this.fileList.length == 0){
+ this.uploaded = false
+ }else{
+ this.uploaded=true
}
// alert(this.fileList)
},
@@ -65,6 +71,7 @@
},
methods: {
removes() {
+ this.uploaded=false
this.$emit('remove')
},
// 涓婁紶鍥剧墖
@@ -74,6 +81,7 @@
handleFileSuccess(res, file) {
if (res.code == 200) {
let { data } = res
+ this.uploaded = true
// this.fileList = [{name: data.originname, url: data.url }]
this.$message.success('涓婁紶鎴愬姛')
this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname ,index:this.fileIndex})
diff --git a/company/src/components/common/UploadFileLink.vue b/company/src/components/common/UploadFileLink.vue
new file mode 100644
index 0000000..2112642
--- /dev/null
+++ b/company/src/components/common/UploadFileLink.vue
@@ -0,0 +1,174 @@
+<template>
+ <div>
+ <el-upload
+ ref="uploadFileBtn"
+ class="upload-demo"
+ :accept="uploadData.fileType"
+ :action="uploadImgUrl"
+ :limit="1"
+ :before-remove="removes"
+ :on-exceed="handleExceed"
+ :on-success="handleFileSuccess"
+ :on-error="uploadError"
+ :before-upload="beforeFileUpload"
+ :file-list="fileList">
+ <a v-if="!uploaded" size="small" type="primary" >鐐瑰嚮涓婁紶</a>
+ <div style="display: inline-block;position: absolute" slot="tip" class="el-upload__tip" v-if="showTips">{{'(鍙兘涓婁紶'+uploadData.fileType +'鏂囦欢锛屼笖涓嶈秴杩�5mb)'}}</div>
+ </el-upload>
+ </div>
+
+</template>
+
+<script>
+export default {
+ props: {
+ fileList:{
+ type: Array,
+ default: () => []
+ },
+ file: {
+ type: Object,
+ default: () => {}
+ },
+ fileIndex: {
+ type: Number,
+ default: () =>0
+ },
+ showTips: {
+ type: Boolean,
+ default: () => true
+ },
+ customStyle: {
+ type: String,
+ default: 'width: 190px; height: 190px;'
+ },
+ uploadData: Object
+ },
+ data() {
+ return {
+ uploaded:false,
+ // fileList:[],
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/upload?folder='+this.uploadData.folder
+ }
+ },
+ watch: {
+ fileList (nv,ov) {
+ if(this.fileList ==null){
+ this.fileList = new Array();
+ }
+ if(this.fileList.length == 0){
+ this.uploaded = false
+ }else{
+ this.uploaded=true
+ }
+ // alert(this.fileList)
+ },
+ tipsLabel (nv,ov) {
+ if(this.tipsLabel ==null){
+ this.tipsLabel = ''
+ }
+ }
+ },
+ methods: {
+ removes() {
+ this.uploaded=false
+ this.$emit('remove')
+ },
+ // 涓婁紶鍥剧墖
+ handleExceed(){
+ this.$message.error('鍙厑璁镐笂浼�1涓枃浠讹紝璇峰垹闄ゅ凡浼犳枃浠讹紝閲嶈瘯锛�')
+ },
+ handleFileSuccess(res, file) {
+ if (res.code == 200) {
+ let { data } = res
+ this.uploaded = true
+ // this.fileList = [{name: data.originname, url: data.url }]
+ this.$message.success('涓婁紶鎴愬姛')
+ this.$emit('uploadSuccess', { fileurl: data.imgaddr, fileurlFull: data.url, name: data.originname ,index:this.fileIndex})
+ } else {
+ this.$message.apiFailed('涓婁紶澶辫触')
+ }
+ this.$emit('uploadEnd')
+ },
+ uploadError() {
+ this.$message.apiFailed('涓婁紶澶辫触')
+ this.$emit('endUpload')
+ },
+ // // 鎷︽埅
+ beforeFileUpload(file) {
+
+ this.$emit('uploadBegin')
+ return true
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+$image-width: 150px;
+.avatar-uploader {
+ width: $image-width;
+ height: $image-width;
+}
+::v-deep .el-upload {
+ //border: 1px dashed #d9d9d9;
+ border-radius: 6px;
+ cursor: pointer;
+ position: relative;
+ width: 150px;
+ height: 30px;
+ margin-top: 25px;
+ overflow: hidden;
+ color: #2E68EC;
+ display: inline-block;
+}
+.avatar-uploader .el-upload:hover {
+ border-color: #409EFF;
+}
+.avatar-uploader-icon {
+ line-height: 90px;
+ font-size: 28px;
+ color: #8c939d;
+ width: $image-width;
+ height: $image-width;
+ text-align: center;
+}
+.avatar {
+ width: $image-width;
+ height: $image-width;
+ display: block;
+}#67C23A
+.tips-style {
+ height: 13px;
+ font-size: 13px;
+ font-weight: 400;
+ color: #999999;
+ line-height: 13px;
+}
+</style>
+<style lang="scss" scoped>
+::v-deep .el-upload--picture-card{
+ width: 90px !important;
+ height: 90px !important;
+}
+::v-deep .el-upload-list__item-name{
+ color: #67C23A;
+}
+::v-deep .el-upload-list{
+ position: absolute;
+ left: 0;
+ top: 20px;
+}
+::v-deep .el-upload-list__item {
+ width: 150px !important;
+ height: 100% !important;
+ display: inline-block;
+}
+.icon {
+ -webkit-transform: translate(-50%,-50%);
+ -ms-transform: translate(-50%,-50%);
+ transform: translate(0%, -85%);
+}
+
+</style>
+
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index e215b17..98459a0 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -992,7 +992,7 @@
- public enum UnionChangeStatus {
+ public enum 鍟嗘埛 {
MERGE(0, "寰呯缃�",""),
UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
FINISH(2, "淇濋殰涓�",""),
@@ -1005,7 +1005,7 @@
// 鏋勯�犳柟娉�
- UnionChangeStatus(int key, String name,String info) {
+ 鍟嗘埛(int key, String name,String info) {
this.name = name;
this.key = key;
this.info = info;
@@ -1013,7 +1013,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
+ for (鍟嗘埛 c : 鍟嗘埛.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -1021,7 +1021,7 @@
return null;
}
public static String getInfo(int index) {
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
+ for (鍟嗘埛 c : 鍟嗘埛.values()) {
if (c.getKey() == index) {
return c.info;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index 7f6ff0e..5caee2c 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -714,7 +714,8 @@
List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();
//鎵�鏈夋姇淇濈敵璇蜂繚鍗曟槑缁嗚
- List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getPrice)
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .select(ApplyDetail::getId,ApplyDetail::getApplyId,ApplyDetail::getPrice)
.in(ApplyDetail::getUnionApplyId,unionApply.getId()));
//鎬诲ぉ鏁�
Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
@@ -732,11 +733,12 @@
List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectList(new QueryWrapper<InsuranceApply>()
.lambda().eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
for (InsuranceApply insuranceApply:insuranceApplyList) {
- BigDecimal price = insuranceApply.getPrice();
- Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
+ BigDecimal price = Constants.formatBigdecimal(insuranceApply.getPrice());
+ Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
+ m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
if(unionApplyBXDDDetailTO.isPresent()){
UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
- price = price.add(unionApplyBXDDetailDTO.getServerMoney());
+ price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(unionApplyBXDDetailDTO.getServerMoney()));
//涓婁紶淇濆崟淇℃伅
if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
Multifile multifile = new Multifile();
@@ -762,7 +764,8 @@
currentFee = new BigDecimal(useDays).multiply(price);
}
- List<ApplyDetail> applyDetails = applyDetailList.stream().filter(m->m.getApplyId().equals(insuranceApply.getId())).collect(Collectors.toList());
+ List<ApplyDetail> applyDetails = applyDetailList.stream()
+ .filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList());
//鏇存柊鎶曚繚鐢宠鍗�
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
@@ -790,7 +793,7 @@
unionApplyMapper.update(null,new UpdateWrapper<UnionApply>()
.lambda()
- .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH)
+ .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH.getKey())
.set(UnionApply::getEditDate,new Date())
.set(UnionApply::getEditor,user.getId())
.set(UnionApply::getStartTime,unionApplyBXDDTO.getStartTime())
--
Gitblit v1.9.3