From a2b6e9f2d8e9c401831e249229fcefe074e98c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 15 Jun 2024 20:36:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AE=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bl/massage/massagePackage.vue | 77 ++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 16 deletions(-)

diff --git a/src/views/bl/massage/massagePackage.vue b/src/views/bl/massage/massagePackage.vue
index 98f90ac..a030151 100644
--- a/src/views/bl/massage/massagePackage.vue
+++ b/src/views/bl/massage/massagePackage.vue
@@ -2,7 +2,7 @@
 	<div>
 		<!-- 服务包列表 -->
 		<div style="position: relative; display: inline-block; margin: 5px">
-			<span>项目类型：</span>
+			<span>服务包类型：</span>
 			<el-select
 				clearable
 				v-model="type"
@@ -15,6 +15,20 @@
 				</el-option>
 			</el-select>&nbsp;&nbsp;
 		</div>
+		<div style="position: relative; display: inline-block; margin: 5px">
+			<span>服务类型：</span>
+			<el-select
+				clearable
+				v-model="classifyId"
+				style="width: 150px; margin-left: 10px">
+				<el-option
+					v-for="item in fwData"
+					:key="item.id"
+					:label="item.value"
+					:value="item.id">
+				</el-option>
+			</el-select>&nbsp;&nbsp;
+		</div>
 		<div style="position: relative; display: inline-block">
 			<span>城市：</span>
 			<el-input
@@ -77,18 +91,16 @@
 				fixed="left"
 			>
 			</el-table-column>
-<!--			<el-table-column-->
-<!--				prop="type"-->
-<!--				label="服务类型"-->
-<!--				fixed="left"-->
-<!--				width="150"-->
-<!--			>-->
-<!--			</el-table-column>-->
-			<el-table-column label="服务类型" fixed="left" prop="type">
+			<el-table-column label="服务包类型" fixed="left" prop="type" width="100">
 				<template slot-scope="scope">
 					{{ showDictValue(scope.row.type, typeDictData) }}
 				</template>
 			</el-table-column>
+			<el-table-column label="服务类型" fixed="left" prop="classifyId">
+				<template slot-scope="scope">
+					{{ showDictValue(scope.row.classifyId, fwData) }}
+				</template>
+			</el-table-column>
 			<el-table-column
 				prop="title"
 				label="名称"
@@ -300,10 +312,10 @@
 		</el-dialog>
 
 		<!-- 添加、修改服务包 -->
-		<el-dialog :title="titles" :visible.sync="dialogFormVisible" center>
+		<el-dialog :title="titles" :visible.sync="dialogFormVisible" center @close="closeMain">
 			<div style="margin-bottom: 10px">
 		          <span style="width: 200px; display: inline-block; text-align: right"
-				  >类型：</span
+				  >服务包类型：</span
 				  >
 				<el-select clearable v-model="type" style="width: 50%">
 					<el-option
@@ -316,6 +328,21 @@
 				</el-select
 				>
 			</div>
+			<div style="margin-bottom: 10px">
+		          <span style="width: 200px; display: inline-block; text-align: right"
+				  >服务类型：</span
+				  >
+				<el-select clearable v-model="classifyId" style="width: 50%">
+					<el-option
+						v-for="item in fwData"
+						:key="item.id"
+						:label="item.value"
+						:value="item.id"
+					>
+					</el-option>
+				</el-select
+				>
+			</div>
 			<div style="margin-bottom: 10px">
 		          <span style="width: 200px; display: inline-block; text-align: right"
 				  >名称：</span
@@ -1146,7 +1173,8 @@ export default {
 			typeDictData: [],
 			id: "",//编号
 			title: "",//标题
-			type: "",//服务类型
+			type: "",//服务包类型
+			classifyId: "",//服务类型
 			oldPrice: "",//原价
 			price: "",//现价
 			packageImg: "",//图片
@@ -1265,6 +1293,7 @@ export default {
 					page: this.page,
 					limit: this.limit,
 					type: this.type,
+					classifyId: this.classifyId,
 					city: this.city,
 					title: this.title,
 					status: this.status
@@ -1293,6 +1322,7 @@ export default {
 		// 重置
 		handleClear() {
 			this.type = "";
+			this.classifyId ="";
 			this.city = "";
 			this.title = "";
 			this.status = "";
@@ -1544,6 +1574,7 @@ export default {
 				this.id = row.id;
 				this.title = row.title;
 				this.type = row.type;
+				this.classifyId = row.classifyId;
 				this.oldPrice = row.oldPrice;
 				this.price = row.price;
 				this.packageImg = row.packageImg;
@@ -1590,13 +1621,26 @@ export default {
 			this.dialogFormVisible = true;
 		},
 
+		closeMain(){
+			this.handleClear();
+		},
+
 		// 提交添加、修改服务包
 		handleSubmit() {
 			if (this.type == "") {
 				this.$notify({
 					title: "提示",
 					duration: 1800,
-					message: "请选择类型",
+					message: "请选择服务包类型",
+					type: "warning",
+				});
+				return;
+			}
+			if (this.classifyId == "") {
+				this.$notify({
+					title: "提示",
+					duration: 1800,
+					message: "请选择服务类型",
 					type: "warning",
 				});
 				return;
@@ -1671,6 +1715,7 @@ export default {
 					id: this.id,
 					title: this.title,
 					type: this.type,
+					classifyId: this.classifyId,
 					oldPrice: this.oldPrice,
 					price: this.price,
 					packageImg: this.packageImg,
@@ -2280,9 +2325,9 @@ export default {
 
 		showBuyView(row){
 			this.packageId = row.id;
-			this.userId = 400;
-			this.quantity = 5;
-			this.couponId = "2636,2635";
+			this.userId = 624;
+			this.quantity = 1;
+			this.couponId = "";
 			this.packagePrice = row.price;//单价
 
 			this.vipRate = 90;