From 06b919319e949de66879a8505e9e4640ad3db18f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 10:21:39 +0800
Subject: [PATCH] 提交一把
---
company/src/components/business/OperaWtbApplyShopWindow.vue | 12
company/src/api/business/insuranceApply.js | 6
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
company/.env.developmentCom | 2
company/src/components/business/OperaInsuranceApplyShopWindow.vue | 2
company/src/components/business/OperaWtbApplyCheckWindow.vue | 378 +++++++----------------------------------
company/.env.developmentShop | 2
company/src/components/business/OperaSettleClaimsWindow.vue | 4
server/company/src/main/resources/application.yml | 2
company/src/components/business/OperaApplyChangeDetailWindow.vue | 2
server/service/src/main/java/com/doumee/core/utils/Constants.java | 8
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 50 +++++
server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java | 18 +
server/shop/src/main/resources/application.yml | 2
company/src/components/business/InsuranceDetails.vue | 1
company/src/components/business/dispatchUnitDetailsPlat.vue | 2
company/src/components/business/OperaApplyChangeUnitDetailWindow.vue | 2
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 2
18 files changed, 159 insertions(+), 338 deletions(-)
diff --git a/company/.env.developmentCom b/company/.env.developmentCom
index b9e8f99..18d635e 100644
--- a/company/.env.developmentCom
+++ b/company/.env.developmentCom
@@ -15,4 +15,4 @@
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.105:10023/'
-VUE_APP_API = 'http://192.168.0.176:10032/'
+VUE_APP_API = 'http://192.168.0.176:10031/'
diff --git a/company/.env.developmentShop b/company/.env.developmentShop
index 9ea5a62..fd0d4ea 100644
--- a/company/.env.developmentShop
+++ b/company/.env.developmentShop
@@ -15,4 +15,4 @@
# 骞冲彴绔�-钀嶅
# VUE_APP_API = 'http://192.168.0.105:10023/'
-VUE_APP_API = 'http://localhost:10031/'
+VUE_APP_API = 'http://localhost:10032/'
diff --git a/company/src/api/business/insuranceApply.js b/company/src/api/business/insuranceApply.js
index df25333..235b185 100644
--- a/company/src/api/business/insuranceApply.js
+++ b/company/src/api/business/insuranceApply.js
@@ -23,6 +23,12 @@
export function back (data) {
return request.post('/business/insuranceApply/back', data)
}
+export function backWtb(data) {
+ return request.post('/business/insuranceApply/back', data)
+}
+export function closeWtbForShop (data) {
+ return request.post('/business/insuranceApply/closeWtbForShop', data)
+}
export function uploadToubaodan (data) {
return request.post('/business/insuranceApply/uploadToubaodan', data)
diff --git a/company/src/components/business/InsuranceDetails.vue b/company/src/components/business/InsuranceDetails.vue
index d906679..9cb2c76 100644
--- a/company/src/components/business/InsuranceDetails.vue
+++ b/company/src/components/business/InsuranceDetails.vue
@@ -135,6 +135,7 @@
this.model = target
this.type=type
this.form.id=target.id
+ this.form.checkInfo=''
this.getDetailListDo()
},
getDetailListDo(){
diff --git a/company/src/components/business/OperaApplyChangeDetailWindow.vue b/company/src/components/business/OperaApplyChangeDetailWindow.vue
index f67f855..74f831a 100644
--- a/company/src/components/business/OperaApplyChangeDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeDetailWindow.vue
@@ -171,7 +171,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: (activity.creatorType==2? activity.companyName: "骞冲彴绔�") }}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 6defd05..13e9d0e 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -162,7 +162,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: (activity.creatorType==2? activity.companyName: "骞冲彴绔�")}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/company/src/components/business/OperaInsuranceApplyShopWindow.vue b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
index 8632eff..a668334 100644
--- a/company/src/components/business/OperaInsuranceApplyShopWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyShopWindow.vue
@@ -399,7 +399,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType == 1 ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1 || activity.creatorType == 2) ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 8632eff..e7e599e 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -399,7 +399,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType == 1 ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2) ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/company/src/components/business/OperaSettleClaimsWindow.vue b/company/src/components/business/OperaSettleClaimsWindow.vue
index 363bd10..e6a9076 100644
--- a/company/src/components/business/OperaSettleClaimsWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsWindow.vue
@@ -399,7 +399,7 @@
{{activity.content}}
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
<div style="display: flex; flex-direction: column;" v-else>
@@ -410,7 +410,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/company/src/components/business/OperaWtbApplyCheckWindow.vue b/company/src/components/business/OperaWtbApplyCheckWindow.vue
index 973f19b..7c4ef48 100644
--- a/company/src/components/business/OperaWtbApplyCheckWindow.vue
+++ b/company/src/components/business/OperaWtbApplyCheckWindow.vue
@@ -8,62 +8,13 @@
>
<!-- 閫�鍥炴姇淇� -->
<el-form v-if="visible1==true" :model="form" ref="form1" :rules="rules1" style="width: 100%;">
- <el-form-item label="濉啓閫�鍥炶鏄庯細" prop="backCheckInfo">
- <el-input type="textarea" v-model="form.backCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
+ <el-form-item label="濉啓閫�鍥炶鏄庯細" prop="backBackInfo">
+ <el-input type="textarea" v-model="form.backWtb" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
</el-form>
- <el-form v-if="visible2==true" :model="form" ref="form2" :rules="rules2" style="width: 100%;">
- <el-form-item label="涓婁紶鎶曚繚鍗曪細" prop="toubaodanFile">
- <UploadFile @remove="dele2" :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
- </el-form-item>
- </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>
- <el-form-item label="" >
- <el-radio-group v-model="form.selectRadio" @change="selectChange">
- <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
- <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�" prop="startTime" v-if="form.selectRadio === 1">
- <el-date-picker
- v-model="form.startTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
- {{ form.startTime }}
- </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 :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
- </el-form-item>
- </el-form>
- <!-- 淇敼淇濋櫓鍗� -->
- <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
- <el-form-item label="淇濋櫓鐢熸晥璧锋湡锛�">
- {{ model.startTime }}
- </el-form-item>
- <el-form-item label="淇濆崟鍙凤細" prop="editCode">
- <el-input v-model="form.editCode" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
- <el-form-item label="涓婁紶淇濋櫓鍗曪細" prop="editBaoxianFile">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="editBaoxianFileUploaded" />
- </el-form-item>
- <el-form-item label="淇敼鍘熷洜锛�" prop="editCheckInfo">
- <el-input type="textarea" v-model="form.editCheckInfo" placeholder="璇疯緭鍏�" v-trim/>
- </el-form-item>
- </el-form>
- <el-form v-if="visible5==true || visible6==true" :model="form" ref="form5" :rules="rules5" style="width: 100%;">
- <el-form-item label="濉啓璇存槑锛�" prop="dealBackInfo">
- <el-input type="textarea" v-model="form.dealBackInfo" placeholder="璇疯緭鍏�" v-trim/>
+ <el-form v-if="visible2==true" :model="form" ref="form2" :rules="rules2" style="width: 100%;">
+ <el-form-item label="濉啓鍏抽棴璇存槑锛�" prop="dealCloseInfo">
+ <el-input type="textarea" v-model="form.dealCloseInfo" placeholder="璇疯緭鍏�" v-trim/>
</el-form-item>
</el-form>
<template v-slot:footer>
@@ -76,150 +27,63 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
-import {
- dealBackApply,
- back,
- uploadBaoxiandan,
- editBaoxiandan,
- uploadToubaodan,
- check
-} from "@/api/business/insuranceApply";
-import UploadFile from "@/components/common/UploadFile";
-import {remark} from "@/api/business/settleClaims";
+import { check, closeWtbForShop } from '@/api/business/insuranceApply'
export default {
name: 'OperaWtbApplyCheckWindow',
extends: BaseOpera,
- components: {UploadFile, GlobalWindow },
+ components: { GlobalWindow },
data () {
return {
// 琛ㄥ崟鏁版嵁
model: {},
- falg :0,
+ falg: 0,
rules1: {
backCheckInfo: [
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
]
},
rules2: {
- toubaodanFile: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ]
- },
- rules3: {
- code: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
- startTime: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
- baoxianFile: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
- },
- rules5: {
- dealBackInfo: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ]
- },
- rules4: {
- editCode: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
- editBaoxianFile: [
- { required: true, message: '璇峰畬鍠勪俊鎭�' }
- ],
- editCheckInfo: [
+ dealCloseInfo: [
{ required: true, message: '璇峰畬鍠勪俊鎭�' }
]
},
form: {
- id: null,
- backCheckInfo:'',
- dealBackInfo:'',
- editCheckInfo:'',
- editDate: '',
- editCode: '',
- startTime:null,
- code:null,
- toubaodanFile:null,
- baoxianFile:null,
- editBaoxianFile:null,
- fileList: [],
- fileList1: [],
- fileList2: [],
- selectRadio:0
+ id: null,
+ backCheckInfo: '',
+ dealCloseInfo: ''
},
visible1: false,
- visible2: false,
- visible3: false,
- visible4: false,
- visible5: false,
- visible6: false,
+ visible2: false
}
},
created () {
- this.config({
- api: '/business/insuranceApply',
- 'field.id': 'id'
- })
+ this.config({
+ api: '/business/insuranceApply',
+ 'field.id': 'id'
+ })
},
methods: {
- dele2() {
- this.form.toubaodanFile = ''
+ open (title, target, flag) {
+ this.visible = true
+ this.model = {}
+ this.form = {
+ id: null,
+ backBackInfo: '',
+ dealCloseInfo: ''
+ },
+ this.model = target
+ this.title = title
+ this.flag = flag
+ this.visible1 = false
+ this.visible2 = false
+ if (flag == 1) {
+ this.visible1 = true
+ }
+ if (flag == 2) {
+ this.visible2 = true
+ }
},
- open(title,target,flag){
- this.visible=true
- this.model={}
- this.form= {
- id: null,
- backCheckInfo:'',
- dealBackInfo:'',
- editCheckInfo:'',
- editDate: '',
- editCode: '',
- startTime:null,
- code:null,
- toubaodanFile:null,
- baoxianFile:null,
- editBaoxianFile:null,
- fileList: [],
- fileList1: [],
- fileList2: [],
- selectRadio:0
- },
- this.model = target
- this.form.startTime = target.startTime
- this.title = title
- this.flag = flag
- this.visible1 = false
- this.visible2 = false
- this.visible3 = false
- this.visible4 = false
- this.visible5 = false
- this.visible6 = false
- if(flag == 1){
- this.visible1 = true
- }
- if(flag == 2){
- this.visible2 = true
- }
- if(flag == 3){
- this.visible3 = true
- }
- if(flag == 4){
- this.visible4 = true
- this.$nextTick(() => {
- this.$refs.form4.resetFields()
- })
- }
- if(flag == 5){
- this.visible5 = true
- }
- if(flag == 6){
- this.visible6 = true
- }
- },
- doSubmit(){
+ doSubmit () {
if (this.flag == 1) {
this.$refs.form1.validate((valid) => {
// debugger
@@ -234,151 +98,51 @@
if (!valid) {
return
}
- this.uploadToubaodan()
- })
- } else if (this.flag == 3) {
- this.$refs.form3.validate((valid) => {
- // debugger
- if (!valid) {
- return
- }
- this.uploadBaoxiandan()
- })
- } else if (this.flag == 4) {
- this.$refs.form4.validate((valid) => {
- // debugger
- if (!valid) {
- return
- }
- this.editBaoxiandan()
- })
- } else if (this.flag == 5) {
- this.$refs.form5.validate((valid) => {
- // debugger
- if (!valid) {
- return
- }
- this.dealBackApply(1)
- })
- } else if (this.flag == 6) {
- this.$refs.form5.validate((valid) => {
- // debugger
- if (!valid) {
- return
- }
- this.dealBackApply(0)
+ this.closeDo()
})
}
},
- selectChange(){
- if(this.form.selectRadio == 0){
- this.form.startTime = this.model.startTime
- }else{
- this.form.startTime = ''
- }
- },
- toubaoFileUploaded(data){
- this.form.toubaodanFile=data
- },
- baoxianFileUploaded(data){
- this.form.baoxianFile=data
- },
- editBaoxianFileUploaded(data){
- this.form.editBaoxianFile=data
- },
- backDo(){
+ backDo () {
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- back({id:this.model.id,checkInfo:this.form.backCheckInfo})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
+ .then(() => {
+ this.isWorking = true
+ check({ id: this.model.id, checkInfo: this.form.backCheckInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
},
- uploadToubaodan(){
+ closeDo () {
this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- uploadToubaodan({id:this.model.id,toubaodanFile:this.form.toubaodanFile})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
+ .then(() => {
+ this.isWorking = true
+ closeWtbForShop({ id: this.model.id, checkInfo: this.form.dealCloseInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
},
- dealBackApply(type){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- dealBackApply({ id: this.model.id, checkInfo: this.form.dealBackInfo, dealBackApply: type })
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
- },
- uploadBaoxiandan(){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- uploadBaoxiandan({id:this.model.id,startTime:this.form.startTime,code:this.form.code,baoxiandanFile:this.form.baoxianFile})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
+ successEvent () {
},
- editBaoxiandan(){
- this.$dialog.messageConfirm('纭杩涜璇ユ搷浣滃悧锛�')
- .then(() => {
- this.isWorking = true
- editBaoxiandan({id:this.model.id, checkInfo:this.form.editCheckInfo,code:this.form.editCode,baoxiandanFile:this.form.editBaoxianFile})
- .then(response => {
- this.visible = false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- })
+ handleSizeChange (val) {
+ console.log(`姣忛〉 ${val} 鏉)
},
- handleRemove(file, fileList) {
- console.log(file, fileList);
- },
- handlePreview(file) {
- console.log(file);
- },
- handleExceed(files, fileList) {
- this.$message.warning(`褰撳墠闄愬埗閫夋嫨 3 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
- },
- beforeRemove(file, fileList) {
- return this.$confirm(`纭畾绉婚櫎 ${ file.name }锛焋);
- },
- successEvent() {
+ handleCurrentChange (val) {
+ console.log(`褰撳墠椤�: ${val}`)
+ },
+ handleClick (tab, event) {
+ console.log(tab, event)
+ },
+ onSubmit () {
- },
- handleSizeChange(val) {
- console.log(`姣忛〉 ${val} 鏉);
- },
- handleCurrentChange(val) {
- console.log(`褰撳墠椤�: ${val}`);
- },
- handleClick(tab, event) {
- console.log(tab, event);
- },
- onSubmit() {
-
- }
+ }
}
}
</script>
diff --git a/company/src/components/business/OperaWtbApplyShopWindow.vue b/company/src/components/business/OperaWtbApplyShopWindow.vue
index ff5a3a5..b754745 100644
--- a/company/src/components/business/OperaWtbApplyShopWindow.vue
+++ b/company/src/components/business/OperaWtbApplyShopWindow.vue
@@ -39,8 +39,8 @@
<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="model.status == 22" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
- <el-button v-if="model.status == 22" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.status == 23" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.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>
@@ -403,7 +403,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType == 1 ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2) ? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
@@ -412,7 +412,7 @@
</div>
</div>
<InsuranceDetails ref="InsuranceDetails" @success="successEvent" />
- <OperaInsuranceApplyCheckWindow ref="OperaInsuranceApplyCheckWindow" @success="successEvent" />
+ <OperaWtbApplyCheckWindow ref="OperaWtbApplyCheckWindow" @success="successEvent" />
<!-- 浼佷笟鐢宠閫�鍥� -->
<applyReturn ref="applyReturn" @success="successEvent" />
<!-- 鏂板鎶曚繚 -->
@@ -464,7 +464,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import InsuranceDetails from '@/components/business/InsuranceDetails'
-import OperaInsuranceApplyCheckWindow from '@/components/business/OperaInsuranceApplyCheckWindow'
+import OperaWtbApplyCheckWindow from '@/components/business/OperaWtbApplyCheckWindow'
import additionSubtractionApplication from '@/components/enterprise/additionSubtractionApplication'
import factoryChange from '@/components/enterprise/factoryChange'
import operaverifyPhoneNumberWindew from '@/components/business/operaverifyPhoneNumberWindew'
@@ -494,7 +494,7 @@
components: {
GlobalWindow,
InsuranceDetails,
- OperaInsuranceApplyCheckWindow,
+ OperaWtbApplyCheckWindow,
applyReturn,
OperaInsuranceApply,
additionSubtractionApplication,
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index 1534ca5..e4149e1 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -97,7 +97,7 @@
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
- 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{activity.creatorType==1? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
+ 鎿嶄綔鍛�-{{activity.creatorName}}锛坽{(activity.creatorType == 1||activity.creatorType == 2)? activity.companyName: "骞冲彴绔�"}}锛墈{activity.createDate}}
</span>
</div>
</el-timeline-item>
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index 68dd011..83ded24 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -6,7 +6,7 @@
# env: production
server:
# port: 10022
- port: 10032
+ port: 10031
spring:
# application:git
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 b609979..08a0aca 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
@@ -769,9 +769,6 @@
PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",0),
PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- UPLOAD_AGAIN(26, "鍐嶆鎶曚繚","",0),
- PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
-
CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
@@ -793,6 +790,11 @@
CA_WTB_FINISH_MEMBER_LIST(28, "濮旀墭淇� - 鍔犲噺淇濈缃蹭汉鍛樺悕鍗�","",1),
+ UPLOAD_AGAIN(29, "鍐嶆鎶曚繚","",0),
+
+ PALTFORM_EDIT_BD(30, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
+ SHOP_CLOSE_WTB_APPLY(31, "鍏抽棴鐢宠","鍘熷洜锛�${param}",0),
+
diff --git a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
index 0ee55fd..cc8a60d 100644
--- a/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
+++ b/server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java
@@ -108,7 +108,7 @@
void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
Integer back(InsuranceApply insuranceApply);
-
+ Integer closeWtbForShop(InsuranceApply insuranceApply);
Integer uploadToubaodan(InsuranceApply insuranceApply);
Integer uploadBaoxiandan(InsuranceApply insuranceApply);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index 0902a7f..6e65926 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -153,6 +153,39 @@
return 1;
}
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public Integer closeWtbForShop(InsuranceApply insuranceApply) {
+ if(insuranceApply.getId() == null ||StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
+
+ if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ //鍙湁瀹℃牳閫氳繃鐨勭姸鎬佸彲鍏抽棴
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ InsuranceApply update = new InsuranceApply();
+ update.setEditDate(new Date());
+ update.setEditor(user.getId());
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_CLOSED.getKey());
+ update.setCheckDate(update.getEditDate());
+ update.setCheckInfo(insuranceApply.getCheckInfo());
+ update.setCheckUserId(user.getId());
+ update.setId(model.getId());
+ insuranceApplyMapper.updateById(update);
+
+ Constants.ApplyLogType applyLogType = Constants.ApplyLogType.SHOP_CLOSE_WTB_APPLY;
+ String info =applyLogType.getInfo();
+ info = info.replace("${param}", update.getCheckInfo());
+ ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
+ applyLogMapper.insert(log);
+ return 1;
+ }
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -1261,15 +1294,19 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
}
- if(solutions.getType().equals(Constants.ZERO)){
+ if(Constants.equalsObject(solutions.getType(),Constants.ZERO)){
if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
}else{
- if(!user.getType().equals(Constants.TWO)){
+ if(!Constants.equalsObject(user.getType(),Constants.TWO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炲晢鎴风鏃犳硶杩涜璇ユ搷浣�");
}
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_RETURN.getKey())){
+ //濮旀墭淇濆緟绛剧讲銆佸緟瀹℃牳鍙繘琛岄��鍥炴搷浣�
+ if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
+ )){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
}
@@ -1286,9 +1323,14 @@
//濡傛灉鏄笉閫氳繃
applyLogType = Constants.ApplyLogType.PLATFORM_RETURN ;
update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+ if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
+ }
}else{
applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
- update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+ if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
+ }
}
insuranceApplyMapper.updateById(update);
diff --git a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
index d07fa18..56b4cb2 100644
--- a/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
+++ b/server/shop/src/main/java/com/doumee/api/business/InsuranceApplyController.java
@@ -38,19 +38,25 @@
public ApiResponse create(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.create(insuranceApply));
}
- @ApiOperation("骞冲彴鎶曚繚瀹℃牳")
+ @ApiOperation("鍟嗘埛鎶曚繚瀹℃牳")
@PostMapping("/check")
@RequiresPermissions("business:insuranceapply:check")
public ApiResponse check(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.check(insuranceApply));
}
- @ApiOperation("骞冲彴閫�鍥炴姇淇�")
+ @ApiOperation("鍟嗘埛閫�鍥炴姇淇�")
@PostMapping("/back")
@RequiresPermissions("business:insuranceapply:back")
public ApiResponse back(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.back(insuranceApply));
}
- @ApiOperation("骞冲彴涓婁紶鎶曚繚鍗�")
+ @ApiOperation("鍟嗘埛鍏抽棴濮旀墭鎶曚繚")
+ @PostMapping("/closeWtbForShop")
+ @RequiresPermissions("business:insuranceapply:back")
+ public ApiResponse closeWtbForShop(@RequestBody InsuranceApply insuranceApply) {
+ return ApiResponse.success(insuranceApplyService.closeWtbForShop(insuranceApply));
+ }
+ @ApiOperation("鍟嗘埛涓婁紶鎶曚繚鍗�")
@PostMapping("/uploadToubaodan")
@RequiresPermissions("business:insuranceapply:uploadToubaodan")
public ApiResponse uploadToubaodan(@RequestBody InsuranceApply insuranceApply) {
@@ -65,19 +71,19 @@
}
- @ApiOperation("骞冲彴涓婁紶淇濋櫓鍗�")
+ @ApiOperation("鍟嗘埛涓婁紶淇濋櫓鍗�")
@PostMapping("/uploadBaoxiandan")
@RequiresPermissions("business:insuranceapply:uploadBaoxiandan")
public ApiResponse uploadBaoxiandan(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.uploadBaoxiandan(insuranceApply));
}
- @ApiOperation("骞冲彴澶勭悊閫�鍗曠敵璇�")
+ @ApiOperation("鍟嗘埛澶勭悊閫�鍗曠敵璇�")
@PostMapping("/dealBackApply")
@RequiresPermissions("business:insuranceapply:dealBackApply")
public ApiResponse dealBackApply(@RequestBody InsuranceApply insuranceApply) {
return ApiResponse.success(insuranceApplyService.dealBackApply(insuranceApply));
}
- @ApiOperation("骞冲彴淇敼淇濋櫓鍗�")
+ @ApiOperation("鍟嗘埛淇敼淇濋櫓鍗�")
@PostMapping("/editBaoxiandan")
@RequiresPermissions("business:insuranceapply:editBaoxiandan")
public ApiResponse editBaoxiandan(@RequestBody InsuranceApply insuranceApply) {
diff --git a/server/shop/src/main/resources/application.yml b/server/shop/src/main/resources/application.yml
index 83ded24..68dd011 100644
--- a/server/shop/src/main/resources/application.yml
+++ b/server/shop/src/main/resources/application.yml
@@ -6,7 +6,7 @@
# env: production
server:
# port: 10022
- port: 10031
+ port: 10032
spring:
# application:git
--
Gitblit v1.9.3