From d4920f7a0b3146a2218a210d3f93b655ff010eb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 17:14:13 +0800
Subject: [PATCH] 开发业务接口
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 21
company/src/components/business/OperaSettleClaimsCheckWindow.vue | 482 +++++++++++++++++++-----------------
server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java | 6
company/src/views/business/taxes.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 2
company/src/components/business/OperaInsuranceApplyCheckWindow.vue | 246 ++++++++++--------
company/src/components/business/OperaCompanyWindow.vue | 2
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 16
8 files changed, 416 insertions(+), 361 deletions(-)
diff --git a/company/src/components/business/OperaCompanyWindow.vue b/company/src/components/business/OperaCompanyWindow.vue
index ea7823e..6bf7e17 100644
--- a/company/src/components/business/OperaCompanyWindow.vue
+++ b/company/src/components/business/OperaCompanyWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="50%"
+ width="60%"
:visible.sync="visible"
:confirm-working="isWorking"
@confirm="confirm"
diff --git a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
index 8c6e041..3308baa 100644
--- a/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyCheckWindow.vue
@@ -7,109 +7,65 @@
@confirm="confirm"
>
<!-- 閫�鍥炴姇淇� -->
- <div v-if="visible1==true" class="form">
- <div class="form_item">
- <div class="form_item_label"><span>*</span>濉啓閫�鍥炶鏄庯細</div>
- <div class="form_item_val">
- <textarea v-model="form.backCheckInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <!-- 涓婁紶鎶曚繚鍗� -->
- <div v-if="visible2==true" class="form">
- <div class="form_item">
- <div class="form_item_label">涓婁紶鎶曚繚鍗曪細</div>
- <div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
- </div>
- </div>
- </div>
+ <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>
+ </el-form>
+ <el-form v-if="visible2==true" :model="form" ref="form2" :rules="rules2" style="width: 100%;">
+ <el-form-item label="涓婁紶鎶曚繚鍗曪細" prop="toubaodanFile">
+ <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList" @uploadSuccess="toubaoFileUploaded" />
+ </el-form-item>
+ </el-form>
<!-- 涓婁紶淇濋櫓鍗� -->
- <div v-if="visible3==true" class="form">
- <div class="form_item">
- <div class="form_item_label">瀹㈡埛鏈熸湜淇濋櫓鐢熸晥璧锋湡锛�</div>
- <div class="form_item_val">{{ model.applyStartTime }}</div>
- </div>
- <div class="form_item">
- <div class="form_item_label">淇濋櫓鐢熸晥璧锋湡鏄惁涓�鑷达細</div>
- <div class="form_item_val">
- <el-radio-group v-model="form.selectRadio" @change="selectChange">
- <el-radio :label="0" >涓庝繚鍗曚竴鑷�</el-radio>
- <el-radio :label="1" >涓庝繚鍗曚笉涓�鑷�</el-radio>
- </el-radio-group>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label"><span>*</span>淇濋櫓鐢熸晥璧锋湡锛�</div>
- <div class="form_item_val">
- <el-date-picker
- v-model="form.startTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">淇濋櫓鐢熸晥璧锋湡锛�</div>
- <div class="form_item_val">{{ form.startTime }}</div>
- </div>
- <div class="form_item">
- <div class="form_item_label"><span>*</span>淇濆崟鍙凤細</div>
- <div class="form_item_val" >
- <el-input v-model="form.code" placeholder="璇疯緭鍏�"></el-input>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">涓婁紶淇濋櫓鍗曪細</div>
- <div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList1" @uploadSuccess="baoxianFileUploaded" />
- </div>
- </div>
- </div>
+ <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" >
+ <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>
<!-- 淇敼淇濋櫓鍗� -->
- <div v-if="visible4==true" class="form">
- <div class="form_item">
- <div class="form_item_label">淇濋櫓鐢熸晥璧锋湡锛�</div>
- <div class="form_item_val">{{ model.startTime }}</div>
- </div>
- <div class="form_item">
- <div class="form_item_label"><span>*</span>淇濆崟鍙凤細</div>
- <div class="form_item_val">
- <el-input v-model="form.editCode" placeholder="璇疯緭鍏�"></el-input>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label"><span>*</span>涓婁紶淇濋櫓鍗曪細</div>
- <div class="form_item_val">
- <UploadFile :uploadData="{ folder: 'apply',fileType:'.pdf' }" :fileList="form.fileList2" @uploadSuccess="editBaoxianFileUploaded" />
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label"><span>*</span>淇敼鍘熷洜锛�</div>
- <div class="form_item_val">
- <el-input placeholder="璇疯緭鍏�" v-model="form.editCheckInfo" ></el-input>
- </div>
- </div>
- </div>
- <!-- 椹冲洖閫�鍥炵敵璇� -->
- <div v-if="visible5==true" class="form">
- <div class="form_item">
- <div class="form_item_label"><span>*</span>濉啓璇存槑锛�</div>
- <div class="form_item_val">
- <textarea v-model="form.dealBackInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <!-- 鍚屾剰閫�鍥炵敵璇� -->
- <div v-if="visible6==true" class="form">
- <div class="form_item">
- <div class="form_item_label"><span>*</span>鍚屾剰閫�鍥炶鏄庯細</div>
- <div class="form_item_val">
- <textarea v-model="form.dealBackInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
+ <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-item>
+ </el-form>
<template v-slot:footer>
<el-button type="primary" @click="doSubmit">纭� 瀹�</el-button>
<el-button @click="visible=false">鍙栨秷</el-button>
@@ -129,6 +85,7 @@
check
} from "@/api/business/insuranceApply";
import UploadFile from "@/components/common/UploadFile";
+import {remark} from "@/api/business/settleClaims";
export default {
name: 'OperaChangeApplyCheckWindow',
extends: BaseOpera,
@@ -138,6 +95,43 @@
// 琛ㄥ崟鏁版嵁
model: {},
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: [
+ { required: true, message: '璇峰畬鍠勪俊鎭�' }
+ ],
+ },
form: {
id: null,
backCheckInfo:'',
@@ -221,17 +215,53 @@
},
doSubmit(){
if (this.flag == 1) {
- this.backDo()
- } else if (this.flag == 2) {
- this.uploadToubaodan()
+ this.$refs.form1.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.backDo()
+ })
+ } else if (this.flag == 2) {
+ this.$refs.form2.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.uploadToubaodan()
+ })
} else if (this.flag == 3) {
- this.uploadBaoxiandan()
+ this.$refs.form3.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.uploadBaoxiandan()
+ })
} else if (this.flag == 4) {
- this.editBaoxiandan()
+ this.$refs.form4.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.editBaoxiandan()
+ })
} else if (this.flag == 5) {
- this.dealBackApply(1)
+ this.$refs.form5.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.dealBackApply(1)
+ })
} else if (this.flag == 6) {
- this.dealBackApply(0)
+ this.$refs.form5.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ this.dealBackApply(0)
+ })
}
},
selectChange(){
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index 5e08c61..fc12b61 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -31,16 +31,17 @@
<el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
<el-button v-if="model.status == 2" type="primary" @click="goSign">绛剧讲鎶曚繚鍗�</el-button>
</template>
- <template v-else>
- <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
- <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
- <el-button v-if="model.status == 10" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
- <el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
- <el-button v-if="model.status == 6 || model.status == 7|| model.status == 8" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
- <el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
- <el-button v-if="model.status == 5" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
- </template>
+ <template v-else>
+ <el-button type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚璇︽儏鍗�',model,0)">瀵煎嚭璇﹀崟</el-button>
+ <el-button v-if="[2, 3, 5, 7, 8].includes(model.status)" type="primary" @click="viewToubaodan">鏌ョ湅鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 5" type="primary" @click="viewBaoxiandan">鏌ョ湅淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status == 10" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶鎶曚繚鍗�',model,2)">涓婁紶鎶曚繚鍗�</el-button>
+ <el-button v-if="model.status == 3" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('涓婁紶淇濋櫓鍗�',model,3)">涓婁紶淇濋櫓鍗�</el-button>
+ <el-button v-if="model.status == 6 || model.status == 7|| model.status == 8" type="primary" @click="$refs.OperaInsuranceApplyCheckWindow.open('椹冲洖閫�鍥炵敵璇�',model,5)">椹冲洖閫�鍥炵敵璇�</el-button>
+ <el-button v-if="model.status == 0" type="primary" @click="$refs.InsuranceDetails.open('鎶曚繚瀹℃牳',model,1)">鎶曚繚瀹℃牳</el-button>
+ <el-button v-if="model.status != 5 && model.status != 4 && model.status != 1" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('閫�鍥炴姇淇�',model,1)">閫�鍥炴姇淇�</el-button>
+ <el-button v-if="model.status == 5" type="danger" @click="$refs.OperaInsuranceApplyCheckWindow.open('淇敼淇濋櫓鍗�',model,4)">淇敼淇濋櫓鍗�</el-button>
+ </template>
</div>
</div>
<div class="desc_item_from">
diff --git a/company/src/components/business/OperaSettleClaimsCheckWindow.vue b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
index a88f38b..d3d79f9 100644
--- a/company/src/components/business/OperaSettleClaimsCheckWindow.vue
+++ b/company/src/components/business/OperaSettleClaimsCheckWindow.vue
@@ -6,92 +6,51 @@
:confirm-working="isWorking"
@confirm="confirm"
>
- <div v-if="visible1==true" class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>鎶ユ鍙凤細
- </div>
- <div class="form_item_val">
- <input type="text" v-model="form.reportNum" placeholder="璇疯緭鍏�">
- </div>
- </div>
- </div>
-
- <div v-if="visible2==true" class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>澶勭悊杩涘睍锛�
- </div>
- <div class="form_item_val">
- <textarea v-model="form.bizInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <div v-if="visible3==true" class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>濉啓鎾ら攢璇存槑锛�
- </div>
- <div class="form_item_val">
- <textarea v-model="form.backInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- </div>
- <div v-if="visible4==true" class="form">
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>缁撴鍐呭锛�
- </div>
- <div class="form_item_val">
- <textarea v-model="form.doneInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- 鍖荤枟鐞嗚禂锛�
- </div>
- <div class="form_item_val">
- <input v-model="form.ylClaimAccount" placeholder="璇疯緭鍏�" />
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- 璇伐鐞嗚禂锛�
- </div>
- <div class="form_item_val">
- <input v-model="form.wgClaimAccount" placeholder="璇疯緭鍏�" />
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- 浼ゆ畫鐞嗚禂锛�
- </div>
- <div class="form_item_val">
- <input v-model="form.scClaimAccount" placeholder="璇疯緭鍏�" />
- </div>
- </div>
- <div class="form_item">
- <div class="form_item_label">
- 姝讳骸鐞嗚禂锛�
- </div>
- <div class="form_item_val">
- <input v-model="form.swClaimAccount" placeholder="璇疯緭鍏�" />
- </div>
- </div>
- </div>
+ <el-form v-if="visible1==true" :model="form" ref="form1" :rules="rules1" style="width: 100%;">
+ <el-form-item label="鎶ユ鍙凤細" prop="reportNum">
+ <el-input v-model="form.reportNum" 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="bizInfo">
+ <el-input type="textarea" v-model="form.bizInfo" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </el-form>
+ <el-form v-if="visible3==true" :model="form" ref="form3" :rules="rules3" style="width: 100%;">
+ <el-form-item label="鎾ら攢璇存槑锛�" prop="backInfo">
+ <el-input type="textarea" v-model="form.backInfo" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </el-form>
+ <el-form v-if="visible4==true" :model="form" ref="form4" :rules="rules4" style="width: 100%;">
+ <el-form-item label="缁撴鍐呭锛�" prop="doneInfo">
+ <el-input type="textarea" v-model="form.doneInfo" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鍖荤枟鐞嗚禂(鍏�)锛�" prop="ylClaimAccount">
+ <el-input type="number" v-model="form.ylClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="璇伐鐞嗚禂(鍏�)锛�" prop="wgClaimAccount">
+ <el-input type="number" v-model="form.wgClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="浼ゆ畫鐞嗚禂(鍏�)锛�" prop="scClaimAccount">
+ <el-input type="number" v-model="form.scClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="姝讳骸鐞嗚禂(鍏�)锛�" prop="swClaimAccount">
+ <el-input type="number" v-model="form.swClaimAccount" @change="changeAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ <el-form-item label="鎬婚噾棰濓細" >
+ <el-input type="number" readonly v-model="form.totalAccount" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </el-form>
<div v-if="visible5 ==true" class="form">
<div class="form_span" v-for="(item,index) in remarkLogList" :key="index">
<span>鐞嗚禂鍛�-{{ item.creatorName }} {{item.createDate }}</span>
<span>{{item.content }}</span>
</div>
- <div class="form_item">
- <div class="form_item_label">
- <span>*</span>濉啓澶囨敞鏍囩锛�
- </div>
- <div class="form_item_val">
- <textarea v-model="form.remarkInfo" placeholder="璇疯緭鍏�"></textarea>
- </div>
- </div>
+ <el-form :model="form" ref="form5" :rules="rules5" style="width: 100%;">
+ <el-form-item label="濉啓澶囨敞鏍囩锛�" prop="remarkInfo">
+ <el-input type="textarea" v-model="form.remarkInfo" placeholder="璇疯緭鍏�" v-trim/>
+ </el-form-item>
+ </el-form>
</div>
<template v-slot:footer>
<el-button type="primary" @click="doSubmit">纭畾</el-button>
@@ -101,155 +60,220 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import {addCode, back, dealBiz,doneCommit, remark} from "@/api/business/settleClaims";
- export default {
- name: 'OperaSettleClaimsCheckWindow',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- remarkLogList:[],
- type:0,
- // 琛ㄥ崟鏁版嵁
- form: {
- id: null,
- checkInfo: null,
- bizInfo: null,
- doneInfo: null,
- backInfo: null,
- remarkInfo: null,
- ylClaimAccount: null,
- wgClaimAccount: null,
- swClaimAccount: null,
- scClaimAccount: null,
- reportNum: null,
- },
- model:{},
- activeName: 'first',
- reverse: true,
- tableData: [],
- visible1: false,
- visible2: false,
- visible3: false,
- visible4: false,
- visible5: false
- }
- },
- created () {
- this.config({
- api: '/business/settleClaims',
- 'field.id': 'id'
- })
- },
- methods: {
- open(title,target,target1,type){
- this.model ={}
- this.model = target
- this.title=title
- this.visible=true
- this.type=type
- this.remarkLogList= target1
- this.visible1=false,
- this.visible2= false,
- this.visible3=false,
- this. visible4= false,
- this. visible5= false
- this.form=target
- this. form= {
- id: null,
- checkInfo: null,
- doneInfo: null,
- remarkInfo: null,
- bizInfo: null,
- backInfo: null,
- ylClaimAccount: null,
- wgClaimAccount: null,
- swClaimAccount: null,
- scClaimAccount: null,
- reportNum: null,
- }
- if(type==1){
- this.visible1=true
- }
- if(type==2){
- this.visible2=true
- }
- if(type==3){
- this.visible3=true
- }
- if(type==4){
- this.visible4=true
- }
- if(type==5){
- this.visible5=true
- }
- },
- doSubmit(type) {
- var that =this
- if(this.type ===5){
- // this.isWorking = true
- remark({id:that.model.id,checkInfo:that.form.remarkInfo})
- .then(response => {
- this.visible=false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- }else if(this.type === 4){
- // this.isWorking = true
- doneCommit({id: that.model.id, checkInfo: that.form.doneInfo,
- ylClaimAccount: that.form.ylClaimAccount,
- wgClaimAccount: that.form.wgClaimAccount,
- swClaimAccount: that.form.swClaimAccount,
- scClaimAccount: that.form.scClaimAccount})
- .then(response => {
- this.visible=false
- this.$emit('success')
- }).catch(err => {
- this.$tip.apiFailed(err)
- })
- }else if(this.type===2){
- //鐞嗚禂澶勭悊
- dealBiz({ id: that.model.id, checkInfo:that.form.bizInfo })
- .then(response => {
- this.visible=false
- this.$emit('success')
- }).catch(err => {
- console.log(err)
- this.$tip.apiFailed(err)
- }).finally(() => {
- this.isWorking = false
- })
- }else if(this.type===3){
- //鐞嗚禂澶勭悊
- back({ id: that.model.id, checkInfo:that.form.backInfo })
- .then(response => {
- this.visible=false
- this.$emit('success')
- }).catch(err => {
- console.log(err)
- this.$tip.apiFailed(err)
- }).finally(() => {
- this.isWorking = false
- })
- }else if(this.type===1){
- //娣诲姞澶囨鍙�
- addCode({ id: that.model.id, reportNum:that.form.reportNum })
- .then(response => {
- this.visible=false
- this.$emit('success')
- }).catch(err => {
- console.log(err)
- this.$tip.apiFailed(err)
- }).finally(() => {
- this.isWorking = false
- })
- }
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { addCode, back, dealBiz, doneCommit, remark } from '@/api/business/settleClaims'
+export default {
+ name: 'OperaSettleClaimsCheckWindow',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ remarkLogList: [],
+ type: 0,
+ // 琛ㄥ崟鏁版嵁
+ form: {
+ id: null,
+ checkInfo: null,
+ bizInfo: null,
+ doneInfo: null,
+ backInfo: null,
+ remarkInfo: null,
+ ylClaimAccount: 0,
+ wgClaimAccount: 0,
+ swClaimAccount: 0,
+ scClaimAccount: 0,
+ reportNum: null,
+ totalAccount:0
+ },
+ model: {},
+ activeName: 'first',
+ reverse: true,
+ tableData: [],
+ visible1: false,
+ visible2: false,
+ visible3: false,
+ visible4: false,
+ visible5: false,
+ rules1: {
+ reportNum: [
+ { required: true, message: '璇疯緭鍏�' }
+ ]
+ },
+ rules2: {
+ bizInfo: [
+ { required: true, message: '璇疯緭鍏�' }
+ ]
+ },
+ rules3: {
+ backInfo: [
+ { required: true, message: '璇疯緭鍏�' }
+ ]
+ },
+ rules5: {
+ remarkInfo: [
+ { required: true, message: '璇疯緭鍏�' }
+ ]
+ },
+ rules4: {
+ doneInfo: [
+ { required: true, message: '璇疯緭鍏�' }
+ ]
+ }
}
+ },
+ created () {
+ this.config({
+ api: '/business/settleClaims',
+ 'field.id': 'id'
+ })
+ },
+ methods: {
+ open (title, target, target1, type) {
+ this.model = {}
+ this.model = target
+ this.title = title
+ this.visible = true
+ this.type = type
+ this.remarkLogList = target1
+ this.visible1 = false,
+ this.visible2 = false,
+ this.visible3 = false,
+ this.visible4 = false,
+ this.visible5 = false
+ this.form = target
+ this.form = {
+ id: null,
+ checkInfo: null,
+ doneInfo: null,
+ remarkInfo: null,
+ bizInfo: null,
+ backInfo: null,
+ ylClaimAccount: 0,
+ wgClaimAccount: 0,
+ swClaimAccount: 0,
+ scClaimAccount: 0,
+ reportNum: null,
+ totalAccount:0
+ }
+ if (type == 1) {
+ this.visible1 = true
+ }
+ if (type == 2) {
+ this.visible2 = true
+ }
+ if (type == 3) {
+ this.visible3 = true
+ }
+ if (type == 4) {
+ this.visible4 = true
+ }
+ if (type == 5) {
+ this.visible5 = true
+ }
+ },
+ changeAccount(){
+ this.form.swClaimAccount = parseFloat(this.form.swClaimAccount).toFixed(2)
+ this.form.scClaimAccount = parseFloat(this.form.scClaimAccount).toFixed(2)
+ this.form.wgClaimAccount = parseFloat(this.form.wgClaimAccount).toFixed(2)
+ this.form.ylClaimAccount = parseFloat(this.form.ylClaimAccount).toFixed(2)
+ this.form.totalAccount = parseFloat( this.form.scClaimAccount || 0) + parseFloat( this.form.swClaimAccount || 0)
+ + parseFloat( this.form.wgClaimAccount|| 0)
+ + parseFloat( this.form.ylClaimAccount|| 0)
+ },
+ doSubmit (type) {
+ var that = this
+ if (this.type === 5) {
+ this.$refs.form5.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ remark({ id: that.model.id, checkInfo: that.form.remarkInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ } else if (this.type === 4) {
+ this.$refs.form4.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ doneCommit({
+ id: that.model.id,
+ checkInfo: that.form.doneInfo,
+ ylClaimAccount: that.form.ylClaimAccount,
+ wgClaimAccount: that.form.wgClaimAccount,
+ swClaimAccount: that.form.swClaimAccount,
+ scClaimAccount: that.form.scClaimAccount
+ }).then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ this.$tip.apiFailed(err)
+ })
+ })
+ } else if (this.type === 2) {
+ this.$refs.form2.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ // 鐞嗚禂澶勭悊
+ dealBiz({ id: that.model.id, checkInfo: that.form.bizInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
+ } else if (this.type === 3) {
+ this.$refs.form3.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ back({ id: that.model.id, checkInfo: that.form.backInfo })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
+ } else if (this.type === 1) {
+ // 娣诲姞澶囨鍙�
+ this.$refs.form1.validate((valid) => {
+ // debugger
+ if (!valid) {
+ return
+ }
+ addCode({ id: that.model.id, reportNum: that.form.reportNum })
+ .then(response => {
+ this.visible = false
+ this.$emit('success')
+ }).catch(err => {
+ console.log(err)
+ this.$tip.apiFailed(err)
+ }).finally(() => {
+ this.isWorking = false
+ })
+ })
+ }
+ }
+ }
+}
</script>
<style>
.v-modal {
diff --git a/company/src/views/business/taxes.vue b/company/src/views/business/taxes.vue
index 90affc2..52006e9 100644
--- a/company/src/views/business/taxes.vue
+++ b/company/src/views/business/taxes.vue
@@ -70,7 +70,7 @@
</el-table-column>
<el-table-column prop="type" label="鍙戠エ鐢靛瓙鐗�" min-width="100px">
<template slot-scope="{row}">
- <img v-if="row.imgurlFull!=null" :src="row.imgurlFull" style="width: 90px;height: 90px">
+ <img v-if="row.imgurlFull!=null" :src="row.imgurlFull" style="width: 40px;height: 40px">
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" min-width="180px">
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
index 722efb5..a9025e9 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/ApplyChange.java
@@ -95,9 +95,9 @@
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
//鍏ュ弬
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- //鍑哄弬
- @JsonFormat(pattern="yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
+// //鍑哄弬
+// @JsonFormat(pattern="yyyy-MM-dd")
private Date validTime;
@ApiModelProperty(value = "鎵瑰崟鍙�")
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
index 9f49c29..69961ec 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java
@@ -71,26 +71,26 @@
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥姝㈡湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern="yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern="yyyy-MM-dd")
private Date applyEndTime;
@ApiModelProperty(value = "鏈熸湜淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="鏈熸湜淇濋櫓鐢熸晥璧锋湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern="yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern="yyyy-MM-dd")
private Date applyStartTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥姝㈡湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥姝㈡湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern="yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern="yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "瀹為檯淇濋櫓鐢熸晥璧锋湡")
@ExcelColumn(name="瀹為檯淇濋櫓鐢熸晥璧锋湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern="yyyy-MM-dd")
+// @DateTimeFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern="yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "鏈�杩戞搷浣滄椂闂�")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index 99bd7d2..d9e8421 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -196,7 +196,7 @@
Constants.SettleClaimsLogType applyLogType = Constants.SettleClaimsLogType.PLATFORM_REMARK;
String info =applyLogType.getInfo();
- info = info.replace("${param}", update.getCheckInfo());
+ info = info.replace("${param}", param.getCheckInfo());
SettleClaimsLog log = new SettleClaimsLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(), JSONObject.toJSONString(model), JSONObject.toJSONString(update));
settleClaimsLogMapper.insert(log);
return 1;
--
Gitblit v1.9.3