From 744fb9267e40cfb01b5eab22d12dcc42e4113e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 22 Aug 2024 16:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bl/commission/fxy/fxyApply.vue |  61 +++++++-
 src/views/locality/locality.vue          | 174 +++++++++++------------
 2 files changed, 147 insertions(+), 88 deletions(-)

diff --git a/src/views/bl/commission/fxy/fxyApply.vue b/src/views/bl/commission/fxy/fxyApply.vue
index 4c357fe..9b358bc 100644
--- a/src/views/bl/commission/fxy/fxyApply.vue
+++ b/src/views/bl/commission/fxy/fxyApply.vue
@@ -99,6 +99,16 @@
 				width="120"
 			>
 			</el-table-column>
+			<el-table-column
+				prop="level"
+				label="等级"
+				width="120"
+			>
+				<template slot-scope="scope">
+					<span v-if="scope.row.level == 1">一级</span>
+					<span v-if="scope.row.level == 2">二级</span>
+				</template>
+			</el-table-column>
 			<el-table-column
 				prop="agent"
 				label="所属代理商"
@@ -250,6 +260,17 @@
 					:disabled="true"
 				></el-input>
 			</div>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">等级：</span>
+				<el-select
+					clearable
+					v-model="level"
+					style="width: 150px;"
+					:disabled="true">
+					<el-option :value="1" :key="1" label="一级"></el-option>
+					<el-option :value="2" :key="2" label="二级"></el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
 			<div style="margin-bottom: 10px">
 		          <span style="width: 200px; display: inline-block; text-align: right"
 				  >备注：</span
@@ -341,6 +362,16 @@
 					placeholder="请输入手机号"
 				></el-input>
 			</div>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">等级：</span>
+				<el-select
+					clearable
+					v-model="level"
+					style="width: 150px;">
+					<el-option :value="1" :key="1" label="一级"></el-option>
+					<el-option :value="2" :key="2" label="二级"></el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
 			<div style="margin-bottom: 10px">
 		          <span style="width: 200px; display: inline-block; text-align: right"
 				  >备注：</span
@@ -498,6 +529,17 @@
 					:disabled="true"
 				></el-input>
 			</div>
+			<div style="margin-bottom: 10px">
+				<span style="width: 200px; display: inline-block; text-align: right">等级：</span>
+				<el-select
+					clearable
+					v-model="level"
+					style="width: 150px;"
+					:disabled="true">
+					<el-option :value="1" :key="1" label="一级"></el-option>
+					<el-option :value="2" :key="2" label="二级"></el-option>
+				</el-select>&nbsp;&nbsp;
+			</div>
 			<div style="margin-bottom: 10px">
 		          <span style="width: 200px; display: inline-block; text-align: right"
 				  >备注：</span
@@ -552,6 +594,7 @@ export default {
 			userName: "",
 			name: "",
 			phone: "",
+			level: "",
 			remarks: "",
 			status: "",
 			opinion: "",
@@ -636,6 +679,7 @@ export default {
 			this.userId = row.userId;
 			this.name = row.name;
 			this.phone = row.phone;
+			this.level = row.level;
 			this.avatar = row.avatar;
 			this.userName = row.userName;
 			this.remarks = row.remarks;
@@ -649,6 +693,7 @@ export default {
 			this.userId = row.userId;
 			this.name = row.name;
 			this.phone = row.phone;
+			this.level = row.level;
 			this.avatar = row.avatar;
 			this.userName = row.userName;
 			this.remarks = row.remarks;
@@ -665,6 +710,7 @@ export default {
 				this.userId = row.userId;
 				this.name = row.name;
 				this.phone = row.phone;
+				this.level = row.level;
 				this.avatar = row.avatar;
 				this.userName = row.userName;
 				this.remarks = row.remarks;
@@ -676,6 +722,7 @@ export default {
 				this.userId = "";
 				this.name = "";
 				this.phone = "";
+				this.level = "";
 				this.avatar = "";
 				this.userName = "";
 				this.remarks = "";
@@ -708,6 +755,15 @@ export default {
 				});
 				return;
 			}
+			if (this.level == "") {
+				this.$notify({
+					title: "提示",
+					duration: 1800,
+					message: "请选择等级",
+					type: "warning",
+				});
+				return;
+			}
 			if (this.userId == "") {
 				this.$notify({
 					title: "提示",
@@ -739,6 +795,7 @@ export default {
 					userId: this.userId,
 					name: this.name,
 					phone: this.phone,
+					level: this.level,
 					remarks: this.remarks,
 				}),
 			}).then(({data}) => {
@@ -829,7 +886,8 @@ export default {
 					id: this.id,
 					opinion: this.opinion,
 					status: this.status,
-					userId: this.userId
+					userId: this.userId,
+					level: this.level,
 				}),
 			}).then(({data}) => {
 				if (data.code == 0) {
@@ -895,6 +953,7 @@ export default {
 			this.id= "";
 			this.name= "";
 			this.phone= "";
+			this.level= "";
 			this.status= "";
 			this.startTime= "";
 			this.endTime= "";
diff --git a/src/views/locality/locality.vue b/src/views/locality/locality.vue
index eade680..1f06598 100644
--- a/src/views/locality/locality.vue
+++ b/src/views/locality/locality.vue
@@ -189,33 +189,33 @@
               </el-switch>
             </template>
           </el-table-column>
-          <el-table-column prop="qyType" label="是否企业预约项目">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.qyType"
-                @change="changeQy(scope.row.massageTypeId, scope.row.qyType)"
-                :active-value="openValue3"
-                :inactive-value="closeValue3"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
-              >
-              </el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column prop="qyMinNum" label="企业预约最小次数" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.qyMinNum }}</span>
-              <el-button
-                size="mini"
-                type="primary"
-                plain
-                :disabled="!isAuth('locality:update')"
-                @click="updateQyMin(scope.row)"
-                style="margin: 5px"
-                >修改</el-button
-              >
-            </template>
-          </el-table-column>
+<!--          <el-table-column prop="qyType" label="是否企业预约项目">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.qyType"-->
+<!--                @change="changeQy(scope.row.massageTypeId, scope.row.qyType)"-->
+<!--                :active-value="openValue3"-->
+<!--                :inactive-value="closeValue3"-->
+<!--                active-color="#13ce66"-->
+<!--                inactive-color="#ff4949"-->
+<!--              >-->
+<!--              </el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column prop="qyMinNum" label="企业预约最小次数" width="150">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span>{{ scope.row.qyMinNum }}</span>-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="primary"-->
+<!--                plain-->
+<!--                :disabled="!isAuth('locality:update')"-->
+<!--                @click="updateQyMin(scope.row)"-->
+<!--                style="margin: 5px"-->
+<!--                >修改</el-button-->
+<!--              >-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <!-- <el-table-column prop="createTime" label="创建时间">
 					</el-table-column> -->
           <el-table-column label="操作" prop="id" width="260" fixed="right">
@@ -1528,25 +1528,25 @@
         </div>
       </el-dialog>
       <!-- 修改企业最小预约数量 -->
-      <el-dialog title="企业最小预约数量" :visible.sync="dialogFormVisibleBz" center>
-        <div style="margin-bottom: 10px">
-          <span style="width: 200px; display: inline-block; text-align: right"
-            >企业最小预约数量:</span
-          >
-          <el-input
-            style="width: 50%"
-            v-model="qyMinNum"
-            type="number"
-            min="0"
-            placeholder="请输入数量"
-          >
-          </el-input>
-        </div>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="dialogFormVisibleBz = false">取 消</el-button>
-          <el-button type="primary" @click="replyNoticeTo()">确 定</el-button>
-        </div>
-      </el-dialog>
+<!--      <el-dialog title="企业最小预约数量" :visible.sync="dialogFormVisibleBz" center>-->
+<!--        <div style="margin-bottom: 10px">-->
+<!--          <span style="width: 200px; display: inline-block; text-align: right"-->
+<!--            >企业最小预约数量:</span-->
+<!--          >-->
+<!--          <el-input-->
+<!--            style="width: 50%"-->
+<!--            v-model="qyMinNum"-->
+<!--            type="number"-->
+<!--            min="0"-->
+<!--            placeholder="请输入数量"-->
+<!--          >-->
+<!--          </el-input>-->
+<!--        </div>-->
+<!--        <div slot="footer" class="dialog-footer">-->
+<!--          <el-button @click="dialogFormVisibleBz = false">取 消</el-button>-->
+<!--          <el-button type="primary" @click="replyNoticeTo()">确 定</el-button>-->
+<!--        </div>-->
+<!--      </el-dialog>-->
     </el-tabs>
     <el-dialog
       title="物料包列表"
@@ -1857,7 +1857,7 @@
       </div>
     </el-dialog>
 
-    
+
 
 			<el-dialog title="新增评论" :visible.sync="dialogSaveVisible" center>
 				<el-form :model="saveForm">
@@ -2155,7 +2155,7 @@ export default {
       materialId: "",
       materialPackageClassifyId: "",
       getMaterialPackageDataOfRow: {},
-      
+
       //新增评论内容
       saveForm:{
         massageTypeId: '',
@@ -2466,7 +2466,7 @@ export default {
       this.childPage = val;
       this.selectMassageTypeChildrenPage();
     },
-    
+
     handleSizeChange1(val) {
       this.limit = val;
       this.InformationSelect();
@@ -3571,7 +3571,7 @@ export default {
         });
       });
     },
-    
+
     // 企业预约项目是否启用
     changeQy(massageTypeId, qyType) {
       this.$http({
@@ -4453,15 +4453,15 @@ export default {
     // 修改销量
     updateBz(row) {
       this.ordersId = row.massageTypeId;
-      this.content = row.sales;
+      this.ordersales = row.sales;
       this.dialogFormVisibleBz = true;
     },
     // 企业预约最小数量
-    updateQyMin(row) {
-      this.ordersId = row.massageTypeId;
-      this.qyMinNum = row.qyMinNum;
-      this.dialogFormVisibleBz = true;
-    },
+    // updateQyMin(row) {
+    //   this.ordersId = row.massageTypeId;
+    //   this.qyMinNum = row.qyMinNum;
+    //   this.dialogFormVisibleBz = true;
+    // },
     // 修改
     replyNoticeTo() {
       this.$http({
@@ -4493,38 +4493,38 @@ export default {
         }
       });
     },
-    
+
     // 修改
-    replyNoticeTo() {
-      this.$http({
-        url: this.$http.adornUrl("artificer/updateMassageType"),
-        method: "post",
-        // params: this.$http.adornParams({
-        data: this.$http.adornData({
-          massageTypeId: this.ordersId,
-          qyMinNum: this.qyMinNum,
-        }),
-      }).then(({ data }) => {
-        if (data.code == 0) {
-          this.$message({
-            message: "修改成功",
-            type: "success",
-            duration: 1500,
-            onClose: () => {
-              this.classSelect();
-            },
-          });
-          this.dialogFormVisibleBz = false;
-        } else {
-          this.$message({
-            message: data.msg,
-            type: "warning",
-            duration: 1500,
-            onClose: () => {},
-          });
-        }
-      });
-    },
+    // replyNoticeTo() {
+    //   this.$http({
+    //     url: this.$http.adornUrl("artificer/updateMassageType"),
+    //     method: "post",
+    //     // params: this.$http.adornParams({
+    //     data: this.$http.adornData({
+    //       massageTypeId: this.ordersId,
+    //       qyMinNum: this.qyMinNum,
+    //     }),
+    //   }).then(({ data }) => {
+    //     if (data.code == 0) {
+    //       this.$message({
+    //         message: "修改成功",
+    //         type: "success",
+    //         duration: 1500,
+    //         onClose: () => {
+    //           this.classSelect();
+    //         },
+    //       });
+    //       this.dialogFormVisibleBz = false;
+    //     } else {
+    //       this.$message({
+    //         message: data.msg,
+    //         type: "warning",
+    //         duration: 1500,
+    //         onClose: () => {},
+    //       });
+    //     }
+    //   });
+    // },
     // 查询物料包列表
     getMaterialPackageDataList(row) {
       this.$http({