From f60e0f4b8a7533355769d949b99e1cc193ec6915 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 26 Jun 2023 17:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=BA=93=E5=88=A0=E9=99=A4=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/disseMinate.vue  |  8 +++++---
 src/components/page/partyListPot.vue | 28 +++++++++++++++++++++++++++-
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/components/page/disseMinate.vue b/src/components/page/disseMinate.vue
index ab93c71..822151d 100644
--- a/src/components/page/disseMinate.vue
+++ b/src/components/page/disseMinate.vue
@@ -83,6 +83,9 @@
 							</el-option>
 						</el-select>
 					</el-form-item>
+					<el-form-item label="Begin Page Number:" prop="beginPage">
+						<el-input-number :min="1" :max="Math.ceil(userListNum/EmailData.pagesize)" v-model="EmailData.beginPage" label="Page Number"></el-input-number>						
+					</el-form-item>
 					<el-form-item label="Scheduled Tasks :" prop="frequency">
 						<el-radio-group v-model="EmailData.frequency">
 							<el-radio label="day" style="display: block;margin: 10px 0 0 0;">
@@ -98,7 +101,7 @@
 								<span style="margin: 0 0 0 5px;">(explanatory note: 1st - 5th)</span>
 							</el-radio>
 						</el-radio-group>
-					</el-form-item>
+					</el-form-item>					
 				</div>
 				<div class="d_rol">
 					<h3>
@@ -299,6 +302,7 @@
 					substance_bom: '',
 					substanceOld: '',
 					frequency: 'day',
+					beginPage:1  // 开始页数					
 				},
 				keyValue: 0,
 				userListNum: 0,
@@ -864,8 +868,6 @@
 						// 		artHtml)
 						// }
 
-
-
 						this.$api
 							.post('api/Promotion/addPromotion', this.EmailData)
 							.then(res => {
diff --git a/src/components/page/partyListPot.vue b/src/components/page/partyListPot.vue
index 25a084f..69372c6 100644
--- a/src/components/page/partyListPot.vue
+++ b/src/components/page/partyListPot.vue
@@ -77,11 +77,14 @@
 				<el-table-column prop="company" label="Affiliation"></el-table-column>
 				<el-table-column prop="field" label="Field"></el-table-column>
 				<el-table-column prop="remark" label="Remark" width="160"></el-table-column>
-				<el-table-column label="" width="100" align="center">
+				<el-table-column label="" width="200" align="center">
 					<template slot-scope="scope">
 						<el-button plain type="primary" icon="el-icon-edit" @click="handleEdit(scope.row)">
 							Edit
 						</el-button>
+						<el-button plain type="danger" icon="el-icon-edit" @click="handleDelete(scope.row)">
+							Delete
+						</el-button>
 						<!-- <div style="margin-top: 12px;">
 							<el-button plain type="warning" @click="handleSend(scope.row)">
 								PROMOTION
@@ -545,6 +548,29 @@
 			this.initMajor()
 		},
 		methods: {
+			// 删除灰库用户
+			handleDelete(row){			
+				
+				this.$confirm(`'Do you want to delete the user? Name: '${row.name}'`, 'prompt', {
+					confirmButtonText: 'Yes',
+					cancelButtonText: 'Cancel',
+					type: 'warning'
+					}).then(() => {
+						this.$api
+						.post('api/User/delAshUser',{'ash_id': row.ash_id})
+						.then(res => {
+							if(res.code == 0){
+								this.$message.success('successed!')
+								this.getDate()
+							}
+						})
+						.catch(err => {
+							console.log(err);
+						});
+				}).catch(() => { });
+							
+				
+			},
 			// 获取国家列表
 			getCountry() {
 				this.$api