fix

virgo.wzfrontend/console/src/components/message/detail.vue

@@ -0,0 +1,22 @@
+<template>
+	<div class="message-detail">
+		<detail2 v-if="type === 2" :detail="detail"></detail2>
+	</div>
+</template>
+
+<script>
+	import detail2 from './modules/detail2'
+	export default {
+		props: ['type', 'detail'],
+		components: {
+			detail2
+		},
+	}
+</script>
+
+<style lang="scss">
+	.message-detail {
+		width: 100%;
+		height: 100%;
+	}
+</style>

virgo.wzfrontend/console/src/components/message/modules/detail2.vue

@@ -0,0 +1,108 @@
+<template>
+	<div class="hui-flex">
+		<div class="hui-flex-box">
+			<div class="hui-detail">
+				<div class="hui-detail-title">消息内容</div>
+				<div class="hui-detail-content">
+					<div class="hui-detail-item">
+						<div class="hui-detail-value"> {{detail.sendUserName}}邀请{{detail.message}}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="hui-drawer-submit" v-if="dataDetail.status === 1">
+			<el-button size="medium" type="primary" @click="btnClick('同意',2)">同意</el-button>
+			<el-button size="medium" type="danger" @click="btnClick('拒绝',3)">拒绝</el-button>
+		</div>
+	</div>
+</template>
+
+<script>
+	import {
+		getCustomerDetailById,
+		getAgentDetailById,
+		updateCustomer,
+		updateAgent
+	} from '@/httpApi/crm'
+	import {
+		bindProject
+	} from '@/httpApi/organization'
+
+	export default {
+		props: ['detail'],
+		data() {
+			return {
+				dataDetail: {}
+			}
+		},
+		created() {
+			this.init()
+		},
+		methods: {
+			init() {
+				if (this.detail.identityId === 1) { //客户
+					getCustomerDetailById(this.detail.dataId).then(res => {
+						if (res.state) {
+							this.dataDetail = res.data;
+						}
+					})
+				} else if (this.detail.identityId === 2) { //经纪人
+					getAgentDetailById(this.detail.dataId).then(res => {
+						if (res.state) {
+							this.dataDetail = res.data;
+						}
+					})
+				}
+			},
+			btnClick(msg, type) {
+				this.$confirm('是否' + msg + '加入该项目', () => {
+					if (this.detail.identityId === 1) { //客户
+						updateCustomer({
+							id: this.dataDetail.id,
+							status: type
+						}).then(res => {
+							if (res.state) {
+								if (type === 2) return this.operationProject();
+								this.init();
+								this.$message.success('操作成功');
+							}
+						})
+					} else if (this.detail.identityId === 2) { //经纪人
+						updateAgent({
+							id: this.dataDetail.id,
+							status: type
+						}).then(res => {
+							if (res.state) {
+								if (type === 2) return this.operationProject();
+								this.init();
+								this.$message.success('操作成功');
+							}
+						})
+					}
+				})
+			},
+			operationProject() {
+				let postData = {
+					organizationId: this.detail.organizationId,
+					projectId: this.detail.projectId,
+					userId: this.$store.getters.user.userId,
+					identityId: this.detail.identityId
+				}
+				if (this.detail.identityId === 1) { //客户
+					postData['clientId'] = this.detail.dataId
+				} else if (this.detail.identityId === 2) { //经纪人
+					postData['agentId'] = this.detail.dataId
+				}
+				bindProject(postData).then(res => {
+					if (res.state) {
+						this.$message.success('操作成功')
+						this.init();
+					}
+				})
+			}
+		},
+	}
+</script>
+
+<style>
+</style>

virgo.wzfrontend/console/src/components/work/invoice/detail.vue

@@ -1,47 +1,60 @@
 <template>
-	<div class="hui-detail">
-		<div class="hui-detail-title">基础信息</div>
-		<div class="hui-detail-content">
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">发票名称</div>
-				<div class="hui-detail-value">{{detail.name}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">发票类型</div>
-				<div class="hui-detail-value">{{$field.findTypeName('invoiceType',detail.invoiceType)}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">发票代码</div>
-				<div class="hui-detail-value">{{detail.code}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">发票号码</div>
-				<div class="hui-detail-value">{{detail.number}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">货物名称</div>
-				<div class="hui-detail-value">{{detail.cargoName}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">收款方</div>
-				<div class="hui-detail-value">{{detail.organizationName}}</div>
-			</div>
-			<div class="hui-detail-item">
-				<div class="hui-detail-label">付款方</div>
-				<div class="hui-detail-value">{{detail.payMerchantName || detail.payClientName}}</div>
+	<div class="hui-flex">
+		<div class="hui-flex-box">
+			<div class="hui-detail">
+				<div class="hui-detail-title">基础信息</div>
+				<div class="hui-detail-content">
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">发票名称</div>
+						<div class="hui-detail-value">{{detail.name}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">发票类型</div>
+						<div class="hui-detail-value">{{$field.findTypeName('invoiceType',detail.invoiceType)}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">发票代码</div>
+						<div class="hui-detail-value">{{detail.code}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">发票号码</div>
+						<div class="hui-detail-value">{{detail.number}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">货物名称</div>
+						<div class="hui-detail-value">{{detail.cargoName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">收款方</div>
+						<div class="hui-detail-value">{{detail.organizationName}}</div>
+					</div>
+					<div class="hui-detail-item">
+						<div class="hui-detail-label">付款方</div>
+						<div class="hui-detail-value">{{detail.payMerchantName || detail.payClientName}}</div>
+					</div>
+				</div>
+				<div class="hui-detail-title">发票附件</div>
+				<div class="hui-detail-content hui-detail-image">
+					<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
+					</upload>
+				</div>
 			</div>
 		</div>
-		<div class="hui-detail-title">发票附件</div>
-		<div class="hui-detail-content hui-detail-image">
-			<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
-			</upload>
+		<div class="hui-drawer-submit" v-if="detail.id">
+			<el-button size="medium" type="warning" @click="paymentOperation(1)" v-if="!detail.status">
+				作废
+			</el-button>
+			<el-button size="medium" type="primary" @click="paymentOperation(0)" v-if="detail.status === 1">
+				正常
+			</el-button>
 		</div>
 	</div>
 </template>
 
 <script>
 	import {
-		getInvoiceDetailById
+		getInvoiceDetailById,
+		updateInvoice
 	} from '@/httpApi/invoice'
 	import upload from '@/components/common/upload'
 	export default {
@@ -69,6 +82,18 @@
 						this.detail = res.data;
 					}
 				})
+			},
+			paymentOperation(state) {
+				updateInvoice({
+					id: this.detailId,
+					status: state
+				}).then(res => {
+					if (res.state) {
+						this.init();
+						this.$message.success('操作成功');
+						this.$emit('reload');
+					}
+				})
 			}
 		},
 		components: {

virgo.wzfrontend/console/src/httpApi/invoice.js

@@ -10,7 +10,7 @@ export function getInvoiceListByPage(data) {
 		method: 'post',
 		data: data
 	})
-}
+}
 /* 
  * 通过id获取发票详情
  * 
@@ -21,4 +21,16 @@ export function getInvoiceDetailById(id) {
 		url: `/api/payment/invoice/${id}/`,
 		method: 'get',
 	})
+}
+/* 
+ * 更新发票
+ * 
+ * 
+ */
+export function updateInvoice(data) {
+	return request({
+		url: `/api/payment/invoice/update`,
+		method: 'put',
+		data: data
+	})
 }

virgo.wzfrontend/console/src/httpApi/message.js

@@ -0,0 +1,12 @@
+import request from '@/axios'
+/* 
+ * 获取消息分页列表
+ * 
+ */
+export function getMessagePageListByQuery(currPage, pageSize, data) {
+	return request({
+		url: `/manager/message/${currPage}/${pageSize}`,
+		method: 'post',
+		data: data
+	})
+}

virgo.wzfrontend/console/src/layout/components/topNav.vue

@@ -16,6 +16,11 @@
 			</div>
 		</div>
 		<div class="work-layout-right">
+			<div class="work-layout-badge" @click="$router.push('/message')">
+				<el-badge is-dot>
+					<i class="iconfont huifont-xiaoxi"></i>
+				</el-badge>
+			</div>
 			<el-dropdown @visible-change="value => userDropdown = value" @command="userCommand">
 				<div class="work-layout-user">
 					<div class="work-layout-avatar">

virgo.wzfrontend/console/src/router/modules/message.js

@@ -0,0 +1,9 @@
+const message = [{
+	path: '/message',
+	component: () => import('@/views/message/list'),
+	name: '消息列表',
+	meta: {
+		title: '消息列表'
+	}
+}]
+export default message;

virgo.wzfrontend/console/src/uitls/permission.js

@@ -14,7 +14,7 @@ import Vue from 'vue'
 NProgress.configure({
 	showSpinner: false
 })
-const baseUrl = ['/', '/401', '/404', '/loginRegister/login'];
+const baseUrl = ['/', '/401', '/404', '/loginRegister/login', '/message'];
 
 const testBaseUrl = (path) => { //判断公共路由
 	let nowBaseUrl = ['/loginRegister/login'].filter((item) => {

virgo.wzfrontend/console/src/views/message/list.vue

@@ -0,0 +1,117 @@
+<template>
+	<div class="hui-flex hui-content">
+		<div class="hui-flex-box hui-flex hui-table">
+			<div class="hui-flex-box">
+				<el-table :data="tableData" row-key="id" border height="100%">
+					<el-table-column label="序号" width="50">
+						<template slot-scope="scope">
+							{{scope.$index + 1}}
+						</template>
+					</el-table-column>
+					<el-table-column label="消息内容">
+						<template slot-scope="scope">
+							<div class="hui-ellipsis">
+								{{scope.row.sendUserName}}邀请{{scope.row.message}}
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="是否已读" width="180">
+						<template slot-scope="scope">
+							<div class="hui-table-tag">
+								<div class="hui-tag hui-tag-info" v-if="scope.row.viewed">已读</div>
+								<div class="hui-tag hui-tag-error" v-else>未读</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column label="时间" prop="sentTime" width="180"></el-table-column>
+					<el-table-column label="消息类型" prop="messageType" width="150">
+						<template slot-scope="scope">
+							<div class="hui-table-tag">
+								<div class="hui-tag">
+									<div>{{messageType(scope.row.messageType).name}}</div>
+								</div>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column width="150" label="操作">
+						<template slot-scope="scope">
+							<span class="table-operation" @click="detail(scope.row)">
+								详情
+							</span>
+						</template>
+					</el-table-column>
+					<template slot="empty">
+						<empty description="暂无数据"></empty>
+					</template>
+				</el-table>
+			</div>
+			<div class="hui-content-pagination">
+				<el-pagination :page-size="pageSize" :pager-count="9" layout="prev, pager, next" :total="totalCount"
+					@current-change="currentChange">
+				</el-pagination>
+			</div>
+		</div>
+		<el-drawer title="消息详情" :visible.sync="drawer" :size="400" :append-to-body="true">
+			<detail v-if="drawer" :type="item.messageType" :detail="item" @close="drawer = false">
+			</detail>
+		</el-drawer>
+	</div>
+</template>
+
+<script>
+	import {
+		getMessagePageListByQuery
+	} from '@/httpApi/message'
+	import detail from '@/components/message/detail'
+	export default {
+		data() {
+			return {
+				tableData: [],
+				pageIndex: 1,
+				pageSize: 10,
+				totalCount: 0,
+				item: {},
+				drawer: false
+			}
+		},
+		created() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let data = {
+					projectId: this.$store.getters.project.id,
+					organizationId: this.$store.getters.organization.id,
+					userId: this.$store.getters.user.userId
+				}
+				getMessagePageListByQuery(this.pageIndex, this.pageSize, data).then(res => {
+					if (res.state) {
+						this.tableData = res.data.dataList.map(node => {
+							return Object.assign(node, JSON.parse(node.json));
+						});
+						this.totalCount = res.data.totalCount;
+					}
+				})
+			},
+			detail(item) {
+				if (!item.viewed) this.$msg.viewed(item.id, this.init);
+				this.item = item;
+				console.log(this.item);
+				this.drawer = true;
+			},
+			messageType(type) {
+				return this.$msg.messageType.filter(item => item.id === type)[0];
+			},
+			currentChange(pageIndex) {
+				this.pageIndex = pageIndex;
+				this.init();
+			}
+		},
+		components: {
+			detail
+		},
+	}
+</script>
+
+<style lang="scss">
+</style>

virgo.wzfrontend/console/src/views/system/log.vue

@@ -75,6 +75,13 @@
 					<div class="log-item">3、新增发票管理-常规发票功能，包含收款发票、企业付款、个人付款。</div>
 				</div>
 			</el-timeline-item>
+			<el-timeline-item timestamp="2024-06-19" placement="top">
+				<div class="log-box">
+					<div class="log-item">1、新增发票管理-作废/正常操作的功能。</div>
+					<div class="log-item">2、新增消息通知-列表、详情、已读的功能。</div>
+					<div class="log-item">3、新增项目邀请消息操作的功能。</div>
+				</div>
+			</el-timeline-item>
 		</el-timeline>
 	</div>
 </template>

virgo.wzfrontend/console/src/views/work/invoice/contract/client.vue

@@ -21,7 +21,15 @@
 						</el-table-column>
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
-						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/invoice/contract/organization.vue

@@ -22,6 +22,14 @@
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
 						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/invoice/contract/payment.vue

@@ -22,6 +22,14 @@
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
 						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/invoice/routine/client.vue

@@ -22,6 +22,14 @@
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
 						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/invoice/routine/organization.vue

@@ -21,7 +21,15 @@
 						</el-table-column>
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
-						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">

virgo.wzfrontend/console/src/views/work/invoice/routine/payment.vue

@@ -21,7 +21,15 @@
 						</el-table-column>
 						<el-table-column label="发票代码" prop="code"></el-table-column>
 						<el-table-column label="发票号码" prop="number"></el-table-column>
-						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="货物名称" prop="cargoName"></el-table-column>
+						<el-table-column label="状态" width="80">
+							<template slot-scope="scope">
+								<div class="hui-table-tag">
+									<div class="hui-tag hui-tag-success" v-if="!scope.row.status">正常</div>
+									<div class="hui-tag hui-tag-warning" v-else-if="scope.row.status === 1">作废</div>
+								</div>
+							</template>
+						</el-table-column>
 						<el-table-column label="操作" width="80">
 							<template slot-scope="scope">
 								<div class="hui-table-operation">