From 7694708b91af01b0a49912fe119540b01d0c9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 01 二月 2024 20:45:58 +0800
Subject: [PATCH] 开发业务接口
---
company/src/views/business/taxes.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java | 16 ++-
company/src/api/business/taxes.js | 3
company/src/components/business/OperaTaxesWindow.vue | 170 +++++++++++++++++++++++++++++++++++++-----
server/service/src/main/java/com/doumee/service/business/InsuranceApplyService.java | 2
5 files changed, 165 insertions(+), 28 deletions(-)
diff --git a/company/src/api/business/taxes.js b/company/src/api/business/taxes.js
index fb29f63..d2a2258 100644
--- a/company/src/api/business/taxes.js
+++ b/company/src/api/business/taxes.js
@@ -6,6 +6,9 @@
trim: true
})
}
+export function getDetail (id) {
+ return request.get(`business/taxes/${id}`)
+}
// 鏌ヨ
export function doneApply(data) {
return request.post('/business/taxes/doneApply', data, {
diff --git a/company/src/components/business/OperaTaxesWindow.vue b/company/src/components/business/OperaTaxesWindow.vue
index 40e83e2..4f6ce95 100644
--- a/company/src/components/business/OperaTaxesWindow.vue
+++ b/company/src/components/business/OperaTaxesWindow.vue
@@ -1,7 +1,7 @@
<template>
<GlobalWindow
:title="title"
- width="100%"
+ width="60%"
submitText="杩斿洖淇敼"
:visible.sync="visible"
:confirm-working="isWorking"
@@ -9,45 +9,49 @@
>
<div class="info">
<div class="info_label">
- <span>浼佷笟璇︽儏锛堝凡鐢宠锛�</span>
+ <span v-if="model.status === 0">浼佷笟璇︽儏锛堝緟澶勭悊锛�</span>
+ <span v-if="model.status === 1">浼佷笟璇︽儏锛堝凡寮�绁級</span>
+ <span v-if="model.status === 2">浼佷笟璇︽儏锛堝钩鍙版挙鍥烇級</span>
+ <span v-if="model.status === 3">浼佷笟璇︽儏锛堝凡鍐茬孩锛�</span>
</div>
<div class="info_list">
<div class="info_list_item">
<div class="info_list_item_label">寮�绁ㄥ悕绉帮細</div>
- <div class="info_list_item_val">瀹夊窘鏍煎姏浜哄姏璧勬簮鏈夐檺鍏徃</div>
+ <div class="info_list_item_val">{{ model.companyName}}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">绾崇◣浜鸿瘑鍒彿锛�</div>
- <div class="info_list_item_val">913418210000000000</div>
+ <div class="info_list_item_val">{{ model.taxCode }}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">寮�鎴疯锛�</div>
- <div class="info_list_item_val">瀹夊窘鍐滄潙鍟嗕笟閾惰鑲′唤鏈夐檺鍏徃鍚堣偉鏀</div>
+ <div class="info_list_item_val">{{ model.taxBank }}</div>
</div>
<div class="info_list_item">
<div class="info_list_item_label">璐﹀彿锛�</div>
<div class="info_list_item_val">
- 20010355666666600000000
+ {{ model.taxAccount }}
</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鍦板潃銆佺數璇濓細</div>
- <div class="info_list_item_val">瀹夊窘鐪佸悎鑲ュ競缁忔祹鎶�鏈紑鍙戝尯鑾茶姳璺互涓溿�佺煶闂ㄨ矾浠ュ崡鑾茶姳璺�1锛� 0551-63450845</div>
+ <div class="info_list_item_val">{{ model.taxAddr }}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鎺ユ敹鏂瑰紡锛�</div>
- <div class="info_list_item_val">鐢靛瓙鍙戠エ</div>
+ <div v-if="model.type === 0" class="info_list_item_val">鐢靛瓙鍙戠エ</div>
+ <div v-if="model.type === 1" class="info_list_item_val">绾歌川鍙戠エ</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">鎺ユ敹鍦板潃锛�</div>
- <div class="info_list_item_val">111122223333@qq.com</div>
+ <div class="info_list_item_val">{{ model.addr }}</div>
</div>
<div class="info_list_item" style="width: 100%;">
<div class="info_list_item_label">寮�绁ㄩ噾棰濓細</div>
- <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">2000.00</div>
+ <div class="info_list_item_val" style="color:rgba(249, 86, 1, 0.996078431372549);">{{ model.price }}</div>
</div>
</div>
- <el-table
+ <el-table v-if="model.type ==0"
:data="tableData"
border
show-summary
@@ -63,23 +67,102 @@
</el-table-column>
<el-table-column
align="center"
- prop="code"
+ prop="solutionName"
label="淇濋櫓鏂规">
</el-table-column>
<el-table-column
align="center"
- prop="code"
+ prop="applyCode"
label="淇濆崟鍙�">
</el-table-column>
<el-table-column
align="center"
- prop="code"
+ prop="createDate"
label="鐢宠寮�绁ㄦ椂闂�">
</el-table-column>
<el-table-column
align="center"
- prop="code"
+ prop="fee"
label="閲戦">
+ <template slot-scope="{row}">
+ <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table v-if="model.type ==1"
+ :data="tableData1"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ style="width: 100%; margin-bottom: 20px;">
+ <el-table-column
+ label="淇濆崟"
+ align="center"
+ width="80">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="solutionName"
+ label="淇濋櫓鏂规">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="applyCode"
+ label="淇濆崟鍙�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="changApplyCode"
+ label="鎵瑰崟鍙�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="fee"
+ label="閲戦">
+ <template slot-scope="{row}">
+ <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-table v-if="model.type == 1"
+ :data="tableData2"
+ border
+ show-summary
+ :summary-method="getSummaries"
+ style="width: 100%; margin-bottom: 20px;">
+ <el-table-column
+ label="鍐茬孩鍗�"
+ align="center"
+ width="80">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="solutionName"
+ label="淇濋櫓鏂规">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="taxDoneCode"
+ label="鍙戠エ鍙�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="taxCreateDate"
+ label="鐢宠寮�绁ㄦ椂闂�">
+ </el-table-column>
+ <el-table-column
+ align="center"
+ prop="fee"
+ label="鍙戠エ閲戦">
+ <template slot-scope="{row}">
+ <span style="color:rgba(249, 86, 1, 0.996078431372549);">{{row.fee}}</span>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -89,6 +172,7 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
+import { getDetail } from '@/api/business/taxes'
export default {
name: 'OperaCompanyWindow',
extends: BaseOpera,
@@ -96,12 +180,15 @@
data () {
return {
// 琛ㄥ崟鏁版嵁
+ model: {},
form: {
id: null
},
// 楠岃瘉瑙勫垯
rules: {},
- tableData: []
+ tableData: [],
+ tableData1: [],
+ tableData2: []
}
},
created () {
@@ -111,8 +198,28 @@
})
},
methods: {
- open(title,targer){
-
+ open (title, target) {
+ this.title = title
+ this.visible = true
+ this.model = {}
+ this.tableData = []
+ this.tableData1 = []
+ this.tableData2 = []
+ this.model = target
+ this.getDetails()
+ },
+ getDetails () {
+ getDetail(this.model.id).then(res => {
+ this.model = res
+ if (res.type == 0) {
+ this.tableData=(res.applyList)
+ } else {
+ this.tableData1=(res.applyList)
+ this.tableData2=(res.delTaxList)
+ }
+ console.log(this.tableData)
+ }).catch(err => {
+ })
},
getSummaries (param) {
const { columns, data } = param
@@ -121,7 +228,7 @@
if (index === 0) {
sums[index] = '鍚堣'
} else {
- if (index == 9 || index == 10 || index == 11 || index == 12) {
+ if (index == 4) {
const values = data.map(item => Number(item[column.property]))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -136,13 +243,33 @@
}
}
})
- return sums
+ return sums
}
}
}
</script>
<style lang="scss" scoped>
+ ::v-deep .el-table__footer-wrapper tbody td {
+ cursor: pointer;
+ text-align: center;
+ &:nth-child(5) {
+ color:rgba(249, 86, 1, 0.996078431372549);
+ }
+ }
+ ::v-deep .el-table__header-wrapper th:first-child .cell{
+ color:rgba(249, 86, 1, 0.996078431372549) !important
+ }
+ ::v-deep table:first-of-type th:first-child .cell{
+ //color:rgba(249, 86, 1, 0.996078431372549) !important
+ }
+ /* ::v-deep .el-table--border th:first-child .cell {
+ &:nth-child(2) {
+ color:rgba(249, 86, 1, 0.996078431372549);
+ }
+ }*/
+
+
.info {
width: 100%;
.info_label {
@@ -160,12 +287,13 @@
.info_list {
width: 100%;
display: flex;
- align-items: center;
+ align-items: left;
flex-wrap: wrap;
.info_list_item {
width: 50%;
display: flex;
align-items: start;
+ font-size: 14px;
margin-bottom: 20px;
.info_list_item_label {
width: 150px;
diff --git a/company/src/views/business/taxes.vue b/company/src/views/business/taxes.vue
index eb05330..be01d8e 100644
--- a/company/src/views/business/taxes.vue
+++ b/company/src/views/business/taxes.vue
@@ -7,6 +7,7 @@
<el-option label="寰呭鐞�" value="0"></el-option>
<el-option label="宸插紑绁�" value="1"></el-option>
<el-option label="骞冲彴鎾ゅ洖" value="2"></el-option>
+ <el-option label="宸插啿绾�" value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐢宠鏃ユ湡" prop="status">
@@ -50,6 +51,7 @@
<span v-if="row.status === 0">寰呭鐞�</span>
<span v-if="row.status === 1">宸插紑绁�</span>
<span v-if="row.status === 2">骞冲彴鎾ゅ洖</span>
+ <span v-if="row.status === 3">宸插啿绾�</span>
</template>
</el-table-column>
<el-table-column prop="companyName" label="鐢宠浼佷笟" min-width="100px"></el-table-column>
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 9dc8982..45bb3d1 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
@@ -104,7 +104,7 @@
InsuranceApply findDetail(Integer id);
- void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
+ void applyOpt(InsuranceApplyOptDTO insuranceApplyOptDTO);
Integer back(InsuranceApply insuranceApply);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index c47c44b..b81bc0a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -127,11 +127,12 @@
private List<TaxDetial> getJoinDetailListById(Integer id) {
MPJLambdaWrapper<TaxDetial> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(TaxDetial.class);
+ queryWrapper.selectAs(Solutions::getName,TaxDetial::getSolutionName);
queryWrapper.selectAs(Taxes::getDoneCode,TaxDetial::getTaxDoneCode);
queryWrapper.selectAs(Taxes::getCreateDate,TaxDetial::getTaxCreateDate);
queryWrapper.selectAs(InsuranceApply::getCode,TaxDetial::getApplyCode);
- queryWrapper.selectAs(ApplyChange::getCode,TaxDetial::getChangApplyCode);
- queryWrapper.select("(CASE t.type\n" +
+ queryWrapper.selectAs(ApplyChange::getValidCode,TaxDetial::getChangApplyCode);
+/* queryWrapper.select("(CASE t.type\n" +
"WHEN 0 THEN (select count(1) from apply_detail c where c.APPLY_ID=t.INSURANCE_APPLY_ID) \n" +
"ELSE 0 \n" +
"END) as applyNum,\n" +
@@ -142,10 +143,12 @@
"(CASE t.type \n" +
"WHEN 1 THEN (select count(1) from apply_chagne_detail c where c.APPLY_CHANGE_ID=t.APPLY_CHANGE_ID) \n" +
"ELSE 0 \n" +
- "END) as applyChangeAddNum");
+ "END) as applyChangeAddNum");*/
queryWrapper.leftJoin(InsuranceApply.class,InsuranceApply::getId,TaxDetial::getInsuranceApplyId);
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
queryWrapper.leftJoin(ApplyChange.class,ApplyChange::getId,TaxDetial::getApplyChangeId);
queryWrapper.leftJoin(Taxes.class,Taxes::getId,TaxDetial::getDelTaxId);
+ queryWrapper.eq( TaxDetial::getTaxId,id);
List<TaxDetial> detialList = taxDetailJoinMapper.selectJoinList(TaxDetial.class,queryWrapper.orderByAsc(TaxDetial::getType));
return detialList;
}
@@ -236,11 +239,12 @@
List<TaxDetial> applyList = new ArrayList<>();//鎶曚繚鍜屽姞鍑忎繚
List<TaxDetial> delList = new ArrayList<>();//鍐茬孩鍗�
if(detialList!=null){
- for(TaxDetial d :delList){
- d.setSolutionName(model.getSolutionName());
+ for(TaxDetial d :detialList){
+// d.setSolutionName(model.getSolutionName());
d.setFee(Constants.formatBigdecimal(d.getFee()));
d.setTotalFee(Constants.formatBigdecimal(d.getTotalFee()));
- if(Constants.equalsInteger(d.getType(),Constants.ZERO) || Constants.equalsInteger(d.getType(),Constants.ONE)){
+ if(Constants.equalsInteger(d.getType(),Constants.ZERO)
+ || Constants.equalsInteger(d.getType(),Constants.ONE)){
applyList.add(d);
}else if(Constants.equalsInteger(d.getType(),Constants.TWO)){
delList.add(d);
--
Gitblit v1.9.3