From d82eef16e15291f04bddf3da41da6dae777c981d Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Mon, 11 Mar 2024 18:32:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js               |   2 +-
 src/views/homePage/message.vue    |  43 ++++-----
 src/views/homePage/personData.vue | 189 +++++++++++++++++++++++++++++++-------
 3 files changed, 176 insertions(+), 58 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 6211250..47b7de5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,7 +43,7 @@ const router = createRouter({
           path: "/merchantManagement/personData",
           name: "personData",
           meta: {
-            title: '个人数据',
+            title: '个人数据（股）',
           },
           component: () => import("../views/homePage/personData.vue")
         },
diff --git a/src/views/homePage/message.vue b/src/views/homePage/message.vue
index 7bff201..232d9a5 100644
--- a/src/views/homePage/message.vue
+++ b/src/views/homePage/message.vue
@@ -4,11 +4,12 @@
 		<div class="m-select g_flex_row_between g_pt_16">
 			<div class="g_flex_row_start">
 				<div class="g_w_320 g-search-btn g_mr_16">
-					<a-input-search v-model:value="tableData.keyword" placeholder="请输入姓名/手机号" @search="searchList" @change="handleChangeSearch" allowClear />
+					<a-input-search v-model:value="tableData.keyword" placeholder="请输入关键字" @search="searchList" @change="handleChangeSearch" allowClear />
 				</div>
 			</div>
 			<div>
-				<a-button type="primary" @click="openAdd" :icon="h(PlusOutlined)">新增用户</a-button>
+        <!-- @click="openAdd" -->
+				<a-button type="primary" :icon="h(PlusOutlined)">新增内容</a-button>
 				<!-- <a-button type="" class="g_border_d g_ml_16" @click="handleToForm('add', { id: 0 })" :icon="h(DownloadOutlined)">导出模版</a-button> -->
 				<!-- 
         <a-dropdown :trigger="['click']">
@@ -298,6 +299,9 @@ const getTable = () => {
 		tableData.value = { ...res.data, keyword: tableData.value.keyword, page: res.data.current, limit: res.data.size };
 		tableData.value.records.forEach((item, index) => {
 			item.rank = index + 1;
+			item.title = '常用发票主体信息';
+			item.content = "默认主体：郑州伯才科技有限公司 单位名称：郑州伯才科技有限公司 纳税人识别号：91410100MA9L4HDT0L 地址：河南自贸试验区郑州";
+			item.time = "2024-03-11 13:04:24";
 		});
 	});
 };
@@ -324,39 +328,26 @@ const columns = ref([
 		ellipsis: true,
 	},
 	{
-		title: "姓名",
-		key: "name",
-		dataIndex: "name",
-		width: "110px",
+		title: "标题",
+		key: "title",
+		dataIndex: "title",
+		width: "180px",
 	},
 
 	{
-		title: "电话",
-		key: "username",
-		dataIndex: "username",
+		title: "内容",
+		key: "content",
+		dataIndex: "content",
 		ellipsis: true,
-		width: "140px",
 	},
 	{
-		title: "身份证号",
-		key: "idcard",
-		dataIndex: "idcard",
+		title: "发布时间",
+		key: "time",
+		dataIndex: "time",
 		width: "200px",
 		ellipsis: true,
 	},
-	{
-		title: "备注",
-		key: "description",
-		dataIndex: "description",
-		ellipsis: true,
-	},
-	{
-		title: "状态",
-		key: "status",
-		dataIndex: "status",
-		ellipsis: true,
-		width: "75px",
-	},
+	
 	{
 		title: "操作",
 		key: "state",
diff --git a/src/views/homePage/personData.vue b/src/views/homePage/personData.vue
index 7bff201..8a103fb 100644
--- a/src/views/homePage/personData.vue
+++ b/src/views/homePage/personData.vue
@@ -4,11 +4,12 @@
 		<div class="m-select g_flex_row_between g_pt_16">
 			<div class="g_flex_row_start">
 				<div class="g_w_320 g-search-btn g_mr_16">
-					<a-input-search v-model:value="tableData.keyword" placeholder="请输入姓名/手机号" @search="searchList" @change="handleChangeSearch" allowClear />
+					<a-input-search v-model:value="tableData.keyword" placeholder="请输入姓名" @search="searchList" @change="handleChangeSearch" allowClear />
 				</div>
 			</div>
 			<div>
-				<a-button type="primary" @click="openAdd" :icon="h(PlusOutlined)">新增用户</a-button>
+   
+				<!-- <a-button type="primary" @click="openAdd" :icon="h(PlusOutlined)">新增用户</a-button> -->
 				<!-- <a-button type="" class="g_border_d g_ml_16" @click="handleToForm('add', { id: 0 })" :icon="h(DownloadOutlined)">导出模版</a-button> -->
 				<!-- 
         <a-dropdown :trigger="['click']">
@@ -57,8 +58,9 @@
 							>
 								报名
 							</div> -->
-							<div class="btn g_c_main g_fs_14 g_cursor_point g_mr_13" @click="handleToForm('edit', record)">编辑</div>
-							<div class="btn g_c_main g_fs_14 g_cursor_point" @click="handleDel(record)">删除</div>
+							<div class="btn g_c_main g_fs_14 g_cursor_point  g_mr_13" @click="handleViewDetail(record)">预览</div>
+
+							<div class="btn g_c_main g_fs_14 g_cursor_point" @click="handleToForm('edit', record)">编辑</div>
 						</div>
 					</template>
 				</template>
@@ -113,6 +115,38 @@
 				 <a-button @click="submitForm" type="primary">确定</a-button>
 		   </template>
 		</a-modal> -->
+    <a-modal
+			ref="modalRef"
+			v-model:open="tableDetail.isShow"
+			title="持股详情"
+			width="1200px"
+			:bodyStyle="{
+				'border-radius': '4px',
+			}"
+		>
+			<div class="g_pt_8 g_pb_16" style=" overflow-y: auto">
+        <!-- <a-button class="g_float_right">
+            新增职位
+          </a-button>
+          <div class="g_float_none"></div> -->
+			
+				<div class="g_mt_16 g_clear_scroll" style="max-height: calc(100vh - 464px); overflow-y: auto">
+					<a-table :columns="tableDetail.columns" :data-source="tableDetail.list" size="middle" :pagination="false">
+						<template #bodyCell="{ column, record }">
+							<template v-if="column.key === 'rank'">
+								<span>{{ record.rank }}</span>
+							</template>
+						</template>
+					</a-table>
+				</div>
+				<div class="g_mt_20">
+					<a-pagination v-model:current="tableDetail.page" v-model:page-size="tableDetail.size" :total="tableDetail.count" :pageSize="tableDetail.size" :show-total="(total) => `共 ${total} 条`" @change="handleModalPage" @showSizeChange="handleModalSize" :show-quick-jumper="tableData.count < tableData.size ? false : true" :showSizeChanger="tableData.count < tableData.size ? false : true" :hideOnSinglePage="false" />
+				</div>
+			</div>
+      <template #footer>
+		     <a-button @click="tableDetail.isShow = false"  type="primary">确定</a-button>
+		   </template>
+		</a-modal>
 
 
 
@@ -129,16 +163,19 @@
 		       <a-form-item label="姓名" name="name" required>
 		         <a-input style="width: 100%" placeholder="请输入姓名" v-model:value="modalInfo.form.name" />
 		       </a-form-item>
-		       <a-form-item label="电话" name="name" required>
-		         <a-input style="width: 100%" placeholder="请输入电话" v-model:value="modalInfo.form.username" />
+		       <a-form-item label="持股数" name="name" required>
+		         <a-input style="width: 100%" placeholder="请输入持股数" v-model:value="modalInfo.form.shares" />
 		       </a-form-item>
-		       <a-form-item label="身份证号" name="name">
-		         <a-input style="width: 100%" placeholder="请输入身份证号" v-model:value="modalInfo.form.idcard" />
+		       <a-form-item label="持股比例" name="name" required>
+		         <a-input style="width: 100%" placeholder="请输入持股比例" v-model:value="modalInfo.form.idcard" />
+		       </a-form-item>
+		       <a-form-item label="持股价值（元）" name="name" required>
+		         <a-input style="width: 100%" placeholder="请输入持股价值" v-model:value="modalInfo.form.description" />
 		       </a-form-item>
 					
-					 <a-form-item label="备注" name="desp">
+					 <!-- <a-form-item label="备注" name="desp">
 					   <a-textarea :rows='6' style="width: 100%" placeholder="请输入备注" v-model:value="modalInfo.form.description" />
-					 </a-form-item>
+					 </a-form-item> -->
 		      </a-form>
 		   </div>
 		   <template #footer>
@@ -167,6 +204,99 @@ const showAdd = ref(0);
 onMounted(() => {
 	getTable();
 });
+
+const tableDetail = ref({
+	page: 1,
+	size: 50,
+	count: 0,
+	list: [],
+	speed: -1,
+	isShow: false,
+	keys: "",
+	columns: [],
+	pagination: {},
+});
+
+
+const handleViewDetail = (item) => {
+	// 打开明细弹窗
+	tableDetail.value = {
+		page: 1,
+		size: 50,
+		count: 0,
+		list: [{
+      rank:1,
+      userName:"老股转让",
+      storeJobName:'轻舟',
+      time:'12,234'
+    },{
+      rank:2,
+      userName:"老股转让",
+      storeJobName:'轻舟',
+      time:'12,234'
+    },{
+      rank:3,
+      userName:"老股转让",
+      storeJobName:'轻舟',
+      time:'12,234'
+    },{
+      rank:4,
+      userName:"老股转让",
+      storeJobName:'轻舟',
+      time:'12,234'
+    }],
+		speed: -1,
+		isShow: true,
+		keys: "",
+		columns: [],
+		pagination: {},
+	};
+	
+	// itemData.value = {
+	// 	userId: item.id,
+	// 	agencyTeamId: item.agencyTeamId,
+	// };
+	getModalDetail();
+};
+
+const getModalDetail = () => {
+
+  tableDetail.value.columns = [
+			{
+				title: "序号",
+				key: "rank",
+				dataIndex: "rank",
+				width: "50px",
+				ellipsis: true,
+			},
+			{
+				title: "取得方式",
+				key: "userName",
+				dataIndex: "userName",
+				ellipsis: true,
+				minWidth: "100px",
+			},
+			{
+				title: "持股主体",
+				key: "storeJobName",
+				dataIndex: "storeJobName",
+				width: "240px",
+				ellipsis: true,
+			},
+			{
+				title: "持股数量",
+				key: "time",
+				dataIndex: "time",
+				width: "200px",
+				ellipsis: true,
+			},
+		];
+};
+
+
+
+
+
 /**
  * 搜索事件
  */
@@ -234,7 +364,7 @@ const handleToForm = ($type, $data) => {
   console.log($data.id);
   modalInfo.value = {
 			isShow:true,
-			title:'修改用户',
+			title:'修改个人数据',
 			form:{
 				name:$data.name,
 				username:$data.username,
@@ -295,8 +425,11 @@ const getTable = () => {
 	tableData.value.loading = true;
 	getUserListApi({ limit: tableData.value.limit, page: tableData.value.page, keyword: tableData.value.keyword }).then((res) => {
 		console.log(res);
-		tableData.value = { ...res.data, keyword: tableData.value.keyword, page: res.data.current, limit: res.data.size };
+		tableData.value = { ...res.data, keyword: tableData.value.keyword, page: res.data.current, limit: res.data.size,shares:'123' };
 		tableData.value.records.forEach((item, index) => {
+      item.shares = "12,345"
+      item.sharesScale = "3.1345%"
+      item.sharesValue = "23,1345.00"
 			item.rank = index + 1;
 		});
 	});
@@ -327,35 +460,29 @@ const columns = ref([
 		title: "姓名",
 		key: "name",
 		dataIndex: "name",
-		width: "110px",
 	},
 
 	{
-		title: "电话",
-		key: "username",
-		dataIndex: "username",
+		title: "持股数",
+		key: "shares",
+		dataIndex: "shares",
 		ellipsis: true,
-		width: "140px",
+		width: "240px",
 	},
 	{
-		title: "身份证号",
-		key: "idcard",
-		dataIndex: "idcard",
-		width: "200px",
-		ellipsis: true,
-	},
-	{
-		title: "备注",
-		key: "description",
-		dataIndex: "description",
+		title: "持股比例",
+		key: "sharesScale",
+		dataIndex: "sharesScale",
+		width: "240px",
 		ellipsis: true,
 	},
+	
 	{
-		title: "状态",
-		key: "status",
-		dataIndex: "status",
+		title: "持股价值（元）",
+		key: "sharesValue",
+		dataIndex: "sharesValue",
 		ellipsis: true,
-		width: "75px",
+		width: "240px",
 	},
 	{
 		title: "操作",

From 6085b54cab996586b871e09bfc4dbb5e592b3183 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Mon, 11 Mar 2024 18:35:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homePage/projectData.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/homePage/projectData.vue b/src/views/homePage/projectData.vue
index 40931d8..ef3b8b9 100644
--- a/src/views/homePage/projectData.vue
+++ b/src/views/homePage/projectData.vue
@@ -12,14 +12,14 @@
 									<div class="g_c_6">主体</div>
 								</template>
 								<div v-if="!editStatus">{{ baseInfo.agencyName || "北京矩阵动力科技有限公司" }}</div>
-								<a-input placeholder="请输入企业简称" v-else v-model:value="baseInfo.agencyName" class="" />
+								<a-input placeholder="请输入主体" v-else v-model:value="baseInfo.agencyName" class="" />
 							</a-form-item>
 							<a-form-item name="agencyName" class="g_flex_1 g_ml_32" :rules="[{ required: false, message: '请输入企业简称' }]">
 								<template #label>
 									<div class="g_c_6">当前估值</div>
 								</template>
 								<div v-if="!editStatus">{{ baseInfo.agencyName || "5000万" }}</div>
-								<a-input placeholder="请输入企业简称" v-else v-model:value="baseInfo.agencyName" class="" />
+								<a-input placeholder="请输入当前估值" v-else v-model:value="baseInfo.agencyName" class="" />
 							</a-form-item>
 						</div>
 						<div class="g_flex_row_between flex_nr">
@@ -28,14 +28,14 @@
 									<div class="g_c_6">当前总股本</div>
 								</template>
 								<div v-if="!editStatus">{{ baseInfo.agencyName || "39,771.50" }}</div>
-								<a-input placeholder="请输入企业简称" v-else v-model:value="baseInfo.agencyName" class="" />
+								<a-input placeholder="请输入当前总股本" v-else v-model:value="baseInfo.agencyName" class="" />
 							</a-form-item>
 							<a-form-item name="agencyName" class="g_flex_1 g_ml_32" :rules="[{ required: false, message: '请输入企业简称' }]">
 								<template #label>
 									<div class="g_c_6">每股价格</div>
 								</template>
 								<div v-if="!editStatus">{{ baseInfo.agencyName || "32.21元" }}</div>
-								<a-input placeholder="请输入企业简称" v-else v-model:value="baseInfo.agencyName" class="" />
+								<a-input placeholder="请输入每股价格" v-else v-model:value="baseInfo.agencyName" class="" />
 							</a-form-item>
 						</div>
 					</a-form>
@@ -50,7 +50,7 @@
 				<div class="g_fw_600">股权结构</div>
 				<div>
 					<a-button @click="editStatus = !editStatus"><DownloadOutlined />导出模版</a-button>
-					<a-button type="primary" class="g_ml_10" @click="editStatus = !editStatus"><PlusOutlined />导入文件</a-button>
+					<a-button type="primary" class="g_ml_10"><PlusOutlined />导入文件</a-button>
 				</div>
 			</div>
 			<a-divider class="g_mt_0 g_mb_20" />
@@ -69,7 +69,7 @@
 				<div class="g_fw_600">增资扩股变化</div>
 				<div>
 					<a-button @click="editStatus = !editStatus"><DownloadOutlined />导出模版</a-button>
-					<a-button type="primary" class="g_ml_10" @click="editStatus = !editStatus"><PlusOutlined />导入文件</a-button>
+					<a-button type="primary" class="g_ml_10"><PlusOutlined />导入文件</a-button>
 				</div>
 			</div>
 			<a-divider class="g_mt_0 g_mb_20" />
@@ -106,19 +106,19 @@ const editStatus = ref(false);
 const gpjgList = ref([
 	{
 		rank: 1,
-		name: "汪涵光",
+		name: "王涵光",
 		number: 1120448,
 		precent: "32.43%",
 	},
 	{
 		rank: 2,
-		name: "汪涵光",
+		name: "王涵光",
 		number: 1120448,
 		precent: "32.43%",
 	},
 	{
 		rank: 3,
-		name: "汪涵光",
+		name: "王涵光",
 		number: 1120448,
 		precent: "32.43%",
 	},