From 4f2a2b480f1d36782c315881bad50066a52e71aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 04 二月 2024 14:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 4
company/src/views/enterprise/myPolicy.vue | 2
server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java | 2
server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java | 1
company/src/assets/icons/company/settle.png | 0
company/src/assets/icons/plat/company_add.png | 0
company/src/components/business/OperaApplyChangeWindow.vue | 2
company/src/views/business/policyList.vue | 260 ++++++++++++++++++++----------------
company/src/assets/icons/company/apply.png | 0
server/service/src/main/java/com/doumee/core/utils/Constants.java | 18 +-
company/src/assets/icons/plat/apply_check.png | 0
server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java | 6
company/src/assets/icons/plat/tax_check.png | 0
server/service/src/main/java/com/doumee/dao/business/model/DuLog.java | 4
company/src/components/enterprise/additionSubtractionApplication.vue | 2
company/src/components/enterprise/factoryChange.vue | 2
company/src/components/enterprise/reinsurance.vue | 2
company/src/assets/icons/plat/settle_check.png | 0
company/src/assets/icons/company/tax.png | 0
company/src/views/business/insuranceApply.vue | 2
company/src/assets/icons/company/change_apply.png | 0
company/src/assets/icons/company/dipatch_unit.png | 0
server/service/src/main/java/com/doumee/service/business/third/SignService.java | 2
server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java | 2
company/src/components/business/OperaPolicyListWindow.vue | 2
company/src/views/index.vue | 86 ++++++++---
server/service/src/main/java/com/doumee/dao/business/model/InsuranceApply.java | 2
company/src/assets/icons/plat/change_apply_check.png | 0
company/src/views/enterprise/insuranceApply.vue | 2
company/src/components/enterprise/editFactoryChange.vue | 2
server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java | 2
server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java | 2
34 files changed, 240 insertions(+), 173 deletions(-)
diff --git a/company/src/assets/icons/company/apply.png b/company/src/assets/icons/company/apply.png
new file mode 100644
index 0000000..6245a0f
--- /dev/null
+++ b/company/src/assets/icons/company/apply.png
Binary files differ
diff --git a/company/src/assets/icons/company/change_apply.png b/company/src/assets/icons/company/change_apply.png
new file mode 100644
index 0000000..f3d6bf7
--- /dev/null
+++ b/company/src/assets/icons/company/change_apply.png
Binary files differ
diff --git a/company/src/assets/icons/company/dipatch_unit.png b/company/src/assets/icons/company/dipatch_unit.png
new file mode 100644
index 0000000..711cfa4
--- /dev/null
+++ b/company/src/assets/icons/company/dipatch_unit.png
Binary files differ
diff --git a/company/src/assets/icons/company/settle.png b/company/src/assets/icons/company/settle.png
new file mode 100644
index 0000000..001dc0a
--- /dev/null
+++ b/company/src/assets/icons/company/settle.png
Binary files differ
diff --git a/company/src/assets/icons/company/tax.png b/company/src/assets/icons/company/tax.png
new file mode 100644
index 0000000..921d0b8
--- /dev/null
+++ b/company/src/assets/icons/company/tax.png
Binary files differ
diff --git a/company/src/assets/icons/plat/apply_check.png b/company/src/assets/icons/plat/apply_check.png
new file mode 100644
index 0000000..6245a0f
--- /dev/null
+++ b/company/src/assets/icons/plat/apply_check.png
Binary files differ
diff --git a/company/src/assets/icons/plat/change_apply_check.png b/company/src/assets/icons/plat/change_apply_check.png
new file mode 100644
index 0000000..f3d6bf7
--- /dev/null
+++ b/company/src/assets/icons/plat/change_apply_check.png
Binary files differ
diff --git a/company/src/assets/icons/plat/company_add.png b/company/src/assets/icons/plat/company_add.png
new file mode 100644
index 0000000..711cfa4
--- /dev/null
+++ b/company/src/assets/icons/plat/company_add.png
Binary files differ
diff --git a/company/src/assets/icons/plat/settle_check.png b/company/src/assets/icons/plat/settle_check.png
new file mode 100644
index 0000000..518dbcd
--- /dev/null
+++ b/company/src/assets/icons/plat/settle_check.png
Binary files differ
diff --git a/company/src/assets/icons/plat/tax_check.png b/company/src/assets/icons/plat/tax_check.png
new file mode 100644
index 0000000..921d0b8
--- /dev/null
+++ b/company/src/assets/icons/plat/tax_check.png
Binary files differ
diff --git a/company/src/components/business/OperaApplyChangeWindow.vue b/company/src/components/business/OperaApplyChangeWindow.vue
index 3d19a58..7332b4d 100644
--- a/company/src/components/business/OperaApplyChangeWindow.vue
+++ b/company/src/components/business/OperaApplyChangeWindow.vue
@@ -54,7 +54,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="褰撳墠璐圭敤">
+ label="浜х敓璐圭敤">
</el-table-column>
<el-table-column
prop="address"
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index df145bd..e234098 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -83,7 +83,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/business/OperaPolicyListWindow.vue b/company/src/components/business/OperaPolicyListWindow.vue
index 22daed2..472e8d3 100644
--- a/company/src/components/business/OperaPolicyListWindow.vue
+++ b/company/src/components/business/OperaPolicyListWindow.vue
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column
prop="address"
- label="褰撳墠璐圭敤">
+ label="浜х敓璐圭敤">
</el-table-column>
<el-table-column
prop="address"
diff --git a/company/src/components/enterprise/additionSubtractionApplication.vue b/company/src/components/enterprise/additionSubtractionApplication.vue
index 6db50bd..a162b90 100644
--- a/company/src/components/enterprise/additionSubtractionApplication.vue
+++ b/company/src/components/enterprise/additionSubtractionApplication.vue
@@ -78,7 +78,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/editFactoryChange.vue b/company/src/components/enterprise/editFactoryChange.vue
index 16619aa..a2d46fa 100644
--- a/company/src/components/enterprise/editFactoryChange.vue
+++ b/company/src/components/enterprise/editFactoryChange.vue
@@ -77,7 +77,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/factoryChange.vue b/company/src/components/enterprise/factoryChange.vue
index cf2bfb7..7f4d2c3 100644
--- a/company/src/components/enterprise/factoryChange.vue
+++ b/company/src/components/enterprise/factoryChange.vue
@@ -77,7 +77,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/components/enterprise/reinsurance.vue b/company/src/components/enterprise/reinsurance.vue
index cd566c5..f7e1068 100644
--- a/company/src/components/enterprise/reinsurance.vue
+++ b/company/src/components/enterprise/reinsurance.vue
@@ -78,7 +78,7 @@
<el-table-column
prop="currentFee"
align="center"
- label="褰撳墠璐圭敤(鍏�)">
+ label="浜х敓璐圭敤(鍏�)">
</el-table-column>
<el-table-column
prop="fee"
diff --git a/company/src/views/business/insuranceApply.vue b/company/src/views/business/insuranceApply.vue
index 10eeb13..ef77ed9 100644
--- a/company/src/views/business/insuranceApply.vue
+++ b/company/src/views/business/insuranceApply.vue
@@ -4,7 +4,7 @@
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="寰呭鎵�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
<el-option label="寰呯绔�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
diff --git a/company/src/views/business/policyList.vue b/company/src/views/business/policyList.vue
index 625b55f..09dba60 100644
--- a/company/src/views/business/policyList.vue
+++ b/company/src/views/business/policyList.vue
@@ -1,122 +1,150 @@
<template>
- <TableLayout :permissions="['business:insuranceapply:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="淇濆崟鍙�" prop="status">
- <el-input v-model="searchForm.status" placeholder="璇疯緭鍏�"></el-input>
- </el-form-item>
- <el-form-item label="淇濋櫓鏂规" prop="solutionId">
- <el-select v-model="searchForm.solutionId" placeholder="璇烽�夋嫨" @change="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
- <el-option label="淇濋殰涓�" value="5"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- <el-button @click="$refs.OperaPolicyListWindow.open('鎶曚繚璇︽儏')">鎶曚繚璇︽儏</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column label="搴忓彿" width="80px">
- <template slot-scope="scope">
- <span>{{scope.$index + 1}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="status" label="鎶曚繚鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.status === 0">寰呭鏍�</span>
- <span v-if="row.status === 3">寰呭嚭鍗�</span>
- <span v-if="row.status === 5">淇濋殰涓�</span>
- <span v-if="row.status === 8">宸茶繃鏈�</span>
- <span v-if="row.status === 7">宸查��鍥�</span>
- </template>
- </el-table-column>
- <el-table-column prop="companyId" label="鎶曚繚浼佷笟" min-width="100px"></el-table-column>
- <el-table-column prop="solutionId" label="淇濋櫓鏂规" min-width="100px"></el-table-column>
- <el-table-column prop="solutionId" label="淇濆崟鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鎶曚繚浜烘暟" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="浜х敓璐圭敤锛堝厓锛�" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鎬昏垂鐢紙鍏冿級" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="淇濋櫓鐢熸晥璧锋湡" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="淇濋櫓鐢熸晥姝㈡湡" min-width="100px"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.operaInsuranceApplyWindow.open('缂栬緫鎶曚繚鐢宠淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaPolicyListWindow ref="OperaPolicyListWindow" @success="handlePageChange"/>
- </TableLayout>
+ <TableLayout :permissions="['business:insuranceapply:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="淇濆崟鐘舵��" prop="statusCollect">
+ <el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+ <el-option label="寰呭鏍�" value="0"></el-option>
+ <el-option label="寰呭嚭鍗�" value="1"></el-option>
+ <el-option label="寰呯绔�" value="7"></el-option>
+ <el-option label="淇濋殰涓�" value="2" ></el-option>
+ <el-option label="宸茶繃鏈�" value="3"></el-option>
+ <el-option label="宸查��鍥�" value="4"></el-option>
+ <el-option label="閫�鍥炵敵璇蜂腑" value="5"></el-option>
+ <el-option label="宸插叧闂�" value="6"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶曚繚浼佷笟" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="item in companyList"
+ :key="item.baseId"
+ :label="item.name"
+ :value="item.baseId">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
+ <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="item in solutionList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎻愪氦鏃ユ湡" prop="createDate">
+ <el-date-picker
+ v-model="searchForm.createDate"
+ @change="search"
+ type="daterange"
+ range-separator="鑷�"
+ value-format="yyyy-MM-dd"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table
+ v-loading="isWorking.search"
+ :data="tableData.list"
+ stripe
+ >
+ <el-table-column label="搴忓彿" width="80px">
+ <template slot-scope="scope">
+ <span>{{scope.$index + 1}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="statusInfo" label="鎶曚繚鐘舵��" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鎶曚繚浼佷笟" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="solutionsName" label="淇濋櫓鏂规" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="insureNum" label="鎶曚繚浜烘暟" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="serviceDays" align="center" label="鍦ㄤ繚鏃堕暱锛堝ぉ锛�"> </el-table-column>
+ <el-table-column prop="currentFee" align="center" label="浜х敓璐圭敤(鍏�)"></el-table-column>
+ <el-table-column prop="fee" label="鎬昏垂鐢紙鍏冿級" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="startTime" label="淇濋櫓鐢熸晥璧锋湡" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="endTime" label="淇濋櫓鐢熸晥姝㈡湡" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鎻愪氦鏃堕棿" align="center" min-width="100px"></el-table-column>
+ <el-table-column
+ v-if="containPermissions(['business:insuranceapply:update', 'business:insuranceapply:delete'])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.operaInsuranceApplyWindow.open('缂栬緫鎶曚繚鐢宠淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:insuranceapply:update']">鏌ョ湅璇︽儏</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ @size-change="handleSizeChange"
+ @current-change="handlePageChange"
+ :pagination="tableData.pagination"
+ >
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInsuranceApplyWindow ref="operaInsuranceApplyWindow" @success="handlePageChange"/>
+ </TableLayout>
</template>
<script>
- import BaseTable from '@/components/base/BaseTable'
- import TableLayout from '@/layouts/TableLayout'
- import Pagination from '@/components/common/Pagination'
- import OperaPolicyListWindow from '@/components/business/OperaPolicyListWindow'
- export default {
- name: 'policyList',
- extends: BaseTable,
- components: { TableLayout, Pagination, OperaPolicyListWindow },
- data () {
- return {
- // 鎼滅储
- searchForm: {
- createDate: '',
- solutionId: '',
- companyId: '',
- status: ''
- }
- }
- },
- created () {
- this.config({
- module: '鎶曚繚鐢宠淇℃伅琛�',
- api: '/business/insuranceApply',
- 'field.id': 'id',
- 'field.main': 'id'
- })
- this.search()
- }
+import BaseTable from '@/components/base/BaseTable'
+import TableLayout from '@/layouts/TableLayout'
+import Pagination from '@/components/common/Pagination'
+import { all as solutionAll} from '@/api/business/solutions'
+import { pageAll as companyAll} from '@/api/business/company'
+import OperaInsuranceApplyWindow from '@/components/business/OperaInsuranceApplyWindow'
+export default {
+ name: 'InsuranceApply',
+ extends: BaseTable,
+ components: { TableLayout, Pagination, OperaInsuranceApplyWindow },
+ data () {
+ return {
+ // 鎼滅储
+ searchForm: {
+ createTimeS: '',
+ createTimeE: '',
+ baseSolutionId: '',
+ companyId: '',
+ statusCollect: '2'
+ },
+ solutionList:[],
+ companyList:[]
}
+ },
+ created () {
+ this.config({
+ module: '鎶曚繚鐢宠淇℃伅琛�',
+ api: '/business/insuranceApply',
+ 'field.id': 'id',
+ 'field.main': 'id'
+ })
+ this.search()
+ this.loadSelectList()
+ },
+ methods:{
+ // handlePageChange() {
+ // this.search()
+ // },
+ loadSelectList() {
+ solutionAll({dataType:2}).then(res => {
+ this.solutionList = res
+ }).catch(err => {
+ })
+ companyAll({}).then(res => {
+ this.companyList = res
+ }).catch(err => {
+ })
+ }
+
+ }
+}
</script>
diff --git a/company/src/views/enterprise/insuranceApply.vue b/company/src/views/enterprise/insuranceApply.vue
index 93dc251..217e6ad 100644
--- a/company/src/views/enterprise/insuranceApply.vue
+++ b/company/src/views/enterprise/insuranceApply.vue
@@ -4,7 +4,7 @@
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
<el-form-item label="鐘舵��" prop="statusCollect">
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">
- <el-option label="寰呭鎵�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
<el-option label="寰呯绔�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
diff --git a/company/src/views/enterprise/myPolicy.vue b/company/src/views/enterprise/myPolicy.vue
index 2dbd1b9..1d9e001 100644
--- a/company/src/views/enterprise/myPolicy.vue
+++ b/company/src/views/enterprise/myPolicy.vue
@@ -17,7 +17,7 @@
</el-form-item>
<el-form-item label="鐘舵��" prop="statusCollect">
<el-select v-model="searchForm.statusCollect" placeholder="璇烽�夋嫨" @change="search">
- <el-option label="寰呭鎵�" value="0"></el-option>
+ <el-option label="寰呭鏍�" value="0"></el-option>
<el-option label="寰呭嚭鍗�" value="1"></el-option>
<el-option label="寰呯绔�" value="7"></el-option>
<el-option label="淇濋殰涓�" value="2"></el-option>
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index a04ebf5..f459835 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -2,8 +2,14 @@
<div class="home">
<div class="home_inlet">
<div class="home_inlet_label">蹇嵎鍏ュ彛</div>
- <div class="home_inlet_list">
+ <div class="home_inlet_list" v-if="userInfo.type==1" >
<div class="home_inlet_item" v-for="(item, index) in cate" :key="index" @click="jump(item.url)">
+ <img :src="item.icon" />
+ <span>{{item.name}}</span>
+ </div>
+ </div>
+ <div class="home_inlet_list" v-else >
+ <div class="home_inlet_item" v-for="(item, index) in catePlat" :key="index" @click="jump(item.url)">
<img :src="item.icon" />
<span>{{item.name}}</span>
</div>
@@ -18,7 +24,11 @@
<div class="home_content_right">
<div class="home_content_right_label" v-if="tabs && tabs.length>0" >浠ｅ姙浜嬮」</div>
<el-tabs v-model="activeName" @tab-click="handleClick" >
- <el-tab-pane v-for="a in tabs" :key="a.path" :label="a.label" :name="a.name"></el-tab-pane>
+ <el-tab-pane v-for="a in tabs" :key="a.path" :name="a.name" >
+ <span slot="label"> {{a.label }}
+ <el-badge v-if="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) >0" :value="(a.name==0?totalPage0:(a.name==1?totalPage1:totalPage2)) " class="item"></el-badge>
+ </span>
+ </el-tab-pane>
</el-tabs>
<div v-if="activeName === '0'" v-permissions="['business:notice:insurance']" >
<div class="home_content_right_list">
@@ -125,28 +135,55 @@
cate: [
{
name: '鎶曚繚鐢宠',
- url: '',
- icon: require('../assets/logo.png')
- },
- {
- name: '鍔犱繚鐢宠',
- url: '',
- icon: require('../assets/logo.png')
- },
- {
- name: '鍑忎繚鐢宠',
- url: '',
- icon: require('../assets/logo.png')
- },
- {
- name: '鍚堝悓绠＄悊',
- url: '',
- icon: require('../assets/logo.png')
+ url: '/enterprise/insuranceApply',
+ icon: require('../assets/icons/company/apply.png')
},
{
name: '鎻愪氦鎶ユ',
- url: '',
- icon: require('../assets/logo.png')
+ url: '/business/settleClaims',
+ icon: require('../assets/icons/company/settle.png')
+ },
+ {
+ name: '娣诲姞娲鹃仯鍗曚綅',
+ url: '/enterprise/dispatchUnit',
+ icon: require('../assets/icons/company/dipatch_unit.png')
+ },
+ {
+ name: '鐩翠繚寮�绁�',
+ url: '/enterprise/directInvoicing',
+ icon: require('../assets/icons/company/tax.png')
+ },
+ {
+ name: '濮旀墭淇濆紑绁�',
+ url: '/enterprise/entrustedInvoicing',
+ icon: require('../assets/icons/company/tax.png')
+ }
+ ],
+ catePlat: [
+ {
+ name: '鎶曚繚瀹℃牳',
+ url: '/business/insuranceApply',
+ icon: require('../assets/icons/plat/apply_check.png')
+ },
+ {
+ name: '鍔�/鍑忎繚瀹℃牳',
+ url: '/business/applyChange',
+ icon: require('../assets/icons/plat/change_apply_check.png')
+ },
+ {
+ name: '鐞嗚禂鏈嶅姟',
+ url: '/business/settleClaims',
+ icon: require('../assets/icons/plat/settle_check.png')
+ },
+ {
+ name: '鍙戠エ绠＄悊',
+ url: '/business/taxes',
+ icon: require('../assets/icons/plat/tax_check.png')
+ },
+ {
+ name: '鏂板浼佷笟',
+ url: '/business/company',
+ icon: require('../assets/icons/plat/company_add.png')
}
]
}
@@ -189,13 +226,13 @@
var pemissons = this.userInfo.permissions
if(pemissons.includes("business:notice:insurance")){
- this.tabs.push( {name:"0",label:"鎶曚繚浠ｅ姙"})
+ this.tabs.push( {name:"0",label:"鎶曚繚浠ｅ姙" })
}
if(pemissons.includes("business:notice:tax")){
- this.tabs.push( {name:"1",label:"鍙戠エ浠ｅ姙"})
+ this.tabs.push( {name:"1",label:"鍙戠エ浠ｅ姙" })
}
if(pemissons.includes("business:notice:settle")){
- this.tabs.push( {name:"2",label:"鐞嗚禂浠ｅ姙"})
+ this.tabs.push( {name:"2",label:"鐞嗚禂浠ｅ姙" })
}
if(pemissons.includes("business:notice:insurance")){
this.getNoticeList(0,this.page0 )
@@ -441,6 +478,7 @@
}
.list_item_left {
display: flex;
+ width: 60%;
flex-direction: column;
span {
&:nth-child(1) {
diff --git a/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java b/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java
index 3ed7476..68b2d3e 100644
--- a/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java
+++ b/server/dianziqian/src/main/java/com/jzq/JzqHttpApiTool.java
@@ -152,7 +152,7 @@
}
/**
- * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
* @param email
* @return
*/
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 c6be2c9..09ba80d 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
@@ -635,8 +635,8 @@
AUDIT_UN_PASS(2, "娲鹃仯鍗曚綅涓嶉�氳繃"),
EDIT_UNIT(3, "淇敼娲鹃仯鍗曚綅淇℃伅"),
ADD_WORK_TYPE(4, "鎻愪氦娣诲姞宸ョ"),
- WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃壒閫氳繃"),
- WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃壒涓嶉�氳繃"),
+ WORK_TYPE_AUDIT_PASS(5, "娣诲姞宸ョ瀹℃牳閫氳繃"),
+ WORK_TYPE_AUDIT_UN_PASS(6, "娣诲姞宸ョ瀹℃牳涓嶉�氳繃"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -678,7 +678,7 @@
}
public enum ApplyCollectStatus {
- DSP(0, "寰呭鎵�"),
+ DSP(0, "寰呭鏍�"),
DCD(1, "寰呭嚭鍗�"),
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
@@ -822,7 +822,7 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -972,9 +972,9 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
+ ZERO(0, "寰呭鏍�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
- TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
+ TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
@@ -1107,7 +1107,7 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
@@ -1277,8 +1277,8 @@
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠",""),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
- PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃牳閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃牳椹冲洖","鎻愪氦鎰忚锛�${param}"),
CLOSE(5, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java
index 1565f28..79a47ea 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/ApplyChangeOptDTO.java
@@ -15,7 +15,7 @@
@ApiModelProperty(value = "鎿嶄綔璇存槑")
private String optIllustration;
- @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃壒閫氳繃锛�5=瀹℃壒椹冲洖;6=鍏抽棴")
+ @ApiModelProperty(value = "鎿嶄綔绫诲瀷锛�3=閫�鍥炵敵璇凤紱4=骞冲彴瀹℃牳閫氳繃锛�5=瀹℃牳椹冲洖;6=鍏抽棴")
private Integer optType;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java
index 33e9f4c..bc90021 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/DispatchUnitAuditDTO.java
@@ -17,13 +17,13 @@
@ApiModelProperty(value = "涓婚敭")
private Integer id;
- @ApiModelProperty(value = "瀹℃壒绫诲埆锛�0=鍗曚綅瀹℃壒锛�1=宸ョ瀹℃壒")
+ @ApiModelProperty(value = "瀹℃牳绫诲埆锛�0=鍗曚綅瀹℃牳锛�1=宸ョ瀹℃牳")
private Integer auditType;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃")
+ @ApiModelProperty(value = "瀹℃牳鐘舵�� 1瀹℃牳閫氳繃 2瀹℃牳涓嶉�氳繃")
private Integer status;
- @ApiModelProperty(value = "瀹℃壒澶囨敞")
+ @ApiModelProperty(value = "瀹℃牳澶囨敞")
private String auditRemark;
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
index eb5b04d..1c7a4d1 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/InsuranceApplyQueryDTO.java
@@ -71,6 +71,6 @@
@ApiModelProperty(value = "鍗冲皢澶辨晥璁㈠崟锛�0=鍚︼紱1=鏄�")
private Integer loseEfficacy;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
private Integer statusCollect;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
index 9069da9..113d2fb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
@@ -64,8 +64,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃", example = "1")
- @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃")
+ @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃")
private Integer objType;
@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 69961ec..e5965dc 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
@@ -180,7 +180,7 @@
@ApiModelProperty(value = "澶勭悊浼佷笟鐢宠鐘舵�� 0鍚屾剰 1椹冲洖")
@TableField(exist = false)
private int dealBackApply;
- @ApiModelProperty(value = "鐘舵�� 0寰呭鎵� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
+ @ApiModelProperty(value = "鐘舵�� 0寰呭鏍� 1寰呭嚭鍗� 2淇濋殰涓� 3宸茶繃鏈� 4宸叉挙鍥� 5閫�鍥炵敵璇蜂腑 6宸插叧闂�", example = "1")
@TableField(exist = false)
private Integer statusCollect;
@ApiModelProperty(value = "闆嗗悎鐘舵��" , example = "1")
diff --git a/server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java b/server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java
index cbfb258..9acf77f 100644
--- a/server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java
+++ b/server/service/src/main/java/com/doumee/service/business/DispatchUnitService.java
@@ -38,7 +38,7 @@
Integer createSolution(SaveDispatchUnitDTO saveDispatchUnitDTO);
/**
- * 娲鹃仯鍗曚綅瀹℃壒/宸ョ瀹℃壒
+ * 娲鹃仯鍗曚綅瀹℃牳/宸ョ瀹℃牳
* @param dispatchUnitAuditDTO
*/
void auditData(DispatchUnitAuditDTO dispatchUnitAuditDTO);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index afbfe4c..148ab94 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -626,7 +626,7 @@
.eq(Company::getSignStatus,Constants.ONE));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
int status = signService.organizationAuditStatus(company.getEmail());
if(status == 1){
Company update = new Company();
@@ -660,7 +660,7 @@
.eq(Company::getSignIdStatus,Constants.ZERO));
if(companyList!=null && companyList.size()>0){
for(Company company :companyList){
- //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ //鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getIsdeleted,Constants.ZERO)
.eq(Multifile::getObjType,Constants.MultiFile.COM_SING_IMG.getKey())
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
index bc2c5db..d8b8640 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/DispatchUnitServiceImpl.java
@@ -555,7 +555,7 @@
if(Objects.isNull(dispatchUnit)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌娲鹃仯鍗曚綅淇℃伅");
}
- //娲鹃仯鍗曚綅瀹℃壒
+ //娲鹃仯鍗曚綅瀹℃牳
if(dispatchUnitAuditDTO.getAuditType().equals(Constants.ZERO)){
if(dispatchUnit.getStatus().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"娲鹃仯鍗曚綅淇℃伅宸插鏍�");
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
index faa93b4..2992c58 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java
@@ -190,6 +190,7 @@
.eq(Solutions::getBaseId,solutions.getId())
.eq(Solutions::getDataType,Constants.TWO)
.set(Solutions::getDataType,Constants.ONE)
+ .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
);
//澶勭悊宸ヤ綔淇℃伅锛屾柊澧炴渶鏂扮殑锛屽悓鏃朵骇鐢熷巻鍙茬増鏈�
dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);
diff --git a/server/service/src/main/java/com/doumee/service/business/third/SignService.java b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
index 2ccc931..9e3ac44 100644
--- a/server/service/src/main/java/com/doumee/service/business/third/SignService.java
+++ b/server/service/src/main/java/com/doumee/service/business/third/SignService.java
@@ -227,7 +227,7 @@
return null;
}
/**
- * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃壒鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
+ * 鏌ヨ浼佷笟绛剧害鐘舵�� 瀹℃牳鐘舵��,0姝ｅ湪鐢宠1閫氳繃2椹冲洖
* @param email
* @return
*/
--
Gitblit v1.9.3