From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 15 +
company/src/components/business/OperaCompanyDescWindow.vue | 30 ++
company/src/components/business/OperaInsuranceApplyWindow.vue | 2
server/company/src/main/java/com/doumee/api/business/MemberController.java | 10
server/platform/src/main/java/com/doumee/api/business/SolutionsController.java | 1
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 19 +
company/src/views/business/member.vue | 33 ++
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 1
company/package-lock.json | 160 +++++++--------
company/src/components/enterprise/insuranceRecords.vue | 114 +++++------
company/src/views/index.vue | 122 +++++++++--
server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java | 2
server/platform/src/main/java/com/doumee/api/business/MemberInsuranceController.java | 7
company/src/components/business/dispatchUnitDetailsPlat.vue | 2
server/platform/src/main/java/com/doumee/api/business/MemberController.java | 25 +
company/.env.development | 4
16 files changed, 352 insertions(+), 195 deletions(-)
diff --git a/company/.env.development b/company/.env.development
index ae9fca5..ae6d1e8 100644
--- a/company/.env.development
+++ b/company/.env.development
@@ -2,13 +2,13 @@
NODE_ENV = 'development'
# 浼佷笟绔�-浠佸悍
-VUE_APP_API = 'http://192.168.0.134:10025/'
+#VUE_APP_API = 'http://192.168.0.134:10025/'
# 骞冲彴绔�-浠佸悍
# VUE_APP_API = 'http://192.168.0.134:10023/'
# 骞冲彴绔�-钀嶅
-# VUE_APP_API = 'http://192.168.0.103:10023/'
+ VUE_APP_API = 'http://192.168.0.103:10023/'
# VUE_APP_API = 'http://localhost:10023/'
# VUE_APP_API = 'http://localhost:10023/'
diff --git a/company/package-lock.json b/company/package-lock.json
index 99ba25e..d81e8e8 100644
--- a/company/package-lock.json
+++ b/company/package-lock.json
@@ -1814,6 +1814,63 @@
"integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
"dev": true
},
+ "ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-convert": "^2.0.1"
+ }
+ },
+ "chalk": {
+ "version": "4.1.2",
+ "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ansi-styles": "^4.1.0",
+ "supports-color": "^7.1.0"
+ }
+ },
+ "color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "color-name": "~1.1.4"
+ }
+ },
+ "color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "dev": true,
+ "optional": true
+ },
+ "has-flag": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+ "dev": true,
+ "optional": true
+ },
+ "loader-utils": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+ "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "big.js": "^5.2.2",
+ "emojis-list": "^3.0.0",
+ "json5": "^2.1.2"
+ }
+ },
"ssri": {
"version": "8.0.1",
"resolved": "https://registry.npm.taobao.org/ssri/download/ssri-8.0.1.tgz?cache=0&sync_timestamp=1617826515595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fssri%2Fdownload%2Fssri-8.0.1.tgz",
@@ -1821,6 +1878,28 @@
"dev": true,
"requires": {
"minipass": "^3.1.1"
+ }
+ },
+ "supports-color": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "has-flag": "^4.0.0"
+ }
+ },
+ "vue-loader-v16": {
+ "version": "npm:vue-loader@16.8.3",
+ "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
+ "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chalk": "^4.1.0",
+ "hash-sum": "^2.0.0",
+ "loader-utils": "^2.0.0"
}
}
}
@@ -13224,87 +13303,6 @@
"resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz",
"integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
"dev": true
- }
- }
- },
- "vue-loader-v16": {
- "version": "npm:vue-loader@16.8.3",
- "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz",
- "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
- "dev": true,
- "optional": true,
- "requires": {
- "chalk": "^4.1.0",
- "hash-sum": "^2.0.0",
- "loader-utils": "^2.0.0"
- },
- "dependencies": {
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-convert": "^2.0.1"
- }
- },
- "chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "dev": true,
- "optional": true,
- "requires": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- }
- },
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "optional": true,
- "requires": {
- "color-name": "~1.1.4"
- }
- },
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true,
- "optional": true
- },
- "has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "dev": true,
- "optional": true
- },
- "loader-utils": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
- "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
- "dev": true,
- "optional": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^2.1.2"
- }
- },
- "supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "dev": true,
- "optional": true,
- "requires": {
- "has-flag": "^4.0.0"
- }
}
}
},
diff --git a/company/src/components/business/OperaCompanyDescWindow.vue b/company/src/components/business/OperaCompanyDescWindow.vue
index a5b131e..c647036 100644
--- a/company/src/components/business/OperaCompanyDescWindow.vue
+++ b/company/src/components/business/OperaCompanyDescWindow.vue
@@ -95,7 +95,12 @@
<div class="info_list_item_label" style="width: 100px;">钀ヤ笟鎵х収锛�</div>
<div class="info_list_item_val">
<div class="image" v-if="form.businessImg.fileurlFull">
- <img :src="form.businessImg.fileurlFull" alt="">
+ <el-image
+ v-if="form.businessImg.fileurlFull!=null"
+ style="width: 90px; height: 90px"
+ :src="form.businessImg.fileurlFull"
+ :preview-src-list="[form.businessImg.fileurlFull]">
+ </el-image>
</div>
</div>
</div>
@@ -103,10 +108,22 @@
<div class="info_list_item_label" style="width: 100px;">娉曚汉韬唤璇侊細</div>
<div class="info_list_item_val">
<div class="image" v-if="form.idcardImgList[0].fileurlFull">
- <img :src="form.idcardImgList[0].fileurlFull" alt="">
+ <el-image
+ append-to-body
+ v-if="form.idcardImgList[0].fileurlFull"
+ style="width: 90px; height: 90px"
+ :src="form.idcardImgList[0].fileurlFull"
+ :preview-src-list="[form.idcardImgList[0].fileurlFull]">
+ </el-image>
</div>
<div class="image" v-if="form.idcardImgList[1].fileurlFull">
- <img :src="form.idcardImgList[1].fileurlFull" alt="">
+ <el-image
+ append-to-body
+ v-if="form.idcardImgList[1].fileurlFull"
+ style="width: 90px; height: 90px"
+ :src="form.idcardImgList[1].fileurlFull"
+ :preview-src-list="[form.idcardImgList[1].fileurlFull]">
+ </el-image>
</div>
</div>
</div>
@@ -114,7 +131,12 @@
<div class="info_list_item_label" style="width: 100px;">浼佷笟绛剧珷锛�</div>
<div class="info_list_item_val">
<div class="image" v-if="form.signImg.fileurlFull">
- <img :src="form.signImg.fileurlFull" alt="">
+ <el-image
+ v-if="form.signImg.fileurlFull!=null"
+ style="width: 90px; height: 90px"
+ :src="form.signImg.fileurlFull"
+ :preview-src-list="[form.signImg.fileurlFull]">
+ </el-image>
</div>
</div>
</div>
diff --git a/company/src/components/business/OperaInsuranceApplyWindow.vue b/company/src/components/business/OperaInsuranceApplyWindow.vue
index e337994..df145bd 100644
--- a/company/src/components/business/OperaInsuranceApplyWindow.vue
+++ b/company/src/components/business/OperaInsuranceApplyWindow.vue
@@ -228,7 +228,7 @@
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
<span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
- 鎻愪氦鎰忚锛歿{activity.content}}
+ {{activity.content}}
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
diff --git a/company/src/components/business/dispatchUnitDetailsPlat.vue b/company/src/components/business/dispatchUnitDetailsPlat.vue
index cde6344..0301cf8 100644
--- a/company/src/components/business/dispatchUnitDetailsPlat.vue
+++ b/company/src/components/business/dispatchUnitDetailsPlat.vue
@@ -93,7 +93,7 @@
<span style="font-size: 16px; font-weight: 400; color: black;">
{{activity.title}}
<span style="font-size: 16px; font-weight: 400; color: black; margin-left: 10px;" v-if="activity.objType === 5 || activity.objType === 6 || activity.objType === 1 || activity.objType === 2">
- 鎻愪氦鎰忚锛歿{activity.content}}
+ {{activity.content}}
</span>
</span>
<span style="margin-top: 5px; font-size: 12px; font-weight: 400; color: #999999;">
diff --git a/company/src/components/enterprise/insuranceRecords.vue b/company/src/components/enterprise/insuranceRecords.vue
index 81016c5..c5ec098 100644
--- a/company/src/components/enterprise/insuranceRecords.vue
+++ b/company/src/components/enterprise/insuranceRecords.vue
@@ -56,67 +56,61 @@
</template>
<script>
- import BaseOpera from '@/components/base/BaseOpera'
- import GlobalWindow from '@/components/common/GlobalWindow'
- import { findList, exportExcel } from '@/api/business/member'
- export default {
- name: 'insuranceRecords',
- extends: BaseOpera,
- components: { GlobalWindow },
- data () {
- return {
- form: {
- id: null,
- name: '',
- idcardNo: '',
- solutionsStatus: ''
- },
- list: []
- }
- },
- methods: {
- open (title, target) {
- this.title = title
- this.list = []
- this.visible = true
- // 鏂板缓
- if (target == null) {
- this.$nextTick(() => {
- this.$refs.form.resetFields()
- this.form[this.configData['field.id']] = null
- })
- return
- }
- // 缂栬緫
- this.$nextTick(() => {
- for (const key in this.form) {
- this.form[key] = target[key]
- }
- })
- this.getList()
- },
- expr() {
- exportExcel({
- capacity: 1000,
- page: 1,
- model: {
- memberId: this.form.id
- }
- }).then(res => {
- console.log(res)
- this.download(res)
- })
- },
- getList() {
- findList({
- memberId: this.form.id
- }).then(res => {
- console.log(res)
- this.list = res
- })
- }
- }
+import BaseOpera from '@/components/base/BaseOpera'
+import GlobalWindow from '@/components/common/GlobalWindow'
+import { findList, exportExcel } from '@/api/business/member'
+export default {
+ name: 'insuranceRecords',
+ extends: BaseOpera,
+ components: { GlobalWindow },
+ data () {
+ return {
+ form: {
+ id: null,
+ name: '',
+ idcardNo: '',
+ solutionsStatus: ''
+ },
+ list: []
}
+ },
+ methods: {
+ open (title, target) {
+ this.title = title
+ this.list = []
+ this.visible = true
+ this.form = {
+ id: null,
+ name: '',
+ idcardNo: '',
+ solutionsStatus: ''
+ }
+ this.form = target
+ // 鏂板缓
+ this.getList()
+ },
+ expr () {
+ exportExcel({
+ capacity: 1000,
+ page: 1,
+ model: {
+ memberId: this.form.id
+ }
+ }).then(res => {
+ console.log(res)
+ this.download(res)
+ })
+ },
+ getList () {
+ findList({
+ memberId: this.form.id || -1
+ }).then(res => {
+ console.log(res)
+ this.list = res
+ })
+ }
+ }
+}
</script>
<style lang="scss" scoped>
diff --git a/company/src/views/business/member.vue b/company/src/views/business/member.vue
index 032ac7b..3aaa5b9 100644
--- a/company/src/views/business/member.vue
+++ b/company/src/views/business/member.vue
@@ -24,7 +24,20 @@
<el-option label="涓嶅湪淇�" value="2"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="娲鹃仯鍗曚綅" prop="duId">
+ <el-form-item v-if="userInfo.type === 0" label="鎵�灞炰紒涓�" prop="companyId">
+ <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
+ <el-option
+ v-for="(item, index) in companyList"
+ :key="index"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娲鹃仯鍗曚綅" prop="duName">
+ <el-input v-model="searchForm.duName" placeholder="璇疯緭鍏�" maxlength="18" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+<!-- <el-form-item label="娲鹃仯鍗曚綅" prop="duId">
<el-select v-model="searchForm.duId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="(item, index) in options"
@@ -33,7 +46,7 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item>-->
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -60,7 +73,7 @@
<span v-else-if="row.solutionsStatus === 2">涓嶅湪淇�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炰紒涓�" min-width="100px" v-if="userInfo.type === 0"></el-table-column>
<el-table-column prop="name" label="鍛樺伐濮撳悕" min-width="100px"></el-table-column>
<el-table-column label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
@@ -111,6 +124,7 @@
import { findListByDTO } from '@/api/business/dispatchUnit'
import { memberExportExcel } from '@/api/business/member'
import { mapState } from 'vuex'
+ import {pageAll as companyAll} from "@/api/business/company";
export default {
name: 'Member',
extends: BaseTable,
@@ -126,7 +140,8 @@
solutionId: ''
},
options: [],
- solutions: []
+ solutions: [],
+ companyList: []
}
},
computed: {
@@ -153,14 +168,20 @@
})
},
getSolutions() {
- all()
+ all({})
.then(res => {
this.solutions = res
})
+ /* if(this.userInfo.type ==1){
findListByDTO({ dataType: 2 })
.then(res => {
- this.options = res
+ this.options = res
})
+ }*/
+
+ companyAll({}).then(res => {
+ this.companyList = res
+ })
},
calculateAge(idNumber) {
if (!idNumber) return
diff --git a/company/src/views/index.vue b/company/src/views/index.vue
index fa1dc67..8ba76e3 100644
--- a/company/src/views/index.vue
+++ b/company/src/views/index.vue
@@ -16,34 +16,87 @@
<div class="home_content_left_item" ref="picture3"></div>
</div>
<div class="home_content_right">
- <div class="home_content_right_label">浠ｅ姙浜嬮」</div>
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="淇濆崟浠ｅ姙" name="first"></el-tab-pane>
- <el-tab-pane label="鐞嗚禂鎻愰啋" name="second"></el-tab-pane>
+ <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-tabs>
- <div class="home_content_right_list">
- <div class="list_item" v-for="(item, index) in 1" :key="index">
- <div class="list_item_left">
- <span>鎶曚繚鐢宠锛堝緟绛剧讲锛�</span>
- <span>淇濋櫓鏂规锛堥泧涓昏矗浠婚櫓A锛�</span>
- </div>
- <div class="list_item_center">
- <span>瀹夊窘骞冲畨浜哄姏璧勬簮鏈夐檺鍏徃</span>
- <span>鎻愪氦鏃堕棿 2023-09-11 00:00:00</span>
- </div>
- <div class="list_item_right">
- <span>鏌ョ湅璇︽儏</span>
+ <div v-if="activeName === '0'" v-permissions="['business:notice:insurance']" >
+ <div class="home_content_right_list">
+ <div class="list_item" v-for="(item, index) in 1" :key="index">
+ <div class="list_item_left">
+ <span>鎶曚繚鐢宠锛堝緟绛剧讲锛�</span>
+ <span>淇濋櫓鏂规锛堥泧涓昏矗浠婚櫓A锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>瀹夊窘骞冲畨浜哄姏璧勬簮鏈夐檺鍏徃</span>
+ <span>鎻愪氦鏃堕棿 2023-09-11 00:00:00</span>
+ </div>
+ <div class="list_item_right">
+ <span>鏌ョ湅璇︽儏</span>
+ </div>
</div>
</div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange"
+ :current-page="page"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="0">
+ </el-pagination>
+ </div>
</div>
- <div class="home_content_right_page">
- <el-pagination
- @current-change="handleCurrentChange"
- :current-page="page"
- :page-size="5"
- layout="total, prev, pager, next, jumper"
- :total="0">
- </el-pagination>
+ <div v-if="activeName === '1'" v-permissions="['business:notice:tax']">
+ <div class="home_content_right_list">
+ <div class="list_item" v-for="(item, index) in 1" :key="index">
+ <div class="list_item_left">
+ <span>鎶曚繚鐢宠锛堝緟绛剧讲1锛�</span>
+ <span>淇濋櫓鏂规锛堥泧涓昏矗浠婚櫓A锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>瀹夊窘骞冲畨浜哄姏璧勬簮鏈夐檺鍏徃</span>
+ <span>鎻愪氦鏃堕棿 2023-09-11 00:00:00</span>
+ </div>
+ <div class="list_item_right">
+ <span>鏌ョ湅璇︽儏</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange"
+ :current-page="page"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="0">
+ </el-pagination>
+ </div>
+ </div>
+ <div v-if="activeName === '2'" v-permissions="['business:notice:settle']">
+ <div class="home_content_right_list">
+ <div class="list_item" v-for="(item, index) in 1" :key="index">
+ <div class="list_item_left">
+ <span>鎶曚繚鐢宠锛堝緟绛剧讲2锛�</span>
+ <span>淇濋櫓鏂规锛堥泧涓昏矗浠婚櫓A锛�</span>
+ </div>
+ <div class="list_item_center">
+ <span>瀹夊窘骞冲畨浜哄姏璧勬簮鏈夐檺鍏徃</span>
+ <span>鎻愪氦鏃堕棿 2023-09-11 00:00:00</span>
+ </div>
+ <div class="list_item_right">
+ <span>鏌ョ湅璇︽儏</span>
+ </div>
+ </div>
+ </div>
+ <div class="home_content_right_page">
+ <el-pagination
+ @current-change="handleCurrentChange"
+ :current-page="page"
+ :page-size="5"
+ layout="total, prev, pager, next, jumper"
+ :total="0">
+ </el-pagination>
+ </div>
</div>
</div>
</div>
@@ -52,12 +105,15 @@
<script>
import * as echarts from 'echarts';
+import {mapState} from "vuex";
export default {
name: 'Index',
data () {
return {
- activeName: 'first',
+ activeName: '0',
+ tabs:[],
page: 1,
+ table:null,
cate: [
{
name: '鎶曚繚鐢宠',
@@ -87,12 +143,28 @@
]
}
},
+ computed: {
+ ...mapState(['userInfo'])
+ },
mounted() {
this.setPicture1()
this.setPicture2()
this.setPicture3()
+ this.initPanel()
},
methods: {
+ initPanel(){
+ var pemissons = this.userInfo.permissions;
+ if(pemissons.includes("business:notice:insurance")){
+ this.tabs.push( {name:"0",label:"鎶曚繚浠ｅ姙"})
+ }
+ if(pemissons.includes("business:notice:tax")){
+ this.tabs.push( {name:"1",label:"鍙戠エ浠ｅ姙"})
+ }
+ if(pemissons.includes("business:notice:settle")){
+ this.tabs.push( {name:"2",label:"鐞嗚禂浠ｅ姙"})
+ }
+ },
handleClick(e) {
this.activeName = e.name
},
diff --git a/server/company/src/main/java/com/doumee/api/business/MemberController.java b/server/company/src/main/java/com/doumee/api/business/MemberController.java
index 0efc59a..fafd693 100644
--- a/server/company/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/company/src/main/java/com/doumee/api/business/MemberController.java
@@ -80,8 +80,8 @@
@PostMapping("/page")
@RequiresPermissions("business:member:query")
public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- pageWrap.getModel().setCompanyId(user.getCompanyId());
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// pageWrap.getModel().setCompanyId(user.getCompanyId());
return ApiResponse.success(memberService.findPageForCompany(pageWrap));
}
@@ -89,15 +89,15 @@
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ /* LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
pageWrap.getModel().setCompanyId(user.getCompanyId());
List<Member> list = memberService.findPageForCompany(pageWrap).getRecords();
for (int i = 0; i < list.size(); i++) {
Member member = list.get(i);
member.setSn(i+1);
member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
- }
- ExcelExporter.build(Member.class).exportWithFirstAndEnd(list, "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
+ }*/
+ ExcelExporter.build(Member.class).exportWithFirstAndEnd( memberService.findPageForCompany(pageWrap).getRecords(), "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
}
diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberController.java b/server/platform/src/main/java/com/doumee/api/business/MemberController.java
index 4562635..fe33e4a 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberController.java
@@ -4,13 +4,17 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.dto.MemberQueryDTO;
import com.doumee.dao.business.model.Member;
import com.doumee.service.business.MemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -70,17 +74,26 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:member:query")
- public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
- return ApiResponse.success(memberService.findPage(pageWrap));
+ public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<MemberQueryDTO> pageWrap) {
+// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+// pageWrap.getModel().setCompanyId(user.getCompanyId());
+ return ApiResponse.success(memberService.findPageForCompany(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
- ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "鐢ㄥ伐淇℃伅琛�", response);
+ public void exportExcel (@RequestBody PageWrap<MemberQueryDTO> pageWrap, HttpServletResponse response) {
+ /* LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ pageWrap.getModel().setCompanyId(user.getCompanyId());
+ List<Member> list = memberService.findPageForCompany(pageWrap).getRecords();
+ for (int i = 0; i < list.size(); i++) {
+ Member member = list.get(i);
+ member.setSn(i+1);
+ member.setAge(Constants.getAgeByIdCard(member.getIdcardNo()));
+ }*/
+ ExcelExporter.build(Member.class).exportWithFirstAndEnd( memberService.findPageForCompany(pageWrap).getRecords(), "鍛樺伐鍒楄〃璇﹀崟","鍛樺伐鍒楄〃璇﹀崟",null, response);
}
-
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@RequiresPermissions("business:member:query")
diff --git a/server/platform/src/main/java/com/doumee/api/business/MemberInsuranceController.java b/server/platform/src/main/java/com/doumee/api/business/MemberInsuranceController.java
index 22f6137..ded1478 100644
--- a/server/platform/src/main/java/com/doumee/api/business/MemberInsuranceController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/MemberInsuranceController.java
@@ -66,7 +66,12 @@
memberInsuranceService.updateById(memberInsurance);
return ApiResponse.success(null);
}
-
+ @ApiOperation("鍒楄〃鏌ヨ")
+ @PostMapping("/findList")
+ @RequiresPermissions("business:memberinsurance:query")
+ public ApiResponse<List<MemberInsurance>> findList (@RequestBody MemberInsurance memberInsurance) {
+ return ApiResponse.success(memberInsuranceService.findList(memberInsurance));
+ }
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@RequiresPermissions("business:memberinsurance:query")
diff --git a/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java b/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java
index e5eeedc..6232731 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SolutionsController.java
@@ -88,6 +88,7 @@
return ApiResponse.success(solutionsService.findList(pageWrap));
}
+
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@RequiresPermissions("business:solutions:exportExcel")
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
index 47bbb54..78a3799 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberQueryDTO.java
@@ -10,6 +10,8 @@
@ApiModelProperty(value = "鍛樺伐鍚嶇О")
private String name;
+ @ApiModelProperty(value = "娲鹃仯鍠綅鍚嶇О")
+ private String duName;
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
private String idCard;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index 2a99876..d1c2c30 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -1135,12 +1135,23 @@
.in(!Objects.isNull(model.getStatus())&&model.getStatus().equals(Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey()),ApplyChange::getStatus,
Constants.ApplyChangeStatus.RETURN_APPLY_UPLOAD.getKey(),
Constants.ApplyChangeStatus.RETURN_APPLY_SIGNATURE.getKey())
- .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
+// .eq(!Objects.isNull(model.getCompanyId()),InsuranceApply::getCompanyId,model.getCompanyId())
// .eq(!Objects.isNull(model.getSolutionsId()),ApplyChange::getSolutionsId,model.getSolutionsId())
.eq(!Objects.isNull(model.getBaseSolutionsId()),Solutions::getBaseId,model.getBaseSolutionsId())
.ge(StringUtils.isNotBlank(model.getCreateDateS()),ApplyChange::getCreateDate, model.getCreateDateS()+" 00:00:00" )
.le(StringUtils.isNotBlank(model.getCreateDateE()),ApplyChange::getCreateDate, model.getCreateDateE()+" 23:59:59" );
-
+ LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else{
+ if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+ queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+ }else{
+ queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+ }
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
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 9da93db..76c919b 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
@@ -1131,6 +1131,7 @@
}else{
queryWrapper.eq(InsuranceApply::getCompanyId, -1);
}
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
}
if (pageWrap.getModel().getSolutionId() != null) {
queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 58f6c24..68fe1ba 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -177,24 +178,40 @@
MPJLambdaWrapper<Member> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
MemberQueryDTO memberQueryDTO = pageWrap.getModel();
+ LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ //浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
+ if(loginUserInfo.getType().equals(Constants.ONE)){
+ queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
+ }else{
+ if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
+ queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
+ }else{
+ queryWrapper.eq(InsuranceApply::getCompanyId, -1);
+ }
+ queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
queryWrapper.selectAll(Member.class)
.selectAs(DispatchUnit::getName,Member::getDuName)
.selectAs(Worktype::getName,Member::getWorkTypeName)
.selectAs(Solutions::getName,Member::getSolutionName)
+ .selectAs(Company::getName,Member::getCompanyName)
.select(" case when now() between t.start_time and t.end_time then 1 else 2 end solutionsStatus ")
.leftJoin(InsuranceApply.class,InsuranceApply::getId,Member::getApplyId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,Member::getDuId)
.leftJoin(Worktype.class,Worktype::getId,Member::getWorktypeId)
+ .leftJoin(Company.class,Company::getId,Member::getCompanyId)
.eq(Member::getIsdeleted, Constants.ZERO)
- .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
+// .eq(Member::getCompanyId, memberQueryDTO.getCompanyId())
.like(StringUtils.isNotBlank(memberQueryDTO.getName()),Member::getName, memberQueryDTO.getName())
.like(StringUtils.isNotBlank(memberQueryDTO.getIdCard()),Member::getIdcardNo, memberQueryDTO.getIdCard())
+ .like(StringUtils.isNotBlank(memberQueryDTO.getDuName()),DispatchUnit::getName, memberQueryDTO.getDuName())
.eq(!Objects.isNull(memberQueryDTO.getDuId()),Member::getDuId, memberQueryDTO.getDuId())
.eq(!Objects.isNull(memberQueryDTO.getSolutionsId()),Solutions::getId, memberQueryDTO.getSolutionsId())
.apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.ONE),"now() between t.start_time and t.end_time")
.apply(!Objects.isNull(memberQueryDTO.getSolutionsStatus())&&memberQueryDTO.getSolutionsStatus().equals(Constants.TWO),"now() > t.end_time")
;
+
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
--
Gitblit v1.9.3