From 5ccb9297e11314a903de819a04db1c44b736ef04 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 11 Apr 2024 11:18:08 +0800
Subject: [PATCH 1/2] 4.11

---
 .../contrastAnalysis/components/barChart.vue  |  4 ----
 .../trendAnalysis/components/lineChart.vue    |  6 +++---
 .../energy/analysis/trendAnalysis/index.vue   |  4 +++-
 .../components/AddTable.vue                   |  8 +++++++
 .../components/energyQuantityManualAdd.vue    |  1 +
 .../energyLimit/components/energyLimitAdd.vue | 21 +++++++++++++++----
 6 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
index c612503c..714f516f 100644
--- a/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
+++ b/src/views/energy/analysis/contrastAnalysis/components/barChart.vue
@@ -76,10 +76,6 @@ export default {
 					name: this.chartData[i].objName + this.chartData[i].objCode,
 					type: 'bar',
 					barMaxWidth: 20,
-					label: {
-						show: true,
-						position: 'top',
-					},
 					data: [],
 				};
 				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
diff --git a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
index ce62c734..a49b6246 100644
--- a/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
+++ b/src/views/energy/analysis/trendAnalysis/components/lineChart.vue
@@ -68,9 +68,9 @@ export default {
 
 			var option = {
 				color: ['#288AFF'],
-				// tooltip: {
-				//   trigger: 'axis'
-				// },
+				tooltip: {
+					trigger: 'axis',
+				},
 				grid: {
 					left: '4%',
 					right: '1%',
diff --git a/src/views/energy/analysis/trendAnalysis/index.vue b/src/views/energy/analysis/trendAnalysis/index.vue
index a06bc090..d42b7b55 100644
--- a/src/views/energy/analysis/trendAnalysis/index.vue
+++ b/src/views/energy/analysis/trendAnalysis/index.vue
@@ -57,8 +57,10 @@ export default {
 			let listObj = { useNum: '消耗量' }; // 数据
 			for (let i = 0; i < arr.length; i++) {
 				let obj = {};
+				let fName = arr[i].time.slice(0, 4);
+				let lName = arr[i].time.slice(4, 6);
 				obj.prop = arr[i].time;
-				obj.label = arr[i].time;
+				obj.label = fName + ' 第 ' + lName + ' 周';
 				obj.minWidth = 100;
 				tempX.push(obj);
 				listObj[arr[i].time] = arr[i].useNum || null;
diff --git a/src/views/energy/base/energyQuantityManual/components/AddTable.vue b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
index 2b2c463a..b56df97d 100644
--- a/src/views/energy/base/energyQuantityManual/components/AddTable.vue
+++ b/src/views/energy/base/energyQuantityManual/components/AddTable.vue
@@ -45,6 +45,7 @@
 			</el-table-column>
 		</el-table>
 		<el-button
+			v-show="!isEdit"
 			class="addButton"
 			icon="el-icon-plus"
 			@click="emitButtonClick">
@@ -70,6 +71,13 @@ export default {
 				return [];
 			},
 		},
+		isEdit: {
+			type: Boolean,
+			required: true,
+			default: () => {
+				return false;
+			},
+		},
 	},
 	data() {
 		return {};
diff --git a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
index ceeb44c8..e2f3bc22 100644
--- a/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
+++ b/src/views/energy/base/energyQuantityManual/components/energyQuantityManualAdd.vue
@@ -42,6 +42,7 @@
 				<add-table
 					:table-data="tableData"
 					:table-name-list="tableNameList"
+					:isEdit="isEdit"
 					@emitFun="inputChange"
 					@emitButtonClick="emitButtonClick" />
 			</el-col>
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index 531b29c0..7ed3e7ee 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -66,7 +66,7 @@
 						placeholder="请选择"
 						style="width: 100%">
 						<el-option
-							v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
+							v-for="item in tableNameList"
 							:key="item.value"
 							:label="item.label"
 							:value="item.value"></el-option>
@@ -154,6 +154,7 @@ import {
 	createEnergyLimit,
 	getEnergyParamList,
 } from '@/api/monitoring/energyLimit';
+import { energyTableGet } from '@/api/base/energyQuantityManual';
 export default {
 	name: 'energyLimitAdd',
 	props: {
@@ -203,6 +204,7 @@ export default {
 					{ required: true, message: '指标类型不能为空', trigger: 'change' },
 				],
 			},
+			tableNameList: [],
 			detailList: [],
 		};
 	},
@@ -267,11 +269,22 @@ export default {
 			}
 		},
 		toggleType() {
-			if (this.form.energyTypeId && this.form.type) {
-				this.getDetailList();
-				this.form.plcParamId = '';
+			if (this.form.energyTypeId && this.form.method == 2) {
+				this.form.tableName = '';
+				this.getTableNameList(this.form.energyTypeId);
 			}
 		},
+		// 获取能源表名list
+		getTableNameList(id) {
+			energyTableGet({ energyTypeId: id }).then((res) => {
+				this.tableNameList = res.data.tableObjs || [];
+				if (this.tableNameList.length === 0) {
+					this.$modal.msgWarning(
+						'当前能源类型暂无配置表名，请先到《表名配置》页面配置'
+					);
+				}
+			});
+		},
 		// 递归处理分类回显问题
 		changeDetSelect(key, treeData) {
 			let arr = []; // 递归时操作的数组
-- 
2.45.2


From 5d3622bf6277f6ccfb85ee02eb7acb2dbd64cb9e Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 11 Apr 2024 15:22:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/groupTeam/components/statusBtn.vue   |   86 +-
 .../groupTeam/components/workerOperate.vue    |   74 +-
 src/views/group/base/groupTeam/index.vue      |    2 +-
 .../group/base/groupTeamScheduling/index.vue  | 1112 +++++++++--------
 .../group/monitoring/groupTeamView/index.vue  |    2 +-
 .../group/monitoring/teamProduction/index.vue |    2 +-
 src/views/order/base/orderGroup/index.vue     |   43 +-
 src/views/order/base/orderManage/index.vue    |   42 +-
 .../orderCompletionMonitoring/index.vue       |   11 +-
 .../voc/vocDetectionHistory/index.vue         |    8 +-
 .../voc/vocDetectionIndication/index.vue      |   15 +-
 .../wasteGasDetectionHistory/index.vue        |    8 +-
 .../wasteGasDetectionIndication/index.vue     |   15 +-
 .../wasteWaterDetectionHistory/index.vue      |    6 +-
 .../wasteWaterDetectionIndication/index.vue   |   10 +-
 15 files changed, 829 insertions(+), 607 deletions(-)

diff --git a/src/views/group/base/groupTeam/components/statusBtn.vue b/src/views/group/base/groupTeam/components/statusBtn.vue
index 539e17fd..c4a75a53 100644
--- a/src/views/group/base/groupTeam/components/statusBtn.vue
+++ b/src/views/group/base/groupTeam/components/statusBtn.vue
@@ -1,46 +1,52 @@
 <template>
-  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
+	<el-switch
+		v-hasPermi="['base:group-team:edit-worker']"
+		v-model="state"
+		type="text"
+		size="small"
+		:disabled="readonly"
+		@change="changeHandler" />
 </template>
 
 <script>
 export default {
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  data() {
-    return {
-      state: false
-    }
-  },
-  computed: {
-    readonly() {
-      return !!this.injectData.readonly
-    }
-  },
-  mounted() {
-    this.mapToState()
-  },
-  methods: {
-    mapToState() {
-      if (this.injectData.prop === 'enabled') {
-        this.state = this.injectData.enabled === 1 ? true : false
-      }
-    },
-    changeHandler() {
-      let params = {}
-      let payload = {}
-      params.name = 'state'
-      payload.id = this.injectData.id
-      payload.enabled = this.state ? '1' : '0'
-      payload.code = this.injectData.code
-      payload.name = this.injectData.name
-      payload.leaderId = this.injectData.leaderId
-      params.payload = payload
-      this.$emit('emitData', params)
-    }
-  }
-}
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	data() {
+		return {
+			state: false,
+		};
+	},
+	computed: {
+		readonly() {
+			return !!this.injectData.readonly;
+		},
+	},
+	mounted() {
+		this.mapToState();
+	},
+	methods: {
+		mapToState() {
+			if (this.injectData.prop === 'enabled') {
+				this.state = this.injectData.enabled === 1 ? true : false;
+			}
+		},
+		changeHandler() {
+			let params = {};
+			let payload = {};
+			params.name = 'state';
+			payload.id = this.injectData.id;
+			payload.enabled = this.state ? '1' : '0';
+			payload.code = this.injectData.code;
+			payload.name = this.injectData.name;
+			payload.leaderId = this.injectData.leaderId;
+			params.payload = payload;
+			this.$emit('emitData', params);
+		},
+	},
+};
 </script>
diff --git a/src/views/group/base/groupTeam/components/workerOperate.vue b/src/views/group/base/groupTeam/components/workerOperate.vue
index 956bf89f..76574ad0 100644
--- a/src/views/group/base/groupTeam/components/workerOperate.vue
+++ b/src/views/group/base/groupTeam/components/workerOperate.vue
@@ -1,41 +1,51 @@
 <template>
-  <div class="workerOperate">
-    <div class="operateBtn">
-      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
-      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
-    </div>
-  </div>
+	<div class="workerOperate">
+		<div class="operateBtn">
+			<span
+				class="view"
+				v-hasPermi="['base:group-team:view-worker']"
+				@click="emitParams('view')">
+				查看
+			</span>
+			<span
+				class="edit"
+				v-hasPermi="['base:group-team:edit-worker']"
+				@click="emitParams('edit')">
+				编辑
+			</span>
+		</div>
+	</div>
 </template>
 <script>
 export default {
-  name: 'WorkerOperate',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    }
-  },
-  methods: {
-    emitParams(data) {
-      let params = {}
-      params.name = data
-      params.payload = this.injectData
-      this.$emit('emitData', params)
-    }
-  }
-}
+	name: 'WorkerOperate',
+	props: {
+		injectData: {
+			type: Object,
+			default: () => ({}),
+		},
+	},
+	methods: {
+		emitParams(data) {
+			let params = {};
+			params.name = data;
+			params.payload = this.injectData;
+			this.$emit('emitData', params);
+		},
+	},
+};
 </script>
 <style lang='scss' scoped>
 .workerOperate {
-  .operateBtn{
-    color: #0B58FF;
-    .view {
-      margin-right: 10px;
-      cursor: pointer;
-    }
-    .edit {
-      cursor: pointer;
-    }
-  }
+	.operateBtn {
+		color: #0b58ff;
+		.view {
+			margin-right: 10px;
+			cursor: pointer;
+		}
+		.edit {
+			cursor: pointer;
+		}
+	}
 }
 </style>
\ No newline at end of file
diff --git a/src/views/group/base/groupTeam/index.vue b/src/views/group/base/groupTeam/index.vue
index 09be766c..8281ca16 100644
--- a/src/views/group/base/groupTeam/index.vue
+++ b/src/views/group/base/groupTeam/index.vue
@@ -125,7 +125,7 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: 'separate',
+					type: this.$auth.hasPermi('base:group-team:create') ? 'separate' : '',
 				},
 				{
 					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
diff --git a/src/views/group/base/groupTeamScheduling/index.vue b/src/views/group/base/groupTeamScheduling/index.vue
index 184c6d8e..afe84aa8 100644
--- a/src/views/group/base/groupTeamScheduling/index.vue
+++ b/src/views/group/base/groupTeamScheduling/index.vue
@@ -1,506 +1,634 @@
 <template>
-  <div class="groupTeamScheduling">
-    <TopTab :roomNameDict='roomNameDict' @emitFun='toggleName'/>
-    <div class="operationArea">
-      <el-form :inline="true" class="demo-form-inline">
-        <span class="blue-block"></span>
-        <el-form-item label="月份选择">
-          <el-date-picker
-            v-model="startDay"
-            type="month"
-            placeholder="选择月"
-            size="small"
-            :disabled="showSetting"
-            @change="selectMonth"
-            :clearable="false"
-            style="width: 120px">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <span class="separateStyle" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-if="this.$auth.hasPermi('base:group-team-scheduling:set')" :disabled="showSetting || settingBtnDis" @click="settingMsg">设置</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting && autoScheduling" @click="schedulingBtn">自动排班</el-button>
-        </el-form-item>
-        <el-form-item>
-          <span class="separateStyle" v-show="showSetting"></span>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" v-show="showSetting" @click="confirmSetting">确认</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" plain v-show="showSetting" @click="cancelSetting">取消</el-button>
-        </el-form-item>
-        <el-form-item label="请先选择查询的班组" class="rightItem">
-          <!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button>
-          <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('3')">班组检测查询</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-    <!-- 日历区域 -->
-    <div class="calenderArea">
-      <div style="font-size: 24px;font-weight: 500">{{ this.month }} {{ this.year }}</div>
-      <el-calendar v-model="startDay">
-        <!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
-        <template
-          slot="dateCell"
-          slot-scope="{date, data}">
-          <div v-if="data.type === 'current-month'">
-            <!-- 日期 -->
-            <div class="dateStyle">
-              {{ Number(data.day.split('-')[2]) }}
-            </div>
-            <!-- 班次班组 -->
-            <!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
-            <el-row :gutter="2" :class="'class' + (index+1) + (chooseTip === (item.startDay+item.classesId) ? ' team-active' : '')" v-for="(item, index) in list[Number(data.day.split('-')[2])]" :key='index'>
-              <el-col :span="12">
-                <div class="selectDiv">
-                  <!-- 选择班组图标 -->
-                  <div class="toggle-icon" v-show="showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true)">
-                    <svg-icon icon-class="toggle"/>
-                  </div>
-                  <!-- 不能选择班组 -->
-                  <div class="toggle-icon-hide" v-show="!(showSetting && (new Date(data.day).valueOf() < new Date().valueOf() ? false: true))"></div>
-                  <el-select v-model="item.teamId" size='small' :disabled="!showSetting || (new Date(data.day).valueOf() > new Date().valueOf() ? false: true)">
-                    <el-option
-                      v-for="i in teamList"
-                      :key="i.id"
-                      :label="i.name"
-                      :value="i.id">
-                    </el-option>
-                  </el-select>
-              </div>
-              </el-col>
-              <el-col :span="12">
-                <el-button class="labelClass" @click="chooseTeam(item)">{{ item.classesName }}</el-button>
-              </el-col>
-            </el-row>
-          </div>
-        </template>
-      </el-calendar>
-    </div>
-  </div>
+	<div class="groupTeamScheduling">
+		<TopTab
+			:roomNameDict="roomNameDict"
+			@emitFun="toggleName" />
+		<div class="operationArea">
+			<el-form
+				:inline="true"
+				class="demo-form-inline">
+				<span class="blue-block"></span>
+				<el-form-item label="月份选择">
+					<el-date-picker
+						v-model="startDay"
+						type="month"
+						placeholder="选择月"
+						size="small"
+						:disabled="showSetting"
+						@change="selectMonth"
+						:clearable="false"
+						style="width: 120px"></el-date-picker>
+				</el-form-item>
+				<el-form-item>
+					<span
+						class="separateStyle"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"></span>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						v-if="this.$auth.hasPermi('base:group-team-scheduling:set')"
+						:disabled="showSetting || settingBtnDis"
+						@click="settingMsg">
+						设置
+					</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						v-show="showSetting && autoScheduling"
+						@click="schedulingBtn">
+						自动排班
+					</el-button>
+				</el-form-item>
+				<el-form-item>
+					<span
+						class="separateStyle"
+						v-show="showSetting"></span>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						v-show="showSetting"
+						@click="confirmSetting">
+						确认
+					</el-button>
+				</el-form-item>
+				<el-form-item>
+					<el-button
+						type="primary"
+						size="small"
+						plain
+						v-show="showSetting"
+						@click="cancelSetting">
+						取消
+					</el-button>
+				</el-form-item>
+				<el-form-item
+					v-hasPermi="[
+						'base:quality-inspection-record:query',
+						'base:core-work-order:query',
+						'base:core-product:query',
+					]"
+					label="请先选择查询的班组"
+					class="rightItem">
+					<!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('1')">班组上下片查询</el-button> -->
+					<!-- <el-button type="primary" size="small" :disabled="jumpDisabled" @click="toOtherPage('2')">班组能源查询</el-button> -->
+					<el-button
+						type="primary"
+						size="small"
+						:disabled="jumpDisabled"
+						@click="toOtherPage('3')">
+						班组检测查询
+					</el-button>
+				</el-form-item>
+			</el-form>
+		</div>
+		<!-- 日历区域 -->
+		<div class="calenderArea">
+			<div style="font-size: 24px; font-weight: 500">
+				{{ this.month }} {{ this.year }}
+			</div>
+			<el-calendar v-model="startDay">
+				<!-- 这里使用的是 2.5 slot 语法，对于新项目请使用 2.6 slot 语法-->
+				<template
+					slot="dateCell"
+					slot-scope="{ date, data }">
+					<div v-if="data.type === 'current-month'">
+						<!-- 日期 -->
+						<div class="dateStyle">
+							{{ Number(data.day.split('-')[2]) }}
+						</div>
+						<!-- 班次班组 -->
+						<!-- class有两个样式，一个是类似class1，还有个是选中红框显示 -->
+						<el-row
+							:gutter="2"
+							:class="
+								'class' +
+								(index + 1) +
+								(chooseTip === item.startDay + item.classesId
+									? ' team-active'
+									: '')
+							"
+							v-for="(item, index) in list[Number(data.day.split('-')[2])]"
+							:key="index">
+							<el-col :span="12">
+								<div class="selectDiv">
+									<!-- 选择班组图标 -->
+									<div
+										class="toggle-icon"
+										v-show="
+											showSetting &&
+											(new Date(data.day).valueOf() < new Date().valueOf()
+												? false
+												: true)
+										">
+										<svg-icon icon-class="toggle" />
+									</div>
+									<!-- 不能选择班组 -->
+									<div
+										class="toggle-icon-hide"
+										v-show="
+											!(
+												showSetting &&
+												(new Date(data.day).valueOf() < new Date().valueOf()
+													? false
+													: true)
+											)
+										"></div>
+									<el-select
+										v-model="item.teamId"
+										size="small"
+										:disabled="
+											!showSetting ||
+											(new Date(data.day).valueOf() > new Date().valueOf()
+												? false
+												: true)
+										">
+										<el-option
+											v-for="i in teamList"
+											:key="i.id"
+											:label="i.name"
+											:value="i.id"></el-option>
+									</el-select>
+								</div>
+							</el-col>
+							<el-col :span="12">
+								<el-button
+									class="labelClass"
+									@click="chooseTeam(item)">
+									{{ item.classesName }}
+								</el-button>
+							</el-col>
+						</el-row>
+					</div>
+				</template>
+			</el-calendar>
+		</div>
+	</div>
 </template>
 
 <script>
-import { getPreset, createOrUpdateList, autoSet } from "@/api/base/groupTeamScheduling";
-import { listEnabledByRoom } from "@/api/base/groupTeam";
+import {
+	getPreset,
+	createOrUpdateList,
+	autoSet,
+} from '@/api/base/groupTeamScheduling';
+import { listEnabledByRoom } from '@/api/base/groupTeam';
 import moment from 'moment';
-import TopTab from './components/topTab'
+import TopTab from './components/topTab';
 
 export default {
-  name: "GroupTeamScheduling",
-  data() {
-    return {
-      roomNameDict:null,
-      startDay: '',// 查询参数
-      year: '',// 2023
-      month: '',// 九月
-      monthList: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
-      list: {},
-      teamList: [],// 班组下拉
-      showSetting: false,// 设置模式。自动排班，确认，取消按钮显示
-      settingBtnDis: false,
-      jumpDisabled: true,// 操作按钮控制
-      chooseObj: {}, //当前选中的数据，查询按钮用
-      chooseTip: '',// 当前选中数据的唯一值，显示红框
-      autoScheduling: false // 只有在当前日期后的月份才生效
-    };
-  },
-  components:{ TopTab },
-  created() {
-    this.roomNameDict = this.getDictDatas('workshop')[0].value
-    this.startDay = new Date()
-    // 设置按钮是否置灰
-    this.settingBtn()
-    this.getTeamList()
-    this.toggleMonth()
-    this.getList()
-  },
-  methods: {
-    // 切换车间
-    toggleName(val) {
-      this.roomNameDict = val
-      // 如果当前在设置，则取消设置
-      if (this.showSetting) {
-        this.showSetting = !this.showSetting
-      }
-      // 如果红框选中，清除红框选中
-      if (!this.jumpDisabled) {
-        this.clearChoose()
-      }
-      // 获取班组列表
-      this.getTeamList()
-      // 重新获取日历数据
-      this.getList()
-    },
-    // 切换月份
-    selectMonth() {
-      if (this.startDay) {
-        this.settingBtn() // 设置按钮状态,需在getlist前面
-        this.toggleMonth()
-        this.getList()
-        this.clearChoose()
-        if ( moment(this.startDay).valueOf() > moment().endOf('month').valueOf()) {
-          this.autoScheduling = true
-        } else {
-          this.autoScheduling = false
-        }
-      }
-    },
-    // 获取班组列表
-    getTeamList() {
-      console.log(this.roomNameDict)
-      listEnabledByRoom({
-        room: this.roomNameDict
-      }).then(res => {
-        this.teamList = res.data || []
-      })
-    },
-    // 获取日历数据
-    getList() {
-      let year = moment(this.startDay).format('YYYY')
-      let month = moment(this.startDay).format('M')
-      getPreset({
-        year: year,
-        month: month,
-        roomNameDict: this.roomNameDict
-      }).then(res => {
-        let obj = res.data || {}
-        if (obj) {
-          for (let item in obj) {
-            for (let i = 0; i < obj[item].length; i++) {
-              if (!obj[item][i].teamId) {
-                obj[item][i].teamId = ''
-              }
-            }
-          }
-        }
-        this.list = obj
-        this.settingBtnDis = false
-      }).catch(() => {
-        this.list = {}
-        this.settingBtnDis = true // 禁用设置按钮
-      })
-    },
-    // 设置
-    settingMsg() {
-      this.showSetting = !this.showSetting
-      this.clearChoose()
-    },
-    // 取消
-    cancelSetting() {
-      this.showSetting = !this.showSetting
-      this.getList() // 数据还原
-    },
-    // 确认
-    confirmSetting() {
-      let num = 0
-      // 当月数据的话，今天及今天之前的不传
-      if (moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')) {
-        num = Number(moment().format('DD'))
-      } else {
-        num = 0
-      }
-      // 下月数据全部都传
-      // 打平数据
-      let tempArr = Object.values(this.list)
-      let arr = []
-      for (let i = num; i < tempArr.length; i++) {
-        for (let j = 0; j < tempArr[i].length; j++) {
-          arr.push(tempArr[i][j])
-        }
-      }
-      createOrUpdateList(arr).then(res => {
-        if (res.code === 0) {
-          this.showSetting = !this.showSetting
-          this.$modal.msgSuccess("操作成功")
-          this.getList() // 数据更新
-        }
-      })
-    },
-    // 点击班次红框选中当前数据
-    chooseTeam(value) {
-      if (this.showSetting) {
-        this.$modal.msgWarning("当前处于设置模式")
-        return false
-      }
-      this.chooseObj = value
-      this.chooseTip = value.startDay + value.classesId // 匹配当前的样式
-      this.jumpDisabled = false //查询按钮不禁用
-    },
-    // 自动排班
-    schedulingBtn() {
-      let tempData = this.list
-      // 次月1号有值前端排班
-      if (this.list[1][0].teamId) {
-        let tempArr = Object.values(this.list)
-        let arr = []
-        let n = 0
-        for (let i = 0; i < tempArr.length; i++) {
-          if (n > 0) {
-            break;
-          }
-          for (let j = 0; j < tempArr[i].length; j++) {
-            if (tempArr[i][j].teamId) {
-              arr.push(tempArr[i][j].teamId)
-            } else {
-              n++
-            }
-          }
-        }
-        let tempNum = 0
-        for (let k = 0; k < tempArr.length; k++) {
-          for (let v = 0; v < tempArr[k].length; v++) {
-            let t = tempNum % arr.length
-            if (arr.length === 1) {
-              tempData[k+1][v].teamId = arr[0]
-            } else {
-              tempData[k+1][v].teamId = arr[t]
-            }
-            tempNum++
-          }
-        }
-        this.list = []
-        this.list = tempData
-      } else {
-        // 次月1号没有值,接口排班
-        // console.log(moment(this.startDay).format("YYYY-MM-DD"))
-        autoSet({
-          year: this.year,
-          month: moment(this.startDay).month() + 1,
-          roomNameDict: this.roomNameDict
-        }).then(res => {
-          this.list = res.data || {}
-        })
-      }
-    },
-    // 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
-    settingBtn() {
-      let nowMonth = moment().startOf('month').valueOf()
-      let startMonth = moment(this.startDay).valueOf()
-      let nowDate = moment(new Date()).date()
-      let sumDate = moment().daysInMonth()
-      if (nowMonth > startMonth) { // 之前月
-        this.settingBtnDis = true
-      } else {
-        if (nowDate < sumDate) {
-          this.settingBtnDis = false
-        } else {
-          this.settingBtnDis = true
-        }
-      }
-    },
-    // 清除红框选中数据
-    clearChoose() {
-      this.chooseObj = {}
-      this.chooseTip = ""
-      this.jumpDisabled = true
-    },
-    // 切换月份显示
-    toggleMonth() {
-      this.year = moment(this.startDay).format("YYYY")
-      let month = Number(moment(this.startDay).format("MM"))
-      this.month = this.monthList[month - 1]
-    },
-    // 3个跳转按钮
-    toOtherPage(val) {
-      switch (val) {
-        case '1':
-          this.$router.push({
-            path: '/core/enhance/product-line-24h?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
-          })
-          break;
-        case '2': // 能源
-          this.$router.push({
-            path: '/energy/base/energy-quantity-realtime?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime
-          })
-          break;
-        default:
-          this.$router.push({
-            path: '/quality/base/quality-inspection-data/detection-information/statistical-data?startTime='+this.chooseObj.startTime+'&endTime='+this.chooseObj.endTime,
-            // name: 'QualityStatistics',
-            // params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
-          })
-      }
-    }
-    }
-  }
+	name: 'GroupTeamScheduling',
+	data() {
+		return {
+			roomNameDict: null,
+			startDay: '', // 查询参数
+			year: '', // 2023
+			month: '', // 九月
+			monthList: [
+				'一月',
+				'二月',
+				'三月',
+				'四月',
+				'五月',
+				'六月',
+				'七月',
+				'八月',
+				'九月',
+				'十月',
+				'十一月',
+				'十二月',
+			],
+			list: {},
+			teamList: [], // 班组下拉
+			showSetting: false, // 设置模式。自动排班，确认，取消按钮显示
+			settingBtnDis: false,
+			jumpDisabled: true, // 操作按钮控制
+			chooseObj: {}, //当前选中的数据，查询按钮用
+			chooseTip: '', // 当前选中数据的唯一值，显示红框
+			autoScheduling: false, // 只有在当前日期后的月份才生效
+		};
+	},
+	components: { TopTab },
+	created() {
+		this.roomNameDict = this.getDictDatas('workshop')[0].value;
+		this.startDay = new Date();
+		// 设置按钮是否置灰
+		this.settingBtn();
+		this.getTeamList();
+		this.toggleMonth();
+		this.getList();
+	},
+	methods: {
+		// 切换车间
+		toggleName(val) {
+			this.roomNameDict = val;
+			// 如果当前在设置，则取消设置
+			if (this.showSetting) {
+				this.showSetting = !this.showSetting;
+			}
+			// 如果红框选中，清除红框选中
+			if (!this.jumpDisabled) {
+				this.clearChoose();
+			}
+			// 获取班组列表
+			this.getTeamList();
+			// 重新获取日历数据
+			this.getList();
+		},
+		// 切换月份
+		selectMonth() {
+			if (this.startDay) {
+				this.settingBtn(); // 设置按钮状态,需在getlist前面
+				this.toggleMonth();
+				this.getList();
+				this.clearChoose();
+				if (
+					moment(this.startDay).valueOf() > moment().endOf('month').valueOf()
+				) {
+					this.autoScheduling = true;
+				} else {
+					this.autoScheduling = false;
+				}
+			}
+		},
+		// 获取班组列表
+		getTeamList() {
+			console.log(this.roomNameDict);
+			listEnabledByRoom({
+				room: this.roomNameDict,
+			}).then((res) => {
+				this.teamList = res.data || [];
+			});
+		},
+		// 获取日历数据
+		getList() {
+			let year = moment(this.startDay).format('YYYY');
+			let month = moment(this.startDay).format('M');
+			getPreset({
+				year: year,
+				month: month,
+				roomNameDict: this.roomNameDict,
+			})
+				.then((res) => {
+					let obj = res.data || {};
+					if (obj) {
+						for (let item in obj) {
+							for (let i = 0; i < obj[item].length; i++) {
+								if (!obj[item][i].teamId) {
+									obj[item][i].teamId = '';
+								}
+							}
+						}
+					}
+					this.list = obj;
+					this.settingBtnDis = false;
+				})
+				.catch(() => {
+					this.list = {};
+					this.settingBtnDis = true; // 禁用设置按钮
+				});
+		},
+		// 设置
+		settingMsg() {
+			this.showSetting = !this.showSetting;
+			this.clearChoose();
+		},
+		// 取消
+		cancelSetting() {
+			this.showSetting = !this.showSetting;
+			this.getList(); // 数据还原
+		},
+		// 确认
+		confirmSetting() {
+			let num = 0;
+			// 当月数据的话，今天及今天之前的不传
+			if (
+				moment(this.startDay).format('YYYY-MM') === moment().format('YYYY-MM')
+			) {
+				num = Number(moment().format('DD'));
+			} else {
+				num = 0;
+			}
+			// 下月数据全部都传
+			// 打平数据
+			let tempArr = Object.values(this.list);
+			let arr = [];
+			for (let i = num; i < tempArr.length; i++) {
+				for (let j = 0; j < tempArr[i].length; j++) {
+					arr.push(tempArr[i][j]);
+				}
+			}
+			createOrUpdateList(arr).then((res) => {
+				if (res.code === 0) {
+					this.showSetting = !this.showSetting;
+					this.$modal.msgSuccess('操作成功');
+					this.getList(); // 数据更新
+				}
+			});
+		},
+		// 点击班次红框选中当前数据
+		chooseTeam(value) {
+			if (this.showSetting) {
+				this.$modal.msgWarning('当前处于设置模式');
+				return false;
+			}
+			this.chooseObj = value;
+			this.chooseTip = value.startDay + value.classesId; // 匹配当前的样式
+			this.jumpDisabled = false; //查询按钮不禁用
+		},
+		// 自动排班
+		schedulingBtn() {
+			let tempData = this.list;
+			// 次月1号有值前端排班
+			if (this.list[1][0].teamId) {
+				let tempArr = Object.values(this.list);
+				let arr = [];
+				let n = 0;
+				for (let i = 0; i < tempArr.length; i++) {
+					if (n > 0) {
+						break;
+					}
+					for (let j = 0; j < tempArr[i].length; j++) {
+						if (tempArr[i][j].teamId) {
+							arr.push(tempArr[i][j].teamId);
+						} else {
+							n++;
+						}
+					}
+				}
+				let tempNum = 0;
+				for (let k = 0; k < tempArr.length; k++) {
+					for (let v = 0; v < tempArr[k].length; v++) {
+						let t = tempNum % arr.length;
+						if (arr.length === 1) {
+							tempData[k + 1][v].teamId = arr[0];
+						} else {
+							tempData[k + 1][v].teamId = arr[t];
+						}
+						tempNum++;
+					}
+				}
+				this.list = [];
+				this.list = tempData;
+			} else {
+				// 次月1号没有值,接口排班
+				// console.log(moment(this.startDay).format("YYYY-MM-DD"))
+				autoSet({
+					year: this.year,
+					month: moment(this.startDay).month() + 1,
+					roomNameDict: this.roomNameDict,
+				}).then((res) => {
+					this.list = res.data || {};
+				});
+			}
+		},
+		// 设置按钮如果是上个月或者今天是本月最后一天，设置按钮置灰
+		settingBtn() {
+			let nowMonth = moment().startOf('month').valueOf();
+			let startMonth = moment(this.startDay).valueOf();
+			let nowDate = moment(new Date()).date();
+			let sumDate = moment().daysInMonth();
+			if (nowMonth > startMonth) {
+				// 之前月
+				this.settingBtnDis = true;
+			} else {
+				if (nowDate < sumDate) {
+					this.settingBtnDis = false;
+				} else {
+					this.settingBtnDis = true;
+				}
+			}
+		},
+		// 清除红框选中数据
+		clearChoose() {
+			this.chooseObj = {};
+			this.chooseTip = '';
+			this.jumpDisabled = true;
+		},
+		// 切换月份显示
+		toggleMonth() {
+			this.year = moment(this.startDay).format('YYYY');
+			let month = Number(moment(this.startDay).format('MM'));
+			this.month = this.monthList[month - 1];
+		},
+		// 3个跳转按钮
+		toOtherPage(val) {
+			switch (val) {
+				case '1':
+					this.$router.push({
+						path:
+							'/core/enhance/product-line-24h?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
+					});
+					break;
+				case '2': // 能源
+					this.$router.push({
+						path:
+							'/energy/base/energy-quantity-realtime?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
+					});
+					break;
+				default:
+					this.$router.push({
+						path:
+							'/quality/base/quality-inspection-data/detection-information/statistical-data?startTime=' +
+							this.chooseObj.startTime +
+							'&endTime=' +
+							this.chooseObj.endTime,
+						// name: 'QualityStatistics',
+						// params: { startTime: this.chooseObj.startTime, endTime: this.chooseObj.endTime }
+					});
+			}
+		},
+	},
+};
 </script>
 <style lang='scss'>
 .demo-form-inline {
-  .el-date-editor .el-range__icon {
-    font-size: 16px;
-    color: #0B58FF;
-  }
-  .el-input__prefix .el-icon-date {
-    font-size: 16px;
-    color: #0B58FF;
-  }
+	.el-date-editor .el-range__icon {
+		font-size: 16px;
+		color: #0b58ff;
+	}
+	.el-input__prefix .el-icon-date {
+		font-size: 16px;
+		color: #0b58ff;
+	}
 }
 .groupTeamScheduling {
-  background-color: #F2F4F9;
-  .operationArea {
-    padding: 14px 10px 0 16px;
-    margin-bottom: 8px;
-    background-color: #fff;
-    border-radius: 8px;
-    .blue-block {
-      display: inline-block;
-      width: 4px;
-      height: 16px;
-      background-color: #0B58FF;
-      border-radius: 1px;
-      margin-right: 8px;
-      margin-top: 10px;
-    }
-    .separateStyle {
-      display: inline-block;
-      width: 1px;
-      height: 24px;
-      background: #E8E8E8;
-      vertical-align: middle;
-    }
-    .el-form-item {
-      margin-bottom: 10px;
-    }
-    .rightItem {
-      float: right;
-    }
-  }
-  // 日历
-  .calenderArea {
-    padding: 14px 10px 0 20px;
-    background-color: #fff;
-    border-radius: 8px;
-    height: calc(100vh - 255px);
-    overflow-y: auto;
-    .el-calendar__body {
-      padding: 10px 16px 16px 0;
-    }
-    .el-calendar__header {
-      display: none;
-    }
-    .el-calendar-table > thead {
-      height: 48px;
-      font-size: 20px;
-      font-weight: 500;
-      color: #000000;
-      background-color: rgba(242, 244, 249, 1);
-    }
-    .el-calendar-table__row {
-      height: 133px;
-      .prev, .next {
-        pointer-events: none;
-      }
-      .el-calendar-day {
-        padding: 0 10px;
-        height: 100%;
-        .dateStyle {
-          font-size: 20px;
-          font-weight: 500;
-          color: #000000;
-          text-align: right;
-          height: 32px;
-          line-height: 28px;
-          padding-right: 10px;
-        }
-      }
-    }
-    .team-active {// 选中班组
-      border:2px solid red
-    }
-    .class1, .class2, .class3 {
-      padding: 0;
-      font-weight: 600;
-      margin-bottom: 2px;
-      .selectDiv {
-        position: relative;
-        .toggle-icon {
-          position: absolute;
-          width: 26px;
-          height: 26px;
-          line-height: 26px;
-          font-size: 14px;
-          z-index: 1;
-          text-align: center;
-        }
-        .toggle-icon-hide {
-          position: absolute;
-          width: 2px;
-          height: 28px;
-          z-index: 1;
-        }
-        .el-input__suffix {
-          display: none;
-        }
-        .el-input--suffix .el-input__inner {
-          padding: 0 4px 0 28px;
-        }
-        .el-input--small .el-input__inner {
-          height: 28px;
-          border: none;
-          font-weight: 600;
-        }
-      }
-      .labelClass {
-        width: 100%;
-        height: 28px;
-        border: none;
-        padding: 0;
-        font-weight: 600;
-        text-align: center;
-      }
-    }
-    .class1 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #FACE00;
-        }
-        .el-input--small .el-input__inner {
-          color: #E7A200;
-          background-color: #FFEFC0;
-        }
-      }
-      .labelClass {
-        color: #E7A200;
-        background-color: #FFEFC0;
-      }
-    }
-    .class2 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #3984FF;
-        }
-        .el-input--small .el-input__inner {
-          color: #2D7BFF;
-          background-color: #BEEAFF;
-        }
-      }
-      .labelClass {
-        color: #2D7BFF;
-        background-color: #BEEAFF;
-      }
-    }
-    .class3 {
-      .selectDiv {
-        .toggle-icon, .toggle-icon-hide {
-          background-color: #37D97F;
-        }
-        .el-input--small .el-input__inner {
-          color: #129F51;
-          background-color: #E0FFEE;
-        }
-      }
-      .labelClass {
-        color: #129F51;
-        background-color: #E0FFEE;
-      }
-    }
-  }
+	background-color: #f2f4f9;
+	.operationArea {
+		padding: 14px 10px 0 16px;
+		margin-bottom: 8px;
+		background-color: #fff;
+		border-radius: 8px;
+		.blue-block {
+			display: inline-block;
+			width: 4px;
+			height: 16px;
+			background-color: #0b58ff;
+			border-radius: 1px;
+			margin-right: 8px;
+			margin-top: 10px;
+		}
+		.separateStyle {
+			display: inline-block;
+			width: 1px;
+			height: 24px;
+			background: #e8e8e8;
+			vertical-align: middle;
+		}
+		.el-form-item {
+			margin-bottom: 10px;
+		}
+		.rightItem {
+			float: right;
+		}
+	}
+	// 日历
+	.calenderArea {
+		padding: 14px 10px 0 20px;
+		background-color: #fff;
+		border-radius: 8px;
+		height: calc(100vh - 255px);
+		overflow-y: auto;
+		.el-calendar__body {
+			padding: 10px 16px 16px 0;
+		}
+		.el-calendar__header {
+			display: none;
+		}
+		.el-calendar-table > thead {
+			height: 48px;
+			font-size: 20px;
+			font-weight: 500;
+			color: #000000;
+			background-color: rgba(242, 244, 249, 1);
+		}
+		.el-calendar-table__row {
+			height: 133px;
+			.prev,
+			.next {
+				pointer-events: none;
+			}
+			.el-calendar-day {
+				padding: 0 10px;
+				height: 100%;
+				.dateStyle {
+					font-size: 20px;
+					font-weight: 500;
+					color: #000000;
+					text-align: right;
+					height: 32px;
+					line-height: 28px;
+					padding-right: 10px;
+				}
+			}
+		}
+		.team-active {
+			// 选中班组
+			border: 2px solid red;
+		}
+		.class1,
+		.class2,
+		.class3 {
+			padding: 0;
+			font-weight: 600;
+			margin-bottom: 2px;
+			.selectDiv {
+				position: relative;
+				.toggle-icon {
+					position: absolute;
+					width: 26px;
+					height: 26px;
+					line-height: 26px;
+					font-size: 14px;
+					z-index: 1;
+					text-align: center;
+				}
+				.toggle-icon-hide {
+					position: absolute;
+					width: 2px;
+					height: 28px;
+					z-index: 1;
+				}
+				.el-input__suffix {
+					display: none;
+				}
+				.el-input--suffix .el-input__inner {
+					padding: 0 4px 0 28px;
+				}
+				.el-input--small .el-input__inner {
+					height: 28px;
+					border: none;
+					font-weight: 600;
+				}
+			}
+			.labelClass {
+				width: 100%;
+				height: 28px;
+				border: none;
+				padding: 0;
+				font-weight: 600;
+				text-align: center;
+			}
+		}
+		.class1 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #face00;
+				}
+				.el-input--small .el-input__inner {
+					color: #e7a200;
+					background-color: #ffefc0;
+				}
+			}
+			.labelClass {
+				color: #e7a200;
+				background-color: #ffefc0;
+			}
+		}
+		.class2 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #3984ff;
+				}
+				.el-input--small .el-input__inner {
+					color: #2d7bff;
+					background-color: #beeaff;
+				}
+			}
+			.labelClass {
+				color: #2d7bff;
+				background-color: #beeaff;
+			}
+		}
+		.class3 {
+			.selectDiv {
+				.toggle-icon,
+				.toggle-icon-hide {
+					background-color: #37d97f;
+				}
+				.el-input--small .el-input__inner {
+					color: #129f51;
+					background-color: #e0ffee;
+				}
+			}
+			.labelClass {
+				color: #129f51;
+				background-color: #e0ffee;
+			}
+		}
+	}
 }
 </style>
diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue
index e248bad2..902211d5 100644
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/src/views/group/monitoring/groupTeamView/index.vue
@@ -88,7 +88,7 @@ export default {
 			workOrderList: [],
 			workOrderName: '',
 			tableBtn: [
-				this.$auth.hasPermi('base:group-team-view:detail')
+				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 					? {
 							type: 'detail',
 							btnName: '详情',
diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue
index 48f00b81..921853e0 100644
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -97,7 +97,7 @@ export default {
 			},
 			tableProps,
 			tableBtn: [
-				this.$auth.hasPermi('base:team-production:detail')
+				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 					? {
 							type: 'productionDetail',
 							btnName: '查看',
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index 00c41b07..d4fad27a 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -173,12 +173,24 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-group:create')
+					type: this.$auth.hasPermiAnd([
+						'base:order-group:create',
+						'base:core-product:query',
+						'base:core-customer:query',
+						'base:order:query',
+					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+						'base:order-group:create',
+						'base:core-product:query',
+						'base:core-customer:query',
+						'base:order:query',
+					])
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -197,7 +209,10 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:order-group:bind')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'base:order-con-group-order:create',
+				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -214,7 +229,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:complete')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -231,7 +246,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:termination')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -248,7 +263,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-group:cancel')
+				this.$auth.hasPermi('base:order-group:update')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -265,11 +280,17 @@ export default {
 							},
 					  }
 					: undefined,
-				{
-					type: 'detail',
-					btnName: '详情',
-				},
-				this.$auth.hasPermi('base:order-group:edit')
+				this.$auth.hasPermi('base:order-group:update')
+					? {
+							type: 'detail',
+							btnName: '详情',
+					  }
+					: undefined,
+				this.$auth.hasPermiAnd([
+					'base:order-group:update',
+					'base:core-product:query',
+					'base:core-customer:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index f2562f6b..227c70b1 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -15,7 +15,7 @@
 			<method-btn
 				v-if="tableBtn.length"
 				slot="handleBtn"
-				:width="290"
+				:width="250"
 				label="操作"
 				:method-list="tableBtn"
 				@clickBtn="handleClick" />
@@ -169,12 +169,22 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-manage:create')
+					type: this.$auth.hasPermiAnd([
+						'base:order:query',
+						'base:core-product:query',
+						'base:order:create',
+					])
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
+					type: this.$auth.hasPermiAnd([
+						'base:order:query',
+						'base:core-product:query',
+						'base:order:create',
+					])
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -210,7 +220,14 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:bindWorkOrder')
+				this.$auth.hasPermiAnd([
+					'base:order:update',
+					'base:core-product:query',
+					'base:production-line:query',
+					'extend:process-flow:query',
+					'base:core-work-order:query',
+					'base:order:query',
+				])
 					? {
 							type: 'bind',
 							btnName: '绑定',
@@ -227,7 +244,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:complete')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'complete',
 							btnName: '完成',
@@ -244,7 +261,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:termination')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'termination',
 							btnName: '终止',
@@ -261,7 +278,7 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:cancel')
+				this.$auth.hasPermi('base:order:update')
 					? {
 							type: 'cancel',
 							btnName: '作废',
@@ -278,13 +295,20 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:detail')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'extend:process-flow:query',
+				])
 					? {
 							type: 'detail',
 							btnName: '详情',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-manage:edit')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'base:core-product:query',
+					'base:order:update',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index 21f092b0..35215ff6 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -181,7 +181,10 @@ export default {
 			list: [],
 			total: 0,
 			tableBtn: [
-				this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
+				this.$auth.hasPermiAnd([
+					'base:order:query',
+					'extend:process-flow:query',
+				])
 					? {
 							type: 'orderDetail',
 							btnName: '详情',
@@ -198,7 +201,11 @@ export default {
 							},
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
+				this.$auth.hasPermiAnd([
+					'base:quality-inspection-record:query',
+					'base:core-product:query',
+					'base:core-work-order:query',
+				])
 					? {
 							type: 'qualityDetail',
 							btnName: '质量',
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
index 63607311..a7d1a370 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionHistory/index.vue
@@ -99,10 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
diff --git a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
index 1cf5b343..e7abdb24 100644
--- a/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/voc/vocDetectionIndication/index.vue
@@ -103,10 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -124,13 +128,16 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:voc:update')
+				this.$auth.hasPermiAnd([
+					'base:environmental-check:update',
+					'base:environmental-check:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:voc:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
index 8f15dd1d..3f6898e4 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionHistory/index.vue
@@ -99,10 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
diff --git a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
index 9fbb59fb..a438a286 100644
--- a/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteGas/wasteGasDetectionIndication/index.vue
@@ -103,10 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'separate'
+						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -124,13 +128,16 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:waste-gas:update')
+				this.$auth.hasPermiAnd([
+					'base:environmental-check:update',
+					'base:environmental-check:query',
+				])
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:waste-gas:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
index 76ac6f92..d4d19596 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionHistory/index.vue
@@ -99,12 +99,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:export')
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check-record:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					color: 'primary',
diff --git a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
index 562671d9..b3ecc484 100644
--- a/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
+++ b/src/views/safetyEnvironmental/environmental/wasteWater/wasteWaterDetectionIndication/index.vue
@@ -103,12 +103,14 @@ export default {
 					color: 'primary',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:create')
+					type: this.$auth.hasPermi('base:environmental-check:create')
 						? 'separate'
 						: '',
 				},
 				{
-					type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
+					type: this.$auth.hasPermi('base:environmental-check:create')
+						? 'button'
+						: '',
 					btnName: '新增',
 					name: 'add',
 					color: 'success',
@@ -126,13 +128,13 @@ export default {
 			tableProps,
 			list: [],
 			tableBtn: [
-				this.$auth.hasPermi('base:waste-water:update')
+				this.$auth.hasPermi('base:environmental-check:update')
 					? {
 							type: 'edit',
 							btnName: '编辑',
 					  }
 					: undefined,
-				this.$auth.hasPermi('base:waste-water:delete')
+				this.$auth.hasPermi('base:environmental-check:delete')
 					? {
 							type: 'delete',
 							btnName: '删除',
-- 
2.45.2