add：培训演练权限角色区分处理

src/_peixun_yanlian.html

@@ -12,15 +12,22 @@
 	<div id="app">
 		<div class="wrapper" v-cloak>
 			<!-- 商户头部信息 -->
-			<div class="header">
+			<div class="header" v-if="userType=='shop'">
 				<van-search v-model="title" show-action placeholder="请输入培训演练标题" @search="onSearch">
 					<template #action>
 						<div @click="onSearch"></div>
 					</template>
 				</van-search>
 			</div>
+			<div class="header" v-if="userType!='shop'">
+				<van-search v-model="merName" show-action placeholder="请输入商家名称关键字" @search="onSearch">
+					<template #action>
+						<div @click="onSearch"></div>
+					</template>
+				</van-search>
+			</div>
 			<!-- 功能 -->
-			<button v-if="userType!=='shop'" type="info" class="func_btn" @click="viewDetail"><span>+</span>新增{{activeTab==0?'安全培训':'应急演练'}}</button>
+			<button v-if="userType=='shop'" type="info" class="func_btn" @click="viewDetail"><span>+</span>新增{{activeTab==0?'安全培训':'应急演练'}}</button>
 
 			<!-- Tab栏 -->
 			<van-tabs v-model:active="activeTab" @click="clickTab" title-active-color="#1989fa" line-height="2px"
@@ -47,18 +54,24 @@
 						<div style="width: 100%;position: relative;">
 							<!-- 第一行：商户名称 -->
 							<div class="tab1-row1 bold">{{ item.title }}</div>
-					  
-							<!-- 第二行：场所类型 + 检查单位（两列） -->
-							<div class="tab1-row1">
+							<div class="tab1-row1" v-if="userType!='shop'">
+							  <span>商家名称：{{ item.merName }}</span>
+							</div>
+							<div class="tab1-row1" v-if="!(activeTab==0&&subActiveTab==0)">
 							  <span>日期：{{ item.exerciseDate }}</span>
 							</div>
+							<!-- 只有安全培训的全部时显示该内容 -->
+							<div class="tab1-row2" v-if="activeTab==0&&subActiveTab==0">
+							    <span>日期：{{ item.exerciseDate }}</span>
+							    <span>类型：{{ item.typeName }}</span>
+							</div>
 					  
 							<!-- 第三行：监察人 + 检查日期（两列） -->
 							<div class="tab1-row2">
 							  <span v-if="activeTab==0">培训人数：{{ item.participantsNum }}</span>
-							  <span v-if="activeTab==1">演练人数：{{ item.responsiblePerson }}</span>
+							  <span v-if="activeTab==1">演练人数：{{ item.participantsNum }}</span>
 	
-							   <span>培训人：{{ item.pushPeople }}</span>
+							   <span>负责人：{{ item.responsiblePerson }}</span>
 							</div>
 						</div>
 					</van-cell>

src/_peixun_yanlian.js

@@ -41,6 +41,7 @@ window.addEventListener("load", function() {
 					}
 				],
 				merId: '',
+				merName: '',
 				loading: false,
 				finished: false,
 				page: 1,
@@ -180,11 +181,13 @@ window.addEventListener("load", function() {
 							reqParams: {
 								sign: 30,
 								title: this.title,
+								merName: this.merName,
 								exerciseType: this.activeTab + 1,
 								safetyTrainingType: this.activeTab == 1 ? 0 : this.subActiveTab,
 								pageNum: this.page++, // 每次请求增加下一页
 								pageSize: this.size,
 								sort: 'lawId,desc',
+								
 							},
 						},
 						(res) => {