From a41db382297f618b3e7279a6092f718c0a47a602 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 29 Feb 2024 14:07:18 +0800
Subject: [PATCH 1/9] =?UTF-8?q?update=20=E7=BE=A4=E9=87=8C=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/equipment-module.js                 |  4 ++
 .../specialEquipment/check/Content-add.vue    |  4 +-
 .../check/Content-add_detail.vue              | 44 +++++++-------
 .../specialEquipment/check/Content-edit.vue   | 59 +++++++++++++------
 src/views/specialEquipment/check/Content.vue  | 12 ++--
 src/views/specialEquipment/check/add.vue      | 15 ++++-
 .../maintain/Monitor--detail.vue              |  1 -
 .../maintain/PlanConfig--addContent.vue       |  1 -
 .../specialEquipment/maintain/PlanConfig.vue  |  1 -
 9 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 src/utils/equipment-module.js

diff --git a/src/utils/equipment-module.js b/src/utils/equipment-module.js
new file mode 100644
index 00000000..42de6eb7
--- /dev/null
+++ b/src/utils/equipment-module.js
@@ -0,0 +1,4 @@
+import { getDictData } from './dict';
+
+export const groupConnectWorkshop = (groupName, workshopValue) =>
+	`${groupName} - ${getDictData('workshop', workshopValue)?.label}`;
diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index 21f1f702..9aa70588 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -60,6 +60,8 @@
 </template>
 
 <script>
+import { groupConnectWorkshop } from '@/utils/equipment-module';
+
 export default {
 	name: 'ContentAdd',
 	data() {
@@ -114,7 +116,7 @@ export default {
 				}
 				if (grp.code == 0) {
 					this.groupOptions = grp.data.map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 				}
diff --git a/src/views/specialEquipment/check/Content-add_detail.vue b/src/views/specialEquipment/check/Content-add_detail.vue
index cfd9796d..4d5865e8 100644
--- a/src/views/specialEquipment/check/Content-add_detail.vue
+++ b/src/views/specialEquipment/check/Content-add_detail.vue
@@ -268,8 +268,8 @@ export default {
 			}
 		},
 
-		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+		getConfirmed(message = '是否直接确认巡检记录') {
+			return this.$confirm(message, '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -281,25 +281,31 @@ export default {
 				return this.$message.error('请添加巡检内容');
 			}
 
-			let confirmed = false;
+			/** 询问 是否保存记录 */
 			try {
-				confirmed = await this.getConfirmed();
-			} catch (err) {
-				confirmed = false;
-			}
+				if (await this.getConfirmed('是否保存记录')) {
+					/** 询问 是否直接确认 */
+					try {
+						if (await this.getConfirmed('是否直接确认巡检记录')) {
+							const res = await this.$axios({
+								url:
+									'/base/equipment-check-order/confirm?confirmPerson=' +
+									this.$store.getters.nickname,
+								method: 'put',
+								data: [this.row.id],
+							});
+							if (res.code == 0) {
+								this.$message.success('已确认');
+							}
+						}
 
-			if (confirmed) {
-				const res = await this.$axios({
-					url:
-						'/base/equipment-check-order/confirm?confirmPerson=' +
-						this.$store.getters.nickname,
-					method: 'put',
-					data: [this.row.id],
-				});
-				if (res.code == 0) {
-					this.$message.success('已确认');
+						this.$emit('refreshDataList');
+						this.handleCancel();
+					} catch (err) {
+						this.handleCancel();
+					}
 				}
-			}
+			} catch (err) {}
 
 			// this.btnLoading = true;
 			// this.$nextTick(async () => {
@@ -319,8 +325,6 @@ export default {
 			// 	this.$emit('refreshDataList');
 			// 	this.handleCancel();
 			// });
-			this.$emit('refreshDataList');
-			this.handleCancel();
 		},
 
 		handleEmitFun(val) {
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index cdb36fa0..d58e23fd 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -29,7 +29,16 @@
 						v-loading="formLoading">
 						<el-row :gutter="20">
 							<el-col :span="8">
-								<el-form-item label="巡检单名称" prop="name">
+								<el-form-item
+									label="巡检单名称"
+									prop="name"
+									:rules="[
+										{
+											required: true,
+											message: '巡检单名称不能为空',
+											trigger: 'blur',
+										},
+									]">
 									<el-input
 										v-model="form.name"
 										:disabled="disableEdit"
@@ -196,6 +205,7 @@
 
 <script>
 import DialogForm from '../../../components/DialogForm/index.vue';
+import { groupConnectWorkshop } from '@/utils/equipment-module';
 
 const SmallTitle = {
 	name: 'SmallTitle',
@@ -414,21 +424,28 @@ export default {
 		async handleConfirm() {
 			this.btnLoading = true;
 			this.$nextTick(async () => {
-				const { code, data } = await this.$axios({
-					url: '/base/equipment-check-order/update',
-					method: 'put',
-					data: {
-						...this.form,
-						groupClass: this.form.groupClass.join(','),
-						checkPerson: this.form.checkPerson.join(','),
-					},
-				});
-				if (code == 0) {
-					this.$modal.msgSuccess('更新成功');
+				try {
+					const valid = await this.$refs['form'].validate();
+					if (!valid) return;
+					const { code, data } = await this.$axios({
+						url: '/base/equipment-check-order/update',
+						method: 'put',
+						data: {
+							...this.form,
+							groupClass: this.form.groupClass?.join(','),
+							checkPerson: this.form.checkPerson?.join(','),
+						},
+					});
+					if (code == 0) {
+						this.$modal.msgSuccess('更新成功');
+					}
+					this.btnLoading = false;
+					this.$emit('refreshDataList');
+					this.handleCancel();
+				} catch (err) {
+					console.log('..................................err', err);
+					this.btnLoading = false;
 				}
-				this.btnLoading = false;
-				this.$emit('refreshDataList');
-				this.handleCancel();
 			});
 		},
 
@@ -451,8 +468,14 @@ export default {
 			);
 			if (res.code == 0) {
 				this.form = res.data;
-				this.form.groupClass = res.data.groupClass.split(',');
-				this.form.checkPerson = res.data.checkPerson?.split(',');
+				this.form.groupClass =
+					res.data.groupClass &&
+					res.data.groupClass.trim() != '' &&
+					res.data.groupClass.split(',');
+				this.form.checkPerson =
+					res.data.checkPerson &&
+					res.data.checkPerson.trim() != '' &&
+					res.data.checkPerson.split(',');
 				this.formLoading = false;
 			}
 			this.formLoading = false;
@@ -516,7 +539,7 @@ export default {
 				case 'groupClass':
 					res = await this.$axios(urls[1]);
 					this.groupOptions = (res.data || []).map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 					break;
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index df82ec23..8bfae10e 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -349,16 +349,16 @@ export default {
 		/** 导出按钮操作 */
 		handleExport() {
 			this.$modal
-				.confirm('是否确认导出所有巡检设置?')
+				.confirm('是否确认导出所有巡检单?')
 				.then(() => {
 					this.exportLoading = true;
 					return this.$axios({
 						url: '/base/equipment-check-order/export-excel',
-						// params: {
-						// 	name: this.queryParams.name,
-						// 	status: 1,
-						// 	special: true,
-						// },
+						params: {
+							name: this.queryParams.name,
+							status: 1,
+							special: true,
+						},
 						responseType: 'blob',
 					});
 				})
diff --git a/src/views/specialEquipment/check/add.vue b/src/views/specialEquipment/check/add.vue
index 3c41bf49..f66f14d5 100644
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@@ -89,6 +89,8 @@
 </template>
 
 <script>
+import { groupConnectWorkshop } from '@/utils/equipment-module';
+
 export default {
 	data() {
 		return {
@@ -107,6 +109,12 @@ export default {
 			dataRule: {
 				confirmTimeLimit: [
 					{ required: true, message: '确认时限不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
 				],
 				code: [
 					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' },
@@ -160,7 +168,7 @@ export default {
 				}
 				if (grp.code == 0) {
 					this.groupOptions = grp.data.map((item) => ({
-						label: item.name,
+						label: groupConnectWorkshop(item.name, item.roomNameDict),
 						value: item.id,
 					}));
 				}
@@ -186,7 +194,10 @@ export default {
 				Object.keys(this.dataForm).forEach((key) => {
 					this.dataForm[key] = res.data[key];
 					if (key == 'groupClass') {
-						this.dataForm.groupClass = res.data.groupClass.split(',')
+						this.dataForm.groupClass =
+							res.data.groupClass &&
+							res.data.groupClass.trim() != '' &&
+							res.data.groupClass.split(',');
 					}
 				});
 			}
diff --git a/src/views/specialEquipment/maintain/Monitor--detail.vue b/src/views/specialEquipment/maintain/Monitor--detail.vue
index e39a632d..b4a0c90f 100644
--- a/src/views/specialEquipment/maintain/Monitor--detail.vue
+++ b/src/views/specialEquipment/maintain/Monitor--detail.vue
@@ -27,7 +27,6 @@
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
 				<section>
-					<SmallTitle>保养信息</SmallTitle>
 					<div class="form-part" style="margin-bottom: 32px">
 						<el-skeleton v-if="!showForm" animated />
 						<el-form
diff --git a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
index 5c8c9989..1edc7265 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
@@ -27,7 +27,6 @@
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
 				<section>
-					<SmallTitle>保养信息</SmallTitle>
 					<div class="form-part" style="margin-bottom: 32px">
 						<el-skeleton v-if="!showForm" animated />
 						<el-form
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index e2daefa0..8f284a10 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -63,7 +63,6 @@
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { deleteEqMaintainPlan } from '@/api/equipment/base/maintain/record';
-import { publicFormatter } from '@/utils/dict';
 import PlanConfigAdd from './PlanConfig--add.vue';
 import PlanConfigAddContent from './PlanConfig--addContent.vue';
 

From 838c8d66ade5513539473d3c92e8bafc401dd998 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 29 Feb 2024 15:54:49 +0800
Subject: [PATCH 2/9] 1

---
 src/store/modules/user.js                     |  5 +-
 .../check/CheckOrderListTable.vue             | 14 +---
 .../specialEquipment/check/Content-add.vue    |  4 +-
 .../specialEquipment/check/Content-edit.vue   | 64 ++++++++++---------
 src/views/specialEquipment/check/Content.vue  | 10 ++-
 .../specialEquipment/check/Record-detail.vue  |  8 +--
 .../specialEquipment/maintain/Repair--add.vue |  2 +-
 7 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2e4ce999..f425c469 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -87,6 +87,7 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
+        console.log('GetInfo')
         getInfo().then(res => {
           // 没有 data 数据，赋予个默认值
           if (!res) {
@@ -96,7 +97,7 @@ const user = {
                 user: {
                   id: '',
                   avatar: '',
-                  userName: '',
+                  username: '',
                   nickname: ''
                 }
               }
@@ -113,7 +114,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.id)
-          commit('SET_NAME', user.userName)
+          // commit('SET_NAME', user.username) //无效调用，接口未提供username值
           commit('SET_NICKNAME', user.nickname)
           commit('SET_AVATAR', avatar)
           resolve(res)
diff --git a/src/views/specialEquipment/check/CheckOrderListTable.vue b/src/views/specialEquipment/check/CheckOrderListTable.vue
index 042771ef..cea20347 100644
--- a/src/views/specialEquipment/check/CheckOrderListTable.vue
+++ b/src/views/specialEquipment/check/CheckOrderListTable.vue
@@ -51,10 +51,7 @@
 				{{ scope.row.planCheckTime | timeFilter }}
 			</template>
 		</el-table-column>
-		<el-table-column
-			v-if="selectedBox[3]"
-			label="班次"
-			prop="groupClass">
+		<el-table-column v-if="selectedBox[3]" label="班次" prop="groupClass">
 			<template slot-scope="scope">
 				{{ scope.row.groupClass || '---' }}
 			</template>
@@ -129,7 +126,7 @@ import moment from 'moment';
 export default {
 	name: 'CheckOrderListTable',
 	components: {},
-	props: ['tableData', 'page', 'limit'],
+	props: ['tableData', 'page', 'limit', 'permissionGuard'],
 	filters: {
 		timeFilter: (val) =>
 			val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---',
@@ -170,12 +167,7 @@ export default {
 	},
 	methods: {
 		checkSelectable(row, index) {
-			return true;
-			// return (
-			// 	row.relatePlan == 2 ||
-			// 	(row.relatePlan == 1 &&
-			// 		(!row.confirmDueTime || +row.confirmDueTime >= new Date().getTime()))
-			// );
+			return this.permissionGuard(row);
 		},
 		handleSelectionChange(val) {
 			this.selectedOrder = val;
diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index 9aa70588..fc231bf0 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -175,8 +175,8 @@ export default {
 					special: true,
 					status: 1,
 					// status: confirmed ? 2 : 1,
-					groupClass: this.dataForm.groupClass.join(','),
-					checkPerson: this.$store.getters.userId,
+					groupClass: this.dataForm.groupClass?.join(','),
+					checkPerson: this.$store.getters.nickname,
 				},
 			});
 			if (res.code == 0) {
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index d58e23fd..e12bbb5e 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -240,7 +240,15 @@ export default {
 		return {
 			visible: false,
 			btnLoading: false,
-			form: {},
+			form: {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				checkPerson: null,
+				planCheckTime: null,
+				remark: null,
+			},
 			formLoading: false,
 			departmentList: [],
 			inspectorOptions: [],
@@ -421,6 +429,17 @@ export default {
 					break;
 			}
 		},
+		resetForm() {
+			this.form = {
+				id: null,
+				name: null,
+				departmentId: null,
+				groupClass: null,
+				checkPerson: null,
+				planCheckTime: null,
+				remark: null,
+			};
+		},
 		async handleConfirm() {
 			this.btnLoading = true;
 			this.$nextTick(async () => {
@@ -443,7 +462,6 @@ export default {
 					this.$emit('refreshDataList');
 					this.handleCancel();
 				} catch (err) {
-					console.log('..................................err', err);
 					this.btnLoading = false;
 				}
 			});
@@ -462,20 +480,22 @@ export default {
 		},
 
 		async getInfo(row) {
-			console.log('row', row);
+			this.resetForm();
 			const res = await this.$axios(
 				'/base/equipment-check-order/get?id=' + row.id
 			);
 			if (res.code == 0) {
-				this.form = res.data;
-				this.form.groupClass =
-					res.data.groupClass &&
-					res.data.groupClass.trim() != '' &&
-					res.data.groupClass.split(',');
-				this.form.checkPerson =
-					res.data.checkPerson &&
-					res.data.checkPerson.trim() != '' &&
-					res.data.checkPerson.split(',');
+				Object.keys(this.form).forEach((key) => {
+					if (key == 'groupClass' || key == 'checkPerson') {
+						this.form[key] =
+							(res.data[key] &&
+								res.data[key].trim() != '' &&
+								res.data[key].split(',')) ||
+							[];
+					} else {
+						this.form[key] = res.data[key];
+					}
+				});
 				this.formLoading = false;
 			}
 			this.formLoading = false;
@@ -520,8 +540,8 @@ export default {
 					if (userlist.code == 0) {
 						inspectorList = inspectorList.concat(
 							(userlist.data?.list || []).map((item) => ({
-								label: item.username,
-								value: item.id,
+								label: item.nickname,
+								value: item.nickname,
 							}))
 						);
 					}
@@ -547,22 +567,6 @@ export default {
 			this.formLoading = false;
 		},
 
-		// 保存表单
-		handleSave() {
-			this.$refs.form.validate(async (valid) => {
-				if (valid) {
-					await this.$axios({
-						url: '/urlupdate', //  this.sections[0][isEdit ? 'urlUpdate' : 'urlCreate'],
-						method: 'post', // isEdit ? 'put' : 'post',
-						data: this.form,
-					});
-					this.$modal.msgSuccess(`${isEdit ? '更新' : '创建'}成功`);
-					this.visible = false;
-					this.$emit('refreshDataList');
-				}
-			});
-		},
-
 		handleCancel() {
 			this.visible = false;
 		},
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 8bfae10e..6e97e95d 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -18,6 +18,7 @@
 			:table-data="list"
 			:page="queryParams.pageNo"
 			:limit="queryParams.pageSize"
+			:permissionGuard="checkConfirmPermission"
 			@edit="handleEdit"
 			@detail="handleDetail"
 			@delete="handleDelete"
@@ -177,6 +178,7 @@ export default {
 				pageSize: 10,
 				name: null,
 				status: 1,
+				special: true,
 			},
 			// 表单参数
 			form: {},
@@ -296,6 +298,12 @@ export default {
 			});
 		},
 
+		/** 按钮、选择权限 */
+		checkConfirmPermission(row) {
+			const isAdmin = false; // 后续再修改
+			return !row.confirmDueTime || row.confirmDueTime >= new Date().getTime() || isAdmin;
+		},
+
 		/** 编辑 */
 		handleEdit(row, detail) {
 			this.editOpen = true;
@@ -313,7 +321,7 @@ export default {
 					return this.$axios({
 						url:
 							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
+							this.$store.getters.nickname,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: [id],
diff --git a/src/views/specialEquipment/check/Record-detail.vue b/src/views/specialEquipment/check/Record-detail.vue
index 833cc738..58adc97b 100644
--- a/src/views/specialEquipment/check/Record-detail.vue
+++ b/src/views/specialEquipment/check/Record-detail.vue
@@ -324,8 +324,8 @@ export default {
 					method: 'put',
 					data: {
 						...this.form,
-						groupClass: this.form.groupClass.join(','),
-						checkPerson: this.form.checkPerson.join(','),
+						groupClass: this.form.groupClass?.join(','),
+						checkPerson: this.form.checkPerson?.join(','),
 					},
 				});
 				if (code == 0) {
@@ -401,8 +401,8 @@ export default {
 					if (userlist.code == 0) {
 						inspectorList = inspectorList.concat(
 							(userlist.data?.list || []).map((item) => ({
-								label: item.username,
-								value: item.id,
+								label: item.nickname,
+								value: item.nickname,
 							}))
 						);
 					}
diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue
index 6bbc6ff1..05165a96 100644
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@@ -658,7 +658,7 @@ export default {
 			});
 			list = list.concat(
 				(userList.data?.list || []).map((item) => ({
-					label: item.username,
+					label: item.nickname,
 					value: item.id,
 				}))
 			);

From 5deaa0bc1e744bd1c78180fa3a173267e553187d Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 16:46:25 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/monitoring/groupTeamView/index.vue  |   4 +-
 .../teamProduction/components/searchArea.vue  | 103 ++++++++++++++++++
 .../group/monitoring/teamProduction/index.vue |  16 +--
 src/views/order/base/orderGroup/index.vue     |   7 +-
 4 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 src/views/group/monitoring/teamProduction/components/searchArea.vue

diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue
index 71f95eda..1719b7b7 100644
--- a/src/views/group/monitoring/groupTeamView/index.vue
+++ b/src/views/group/monitoring/groupTeamView/index.vue
@@ -136,11 +136,11 @@ export default {
       params.teamId = val.data.id
       params.teamName = val.data.name
       this.workOrderList.map(item => {
-        if (this.queryParams.workOrderId === item.id) {
+        if (val.data.workOrderId === item.id) {
           this.workOrderName = item.name
         }
       })
-      params.workOrderId = this.queryParams.workOrderId
+      params.workOrderId = val.data.workOrderId
       params.workOrderName = this.workOrderName
       params.roomNameDict = val.data.roomNameDict
       this.$nextTick(() => {
diff --git a/src/views/group/monitoring/teamProduction/components/searchArea.vue b/src/views/group/monitoring/teamProduction/components/searchArea.vue
new file mode 100644
index 00000000..739d19e8
--- /dev/null
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@@ -0,0 +1,103 @@
+<template>
+  <el-form :inline="true" class="demo-form-inline">
+    <span class="blue-block"></span>
+    <el-form-item label="班次信息">
+      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
+        <el-option
+          v-for="item in classesArr"
+          :key="item.id"
+          :label="item.roomNameDictName+'-'+item.name"
+          :value="item.id">
+          <span>{{ item.roomNameDictName }}-{{item.name}}</span>
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="班组信息">
+      <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="上班时间">
+      <el-date-picker
+        v-model="queryParams.tiemStr"
+        type="daterange"
+        format='yyyy-MM-dd'
+        value-format='yyyy-MM-dd'
+        range-separator='-'
+        style="width: 250px;"
+        size="small">
+      </el-date-picker>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" size="small" @click="search">查询</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+export default {
+  name: 'searchArea',
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        classesId: '',
+        teamName: '',
+        tiemStr: ''
+      },
+      classesArr: [],
+    }
+  },
+  mounted() {
+    this.getGroupClass()
+  },
+  methods: {
+    getGroupClass() {
+      groupClassesListAll().then(res => {
+        let arr = res.data || []
+        if (arr.length > 0) {
+          for (let i = 0; i < arr.length; i++) {
+            arr[i].roomNameDictName = this.getDictDataLabel('workshop',arr[i].roomNameDict) || ''
+          }
+        }
+        this.classesArr = arr
+      })
+    },
+    // 查询
+    search() {
+      console.log(this.queryParams)
+      this.$emit('submit', this.queryParams)
+    }
+  }
+}
+</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;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+}
+.demo-form-inline {
+  .blue-block {
+    display: inline-block;
+    width: 4px;
+    height: 16px;
+    background-color: #0B58FF;
+    border-radius: 1px;
+    margin-right: 8px;
+    margin-top: 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/group/monitoring/teamProduction/index.vue b/src/views/group/monitoring/teamProduction/index.vue
index 45cbb569..be06f52d 100644
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="app-container">
     <!-- 搜索工作栏 -->
-    <search-bar
+    <search-area @submit="buttonClick"/>
+    <!-- <search-bar
       :formConfigs="formConfig"
       ref="searchBarForm"
       @headBtnClick="buttonClick"
-    />
+    /> -->
     <!-- 列表 -->
     <base-table
       :page="queryParams.pageNo"
@@ -34,10 +35,11 @@
   </div>
 </template>
 <script>
-import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/teamProduction'
+import { groupTeamSchedulingPage } from '@/api/monitoring/teamProduction'
 import { parseTime } from '@/utils/ruoyi'
 import TeamProductionDetail from './components/teamProductionDetail'
 import { publicFormatter } from '@/utils/dict'
+import SearchArea from './components/searchArea'
 const tableProps = [
   {
     prop: 'roomNameDict',
@@ -139,12 +141,11 @@ export default {
       paramVisible: false
     }
   },
-  components: { TeamProductionDetail },
+  components: { TeamProductionDetail, SearchArea },
   mounted() {
     window.addEventListener('resize', () => {
       this.tableH = this.tableHeight(260)
     })
-    this.getGroupClass()
     this.getList()
   },
   methods: {
@@ -163,11 +164,6 @@ export default {
         this.total = res.data.total || 0
       })
     },
-    getGroupClass() {
-      groupClassesListAll().then(res => {
-        this.formConfig[0].selectOptions = res.data || []
-      })
-    },
     handleClick(val) {
       console.log(val)
       this.paramVisible = true
diff --git a/src/views/order/base/orderGroup/index.vue b/src/views/order/base/orderGroup/index.vue
index 79316f63..d71b9638 100644
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@@ -236,13 +236,8 @@ export default {
               btnName: '终止',
               showTip: '终止',
               showParam: {
-                type: '|',
+                type: '&',
                 data: [
-                  {
-                    type: 'equal',
-                    name: 'status',
-                    value: 2
-                  },
                   {
                     type: 'equal',
                     name: 'status',

From 889f4472e65d35e9ff2f3cefe071a0692c3a75e8 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 29 Feb 2024 16:49:54 +0800
Subject: [PATCH 4/9] bugfix equipmentRepair

---
 .../maintain/CustomDialogForm.vue             |  27 ++--
 .../specialEquipment/maintain/Repair--add.vue | 127 +++++++-----------
 .../specialEquipment/maintain/Repair.vue      |   3 +
 3 files changed, 68 insertions(+), 89 deletions(-)

diff --git a/src/views/specialEquipment/maintain/CustomDialogForm.vue b/src/views/specialEquipment/maintain/CustomDialogForm.vue
index 32f87620..e5b8052f 100644
--- a/src/views/specialEquipment/maintain/CustomDialogForm.vue
+++ b/src/views/specialEquipment/maintain/CustomDialogForm.vue
@@ -23,7 +23,7 @@
 					<el-row :gutter="20">
 						<el-col :span="8">
 							<el-form-item label="故障发生时间" prop="faultTime">
-								<span>{{ parseTime(dataForm.faultTime) }}</span>
+								<span style="color: #000a;">{{ parseTime(dataForm.faultTime) }}</span>
 							</el-form-item>
 						</el-col>
 
@@ -43,7 +43,7 @@
 
 						<el-col :span="8">
 							<el-form-item label="故障级别" prop="faultLevel">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}
 								</span>
 							</el-form-item>
@@ -51,7 +51,7 @@
 
 						<el-col :span="8">
 							<el-form-item label="故障类型" prop="faultType">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('fault-type', dataForm.faultType) }}
 								</span>
 							</el-form-item>
@@ -59,19 +59,19 @@
 
 						<el-col :span="8">
 							<el-form-item label="维修工" prop="repairman">
-								<span>{{ dataForm.repairman }}</span>
+								<span style="color: #000a;">{{ dataForm.repairman }}</span>
 							</el-form-item>
 						</el-col>
 
 						<el-col :span="8">
 							<el-form-item label="联系方式" prop="repairmanPhone">
-								<span>{{ dataForm.repairmanPhone }}</span>
+								<span style="color: #000a;">{{ dataForm.repairmanPhone }}</span>
 							</el-form-item>
 						</el-col>
 
 						<el-col :span="8">
 							<el-form-item label="维修方式" prop="repairMode">
-								<span>
+								<span style="color: #000a;">
 									{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}
 								</span>
 							</el-form-item>
@@ -88,25 +88,25 @@
 										:disabled="disabled"
 										@delete="!disabled && handleDeleteFile(file, col.prop)" />
 								</div>
-								<p v-else>暂无附件</p>
+								<p v-else style="color: #000a;">暂无附件</p>
 							</el-form-item>
 						</el-col>
 
 						<el-col :span="8">
 							<el-form-item label="创建时间" prop="createTime">
-								<span>{{ parseTime(dataForm.createTime) }}</span>
+								<span style="color: #000a;">{{ parseTime(dataForm.createTime) }}</span>
 							</el-form-item>
 						</el-col>
 
 						<el-col :span="8">
 							<el-form-item label="创建人" prop="creator">
-								<span>{{ dataForm.creator }}</span>
+								<span style="color: #000a;">{{ dataForm.creator }}</span>
 							</el-form-item>
 						</el-col>
 
 						<el-col :span="24">
 							<el-form-item label="备注" prop="remark">
-								<span>{{ dataForm.remark }}</span>
+								<span style="color: #000a;">{{ dataForm.remark || '- 无 -' }}</span>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -159,8 +159,7 @@ const uploadedFile = {
 			document.body.removeChild(link);
 		},
 	},
-	mounted() {
-	},
+	mounted() {},
 	render: function (h) {
 		return (
 			<div
@@ -338,6 +337,10 @@ export default {
 	overflow-y: auto;
 }
 
+.drawer-body__content >>> .el-form-item__label {
+	font-weight: 700;
+}
+
 .drawer-body__footer {
 	display: flex;
 	justify-content: flex-end;
diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue
index 05165a96..95caa00a 100644
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@@ -29,7 +29,7 @@
 			</el-col>
 
 			<!-- 产线名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="产线名" prop="lineId">
 					<el-select
 						v-model="formFilters.lineId"
@@ -45,10 +45,10 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 
 			<!-- 工段名  -->
-			<el-col :span="8">
+			<!-- <el-col :span="8">
 				<el-form-item label="工段名" prop="sectionId">
 					<el-select
 						v-model="formFilters.sectionId"
@@ -64,7 +64,7 @@
 							:value="opt.value" />
 					</el-select>
 				</el-form-item>
-			</el-col>
+			</el-col> -->
 
 			<!-- 设备名称  -->
 			<el-col :span="8">
@@ -116,16 +116,7 @@
 
 			<!-- 故障级别  -->
 			<el-col :span="8">
-				<el-form-item
-					label="故障级别"
-					prop="faultLevel"
-					:rules="[
-						{
-							required: true,
-							message: '故障级别不能为空',
-							trigger: 'blur',
-						},
-					]">
+				<el-form-item label="故障级别" prop="faultLevel">
 					<el-select
 						v-model="form.faultLevel"
 						placeholder="故障级别"
@@ -216,12 +207,7 @@
 
 			<!-- 维修工  -->
 			<el-col :span="8">
-				<el-form-item
-					label="维修工"
-					prop="repairman"
-					:rules="[
-						{ required: true, message: '维修工不能为空', trigger: 'blur' },
-					]">
+				<el-form-item label="维修工" prop="repairman">
 					<el-select
 						v-model="form.repairman"
 						@change="$emit('update', form)"
@@ -241,12 +227,7 @@
 
 			<!-- 联系方式  -->
 			<el-col :span="8">
-				<el-form-item
-					label="联系方式"
-					prop="repairmanPhone"
-					:rules="[
-						{ required: true, message: '联系方式不能为空', trigger: 'blur' },
-					]">
+				<el-form-item label="联系方式" prop="repairmanPhone">
 					<el-input
 						v-model="form.repairmanPhone"
 						@change="$emit('update', form)"
@@ -257,16 +238,7 @@
 
 			<!-- 维修方式 - 数据字典  -->
 			<el-col :span="8">
-				<el-form-item
-					label="维修方式"
-					prop="repairMode"
-					:rules="[
-						{
-							required: true,
-							message: '维修方式不能为空',
-							trigger: 'blur',
-						},
-					]">
+				<el-form-item label="维修方式" prop="repairMode">
 					<el-select
 						v-model="form.repairMode"
 						placeholder="维修方式"
@@ -308,7 +280,7 @@
 			</el-col>
 
 			<!-- 备注  -->
-			<el-col :span="24">
+			<el-col :span="8">
 				<el-form-item label="备注" prop="remark">
 					<el-input
 						v-model="form.remark"
@@ -544,16 +516,16 @@ export default {
 		dataForm: {
 			handler(val) {
 				this.form = JSON.parse(JSON.stringify(val));
-				if (this.form.equipmentCategory != null) {
-					setTimeout(() => {
-						this.equipmentOptions = this.equipmentList
-							.filter((item) => item.special)
-							.filter(
-								(item) => item.specialType === this.form.equipmentCategory
-							)
-							.map((item) => ({ label: item.name, value: item.id }));
-					}, 1000);
-				}
+				// if (this.form.equipmentCategory != null) {
+				// 	setTimeout(() => {
+				// 		this.equipmentOptions = this.equipmentList
+				// 			.filter((item) => item.special)
+				// 			.filter(
+				// 				(item) => item.specialType === this.form.equipmentCategory
+				// 			)
+				// 			.map((item) => ({ label: item.name, value: item.id }));
+				// 	}, 1000);
+				// }
 				if (this.hasFiles) {
 					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
 						this.form.files = this.form.files ?? [];
@@ -591,9 +563,9 @@ export default {
 			this.formLoading = true;
 			await this.getCode();
 			await this.initEquipment();
-			await this.initLines();
+			// await this.initLines();
 			await this.initWorker();
-			await this.initSections();
+			// await this.initSections();
 			this.formLoading = false;
 			this.isInit = false;
 			this.setInitWorker();
@@ -602,36 +574,37 @@ export default {
 		/** 设置默认维修工为用户自己 */
 		setInitWorker() {
 			/** 获取用户自身id */
-			const userId = this.$store.getters.userId;
+			const nickname = this.$store.getters.nickname;
 			this.$nextTick(() => {
-				this.form.repairman = [userId];
+				this.form.repairman = [nickname];
 			});
 		},
 
 		/** 获取产线 */
-		async initLines() {
-			const res = await this.$axios('/base/core-production-line/listAll');
-			this.lineOptions = (res.data || []).map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
+		// async initLines() {
+		// 	const res = await this.$axios('/base/core-production-line/listAll');
+		// 	this.lineOptions = (res.data || []).map((item) => ({
+		// 		label: item.name,
+		// 		value: item.id,
+		// 	}));
+		// },
+
+		// /** 获取工段 */
+		// async initSections(byLineId) {
+		// 	this.formLoading = !this.isInit && true;
+		// 	const res = await this.$axios({
+		// 		url:
+		// 			byLineId && !this.isInit
+		// 				? '/base/core-workshop-section/listByParentId?id=' + byLineId
+		// 				: '/base/core-workshop-section/listAll',
+		// 	});
+		// 	this.sectionOptions = (res.data || []).map((item) => ({
+		// 		label: item.name,
+		// 		value: item.id,
+		// 	}));
+		// 	this.formLoading = !this.isInit && false;
+		// },
 
-		/** 获取工段 */
-		async initSections(byLineId) {
-			this.formLoading = !this.isInit && true;
-			const res = await this.$axios({
-				url:
-					byLineId && !this.isInit
-						? '/base/core-workshop-section/listByParentId?id=' + byLineId
-						: '/base/core-workshop-section/listAll',
-			});
-			this.sectionOptions = (res.data || []).map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-			this.formLoading = !this.isInit && false;
-		},
 		/** 获取设备 */
 		async initEquipment(type = 'special-equipment') {
 			const response = await this.$axios('/base/core-equipment/listAll');
@@ -642,8 +615,8 @@ export default {
 					label: item.name,
 					value: item.id,
 				}));
-			this.equipmentOptions = equipmentOptions;
-			this.allSpeicalEquipments = equipmentOptions;
+			this.equipmentOptions = [...equipmentOptions];
+			this.allSpeicalEquipments = [...equipmentOptions];
 		},
 		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
 		async initWorker() {
@@ -659,7 +632,7 @@ export default {
 			list = list.concat(
 				(userList.data?.list || []).map((item) => ({
 					label: item.nickname,
-					value: item.id,
+					value: item.nickname,
 				}))
 			);
 			/** worker */
@@ -669,7 +642,7 @@ export default {
 			list = list.concat(
 				(workerList.data || []).map((item) => ({
 					label: item.name,
-					value: item.id,
+					value: item.name,
 				}))
 			);
 			/** setting */
diff --git a/src/views/specialEquipment/maintain/Repair.vue b/src/views/specialEquipment/maintain/Repair.vue
index 188db221..4a60ecd9 100644
--- a/src/views/specialEquipment/maintain/Repair.vue
+++ b/src/views/specialEquipment/maintain/Repair.vue
@@ -42,6 +42,7 @@
 		<base-dialog
 			:dialogTitle="title"
 			:dialogVisible="open"
+			width="60%"
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="submitForm">
@@ -146,6 +147,7 @@ export default {
 					label: '故障明细',
 					minWidth: 120,
 					showOverflowtooltip: true,
+					subcomponent: htmls,
 				},
 				{
 					prop: 'maintenanceStartTime',
@@ -172,6 +174,7 @@ export default {
 					label: '维修描述',
 					showOverflowtooltip: true,
 					width: 110,
+					subcomponent: htmls,
 				},
 				{
 					prop: 'remark',

From afe28d103e57d3a4e731627d031cc374c1eccce1 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Thu, 29 Feb 2024 16:52:30 +0800
Subject: [PATCH 5/9] 1

---
 .../teamProduction/components/searchArea.vue         | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/views/group/monitoring/teamProduction/components/searchArea.vue b/src/views/group/monitoring/teamProduction/components/searchArea.vue
index 739d19e8..fff8c211 100644
--- a/src/views/group/monitoring/teamProduction/components/searchArea.vue
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@@ -6,9 +6,9 @@
         <el-option
           v-for="item in classesArr"
           :key="item.id"
-          :label="item.roomNameDictName+'-'+item.name"
+          :label="(item.roomName?item.roomName:'')+'-'+item.name"
           :value="item.id">
-          <span>{{ item.roomNameDictName }}-{{item.name}}</span>
+          <span>{{ item.roomName }}-{{item.name}}</span>
         </el-option>
       </el-select>
     </el-form-item>
@@ -52,13 +52,7 @@ export default {
   methods: {
     getGroupClass() {
       groupClassesListAll().then(res => {
-        let arr = res.data || []
-        if (arr.length > 0) {
-          for (let i = 0; i < arr.length; i++) {
-            arr[i].roomNameDictName = this.getDictDataLabel('workshop',arr[i].roomNameDict) || ''
-          }
-        }
-        this.classesArr = arr
+        this.classesArr = res.data || []
       })
     },
     // 查询

From 38668fca09ceca676690f2bdbf20e8589e7bec3e Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Thu, 29 Feb 2024 17:01:35 +0800
Subject: [PATCH 6/9] =?UTF-8?q?bugfix=20=E8=AE=BE=E5=A4=87=E4=BF=9D?=
 =?UTF-8?q?=E5=85=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maintain/PlanConfig--add.vue              | 11 +++------
 .../maintain/PlanConfig--addContent.vue       | 23 +++++++++++++++----
 .../specialEquipment/maintain/PlanConfig.vue  |  9 ++++++--
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/views/specialEquipment/maintain/PlanConfig--add.vue b/src/views/specialEquipment/maintain/PlanConfig--add.vue
index 0d2e016d..126db178 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--add.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue
@@ -44,10 +44,7 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="部门"
-					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
+				<el-form-item label="部门" prop="departmentId">
 					<el-select
 						v-model="form.departmentId"
 						:placeholder="`请选择部门`"
@@ -84,10 +81,7 @@
 			</el-col>
 
 			<el-col :span="12">
-				<el-form-item
-					label="产线"
-					prop="lineId"
-					:rules="[{ required: true, message: '请选择产线', trigger: 'blur' }]">
+				<el-form-item label="产线" prop="lineId">
 					<el-select
 						v-model="form.lineId"
 						:placeholder="`请选择产线`"
@@ -183,6 +177,7 @@
 					label="保养时长(h)"
 					prop="maintainDuration"
 					:rules="[
+						{ required: true, message: '保养时长不能为空', trigger: 'blur' },
 						{
 							type: 'number',
 							message: '请输入正确的数字',
diff --git a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
index 1edc7265..afad8bdd 100644
--- a/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--addContent.vue
@@ -129,8 +129,8 @@
 			width="35%"
 			:append-to-body="true"
 			custom-class="baseDialog"
-			@close="closeDetailForm"
-			@cancel="closeDetailForm"
+			@close="detailAddVisible = false"
+			@cancel="detailAddVisible = false"
 			@confirm="submitDetailForm">
 			<DialogForm
 				v-if="detailAddVisible"
@@ -237,7 +237,7 @@ export default {
 			detailTableProps: [
 				{ prop: 'equipmentName', label: '设备名称' },
 				{ prop: 'program', label: '保养项目' },
-				{ prop: 'remark', label: '备注' },
+				// { prop: 'remark', label: '备注' },
 			],
 			detailTableQuery: {
 				pageNo: 1,
@@ -317,9 +317,21 @@ export default {
 				value: item.id,
 			}));
 		},
+
+		resetForm() {
+			this.detailForm = {
+				planId: null,
+				equipmentId: null,
+				program: '',
+				maintenanceDes: '',
+				remark: '',
+			};
+		},
+
 		closeDetailForm() {
 			this.detailAddVisible = false;
 		},
+
 		async submitDetailForm() {
 			// validation
 			this.$refs.detailForm.validate(async (valid) => {
@@ -410,7 +422,10 @@ export default {
 			}
 		},
 		handleAddDetail() {
-			this.detailAddVisible = true;
+			this.resetForm();
+			this.$nextTick(() => {
+				this.detailAddVisible = true;
+			});
 		},
 	},
 };
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index 8f284a10..2a360a9b 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -101,8 +101,13 @@ export default {
 				{ prop: 'name', label: '计划名称' },
 				{ prop: 'departmentName', label: '部门' },
 				{ width: 144, prop: 'lineName', label: '产线名' },
-				{ width: 144, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
-				{ width: 144, prop: 'firstMaintenanceTime', label: '首次保养时间' },
+				{ width: 132, prop: 'maintenancePeriod', label: '保养频率(天/次)' },
+				{
+					width: 180,
+					prop: 'firstMaintenanceTime',
+					label: '首次保养时间',
+					filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'),
+				},
 				{ width: 144, prop: 'maintainDuration', label: '保养时长' },
 				{ prop: 'maintainer', label: '计划保养人员' },
 				{

From 4c41d6fad9e46b862b58bcc6b76d9d8ac4fbd20c Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Fri, 1 Mar 2024 11:16:53 +0800
Subject: [PATCH 7/9] bugfix

---
 src/views/specialEquipment/check/Config.vue   |  5 ++
 .../specialEquipment/check/Content-add.vue    | 63 +++++++++++++++-
 .../specialEquipment/check/Content-edit.vue   |  5 +-
 src/views/specialEquipment/check/Content.vue  | 29 ++++++--
 .../specialEquipment/check/Record-detail.vue  | 12 ++--
 src/views/specialEquipment/check/add.vue      | 71 ++++++++++++-------
 6 files changed, 142 insertions(+), 43 deletions(-)

diff --git a/src/views/specialEquipment/check/Config.vue b/src/views/specialEquipment/check/Config.vue
index 925cf71b..81ad4e45 100644
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@@ -121,6 +121,11 @@ export default {
 					showOverflowtooltip: true,
 					filter: parseTime,
 				},
+				{
+					prop: 'checkPeriod',
+					label: '巡检频率(天/次)',
+					showOverflowtooltip: true,
+				},
 				{
 					width: 144,
 					prop: 'confirmTimeLimit',
diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue
index fc231bf0..d5c9142d 100644
--- a/src/views/specialEquipment/check/Content-add.vue
+++ b/src/views/specialEquipment/check/Content-add.vue
@@ -50,6 +50,31 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+			<el-col>
+				<el-form-item label="巡检人" prop="checkPerson">
+					<el-select
+						v-model="dataForm.checkPerson"
+						:placeholder="`请选择巡检人`"
+						multiple
+						clearable
+						filterable>
+						<el-option
+							v-for="opt in inspectorOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+				</el-form-item>
+			</el-col>
+			<el-col>
+				<el-form-item label="巡检时间" prop="planCheckTime">
+					<el-date-picker
+						v-model="dataForm.planCheckTime"
+						type="datetime"
+						placeholder="请选择计划开始时间"
+						value-format="timestamp"></el-date-picker>
+				</el-form-item>
+			</el-col>
 			<!-- <el-col>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@@ -71,7 +96,9 @@ export default {
 				id: null,
 				name: null,
 				departmentId: null,
-				groupClass: null,
+				groupClass: [],
+				checkPerson: [],
+				planCheckTime: null,
 				// special: true,
 			},
 			dataRule: {
@@ -82,6 +109,7 @@ export default {
 			equipmentOptions: [],
 			groupOptions: [],
 			departmentOptions: [],
+			inspectorOptions: [],
 		};
 	},
 	mounted() {
@@ -93,7 +121,9 @@ export default {
 				id: null,
 				name: null,
 				departmentId: null,
-				groupClass: null,
+				groupClass: [],
+				checkPerson: [],
+				planCheckTime: null,
 				// special: true,
 			};
 		},
@@ -120,6 +150,31 @@ export default {
 						value: item.id,
 					}));
 				}
+				/** get user list and worker list */
+				let inspectorList = [];
+				const userlist = await this.$axios({
+					url: '/system/user/page',
+					params: { pageNo: 1, pageSize: 100 },
+				});
+				if (userlist.code == 0) {
+					inspectorList = inspectorList.concat(
+						(userlist.data?.list || []).map((item) => ({
+							label: item.nickname,
+							value: item.nickname,
+						}))
+					);
+				}
+				const workerlist = await this.$axios('/base/core-worker/listAll');
+				if (workerlist.code == 0) {
+					inspectorList = inspectorList.concat(
+						workerlist.data.map((item) => ({
+							label: item.name,
+							value: item.name,
+						}))
+					);
+				}
+				this.inspectorOptions = inspectorList;
+				/** endget */
 				this.formLoading = false;
 			} catch (err) {
 				this.formLoading = false;
@@ -129,6 +184,8 @@ export default {
 
 		async init(row) {
 			if (!row || !row.id) {
+				/** 新增 */
+				this.dataForm.checkPerson = [this.$store.getters.nickname];
 				return;
 			}
 			const res = await this.$axios({
@@ -176,7 +233,7 @@ export default {
 					status: 1,
 					// status: confirmed ? 2 : 1,
 					groupClass: this.dataForm.groupClass?.join(','),
-					checkPerson: this.$store.getters.nickname,
+					checkPerson: this.dataForm.checkPerson?.join(','),
 				},
 			});
 			if (res.code == 0) {
diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue
index e12bbb5e..86ba9027 100644
--- a/src/views/specialEquipment/check/Content-edit.vue
+++ b/src/views/specialEquipment/check/Content-edit.vue
@@ -496,6 +496,9 @@ export default {
 						this.form[key] = res.data[key];
 					}
 				});
+				if (!res.data.checkPerson || res.data.checkPerson.trim() == '') {
+					this.form.checkPerson = [this.$store.getters.nickname];
+				}
 				this.formLoading = false;
 			}
 			this.formLoading = false;
@@ -550,7 +553,7 @@ export default {
 						inspectorList = inspectorList.concat(
 							workerlist.data.map((item) => ({
 								label: item.name,
-								value: item.id,
+								value: item.name,
 							}))
 						);
 					}
diff --git a/src/views/specialEquipment/check/Content.vue b/src/views/specialEquipment/check/Content.vue
index 6e97e95d..4e28cae4 100644
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@@ -257,10 +257,17 @@ export default {
 						this.$message.warning('请选择待确认的巡检单');
 						return;
 					}
-					const res = await this.$axios({
+					let checkPersonParam = '';
+					if (!row.checkPerson || row.checkPerson.trim() == '') {
+						/** 如有必要，更新巡检人 */
+						checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+					}
+
+					const res = this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` +
+							checkPersonParam,
+						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: this.$refs['check-order-list-table'].selectedOrder.map(
 							(item) => item.id
@@ -301,7 +308,11 @@ export default {
 		/** 按钮、选择权限 */
 		checkConfirmPermission(row) {
 			const isAdmin = false; // 后续再修改
-			return !row.confirmDueTime || row.confirmDueTime >= new Date().getTime() || isAdmin;
+			return (
+				!row.confirmDueTime ||
+				row.confirmDueTime >= new Date().getTime() ||
+				isAdmin
+			);
 		},
 
 		/** 编辑 */
@@ -318,10 +329,16 @@ export default {
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
+					let checkPersonParam = '';
+					if (!row.checkPerson || row.checkPerson.trim() == '') {
+						/** 如有必要，更新巡检人 */
+						checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+					}
+
 					return this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.nickname,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` +
+							checkPersonParam,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
 						method: 'put',
 						data: [id],
diff --git a/src/views/specialEquipment/check/Record-detail.vue b/src/views/specialEquipment/check/Record-detail.vue
index 58adc97b..5ebee49f 100644
--- a/src/views/specialEquipment/check/Record-detail.vue
+++ b/src/views/specialEquipment/check/Record-detail.vue
@@ -30,37 +30,37 @@
 						<el-row :gutter="20">
 							<el-col :span="8">
 								<el-form-item label="巡检单名称" prop="name">
-									{{ form.name }}
+									<div style="">{{ form.name }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="部门" prop="department">
-									{{ form.department }}
+									<div style="">{{ form.department }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="班次" prop="groupClass">
-									{{ form.groupClass }}
+									<div style="">{{ form.groupClass || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="巡检人" prop="checkPerson">
-									{{ form.checkPerson }}
+									<div style="">{{ form.checkPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="巡检时间" prop="planCheckTime">
-									{{ form.planCheckTime | parseTime }}
+									<div style="">{{ form.planCheckTime | parseTime }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
 								<el-form-item label="确认人" prop="confirmPerson">
-									{{ form.confirmPerson }}
+									<div style="">{{ form.confirmPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>
 						</el-row>
diff --git a/src/views/specialEquipment/check/add.vue b/src/views/specialEquipment/check/add.vue
index f66f14d5..eb07391b 100644
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@@ -15,33 +15,17 @@
 		v-loading="formLoading"
 		label-position="top">
 		<el-row :gutter="20">
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="巡检单名称" prop="name">
 					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
 				</el-form-item>
 			</el-col>
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="巡检单编码" prop="code">
 					<el-input v-model="dataForm.code" placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-			<el-col>
-				<el-form-item
-					label="部门"
-					prop="departmentId"
-					:rules="[{ required: true, message: '请选择部门', trigger: 'blur' }]">
-					<el-select
-						v-model="dataForm.departmentId"
-						:placeholder="`请选择部门`">
-						<el-option
-							v-for="opt in departmentOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
-				</el-form-item>
-			</el-col>
-			<el-col>
+			<el-col :span="12">
 				<el-form-item label="计划巡检时间" prop="planCheckTime">
 					<el-date-picker
 						v-model="dataForm.planCheckTime"
@@ -51,15 +35,24 @@
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
-				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+				<el-form-item label="巡检频率（天/次）" prop="checkPeriod">
 					<el-input
-						v-model="dataForm.confirmTimeLimit"
-						:placeholder="`请输入确认时限`" />
-					<!-- <el-date-picker
-						v-model="dataForm.confirmTimeLimit"
-						type="datetime"
-						:placeholder="`请选择确认时限`"
-						value-format="timestamp" /> -->
+						v-model="dataForm.checkPeriod"
+						placeholder="请输入巡检频率(天/次)" />
+				</el-form-item>
+			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="部门" prop="departmentId">
+					<el-select
+						v-model="dataForm.departmentId"
+						:placeholder="`请选择部门`">
+						<el-option
+							v-for="opt in departmentOptions"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
@@ -79,6 +72,20 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
+
+			<el-col :span="12">
+				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
+					<el-input
+						v-model="dataForm.confirmTimeLimit"
+						:placeholder="`请输入确认时限`" />
+					<!-- <el-date-picker
+						v-model="dataForm.confirmTimeLimit"
+						type="datetime"
+						:placeholder="`请选择确认时限`"
+						value-format="timestamp" /> -->
+				</el-form-item>
+			</el-col>
+
 			<el-col>
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@@ -125,6 +132,15 @@ export default {
 				planCheckTime: [
 					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' },
 				],
+				checkPeriod: [
+					{ required: true, message: '巡检频率不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					},
+				],
 			},
 			equipmentOptions: [],
 			groupOptions: [],
@@ -145,6 +161,7 @@ export default {
 				confirmTimeLimit: null,
 				groupClass: null,
 				remark: null,
+				checkPeriod: null
 				// special: true,
 			};
 		},

From 151df54032eac7e9685f71f17c0bff0dceec6f82 Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Fri, 1 Mar 2024 11:17:11 +0800
Subject: [PATCH 8/9] 3,1

---
 .../base/orderManage/components/orderAdd.vue  | 30 ++++++++++++++++---
 src/views/order/base/orderManage/index.vue    | 23 ++++++--------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue
index df3a8fb2..5c0ba6c0 100644
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@@ -175,16 +175,38 @@ export default {
           }
           if (this.isEdit) {
             //编辑
-            orderUpdate({ ...this.form }).then((res) => {
+            orderUpdate({
+              code: this.form.code,
+              name: this.form.name,
+              planQuantity: this.form.planQuantity,
+              planProductId: this.form.planProductId,
+              priority: this.form.priority,
+              planStartTime: this.form.planStartTime,
+              planFinishTime: this.form.planFinishTime,
+              remark: this.form.remark,
+              id: this.form.id,
+              specifications: this.form.specifications
+            }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
                 this.$emit('successSubmit')
               }
             })
           } else {
-            this.form.status = 1
-            this.form.triggerOrigin = 1
-            orderCreate({ ...this.form }).then((res) => {
+            orderCreate({
+              code: this.form.code,
+              name: this.form.name,
+              planQuantity: this.form.planQuantity,
+              planProductId: this.form.planProductId,
+              priority: this.form.priority,
+              planStartTime: this.form.planStartTime,
+              planFinishTime: this.form.planFinishTime,
+              remark: this.form.remark,
+              id: this.form.id,
+              specifications: this.form.specifications,
+              status: 1,
+              triggerOrigin: 1
+            }).then((res) => {
               if (res.code === 0) {
                 this.$modal.msgSuccess("操作成功");
                 this.$emit('successSubmit')
diff --git a/src/views/order/base/orderManage/index.vue b/src/views/order/base/orderManage/index.vue
index ae99032f..e64984a2 100644
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@@ -244,20 +244,15 @@ export default {
             btnName: '终止',
             showTip: '终止',
             showParam: {
-              type: '|',
-              data: [
-                {
-                  type: 'equal',
-                  name: 'status',
-                  value: 2
-                },
-                {
-                  type: 'equal',
-                  name: 'status',
-                  value: 3
-                }
-              ]
-            }
+                type: '&',
+                data: [
+                  {
+                    type: 'equal',
+                    name: 'status',
+                    value: 3
+                  }
+                ]
+              }
           }
         : undefined,
       this.$auth.hasPermi('base:order-manage:cancel')

From d8c126fccff2ef86b78f337982425816cad30e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Fri, 1 Mar 2024 15:27:01 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  8 +--
 src/views/OperationalOverview/AGVBoard.vue    |  3 +-
 src/views/OperationalOverview/coldBoard.vue   | 46 ++++++-----------
 .../qualityInspectionBoxPermissions/index.vue | 22 ++++++--
 .../base/qualityHotMaterial/add-or-updata.vue | 13 +++--
 .../base/qualityScrapLog/add-or-updata.vue    |  4 +-
 .../base/qualityScrapLog/detail-or-updata.vue | 51 +++++++++----------
 .../monitoring/originalGlassRetrace/index.vue |  8 +--
 .../report/productionDayReport/index.vue      |  4 +-
 9 files changed, 79 insertions(+), 80 deletions(-)

diff --git a/.env.dev b/.env.dev
index e6eafbc1..6a03e051 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-02-26 08:45:43
- # @LastEditors: DY
+ # @LastEditTime: 2024-02-29 08:34:48
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置
@@ -20,10 +20,10 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
+# VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
diff --git a/src/views/OperationalOverview/AGVBoard.vue b/src/views/OperationalOverview/AGVBoard.vue
index 4ba4aed8..6493c3c5 100644
--- a/src/views/OperationalOverview/AGVBoard.vue
+++ b/src/views/OperationalOverview/AGVBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 16:11:33
+ * @LastEditTime: 2024-02-29 15:48:47
  * @Description:
 -->
 <template>
@@ -715,6 +715,7 @@ export default {
       qualityMonthTableProps,
       modelMonth: '',
       qualityList1,
+      // logoutTime: 43200000,
       qualityTableProps2,
       qualityList2,
       dateType: '0',
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 3d07693d..b041214c 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-23 16:11:40
+ * @LastEditTime: 2024-02-29 15:48:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -341,7 +341,9 @@ export default {
       // offsetWidth: null,
       cxNameList,
       cxDataList,
+      // time:12,
       cutProps,
+      // logoutTime: 43200000,
       cutTableDataList:[],
       clientWidth: 0,
       containerWidth: 111111,
@@ -432,36 +434,15 @@ export default {
         this.beilv2 = _this.clientWidth / 1920
       })()
     }
-    // let obj = {
-    //   'a': 11111,
-    //   'b': 22222,
-    //   'c': 33333,
-    //   'd': 44444,
-    //   'e': 55555,
+    // logoutInterval = setInterval(() => {
+    //   this.logoutTime -= 1000
+    // }, 1000)
+    // if (this.logoutTime === 0) {
+    //   this.SJGInitWebSocket()
+    //   this.CutInitWebSocket()
+    //   this.funInitWebSocket()
+    //   this.logoutTimeReset()
     // }
-    // let index = 0
-    // for (let i in obj) {
-    //   index++,
-    //   console.log(index);
-    // }
-    // this.getList()
-    // const _this = this;
-    // window.onresize = () => {
-    //   return (() => {
-    //     _this.clientWidth = `${document.documentElement.clientWidth}`
-    //     this.beilv2 = _this.clientWidth / 1920
-    //   })()
-    // }
-    // this.beilv2 = window.innerWidth / 1920
-    // addEventListener('resize', resizeFun = () => {
-    //   this.beilv2 = window.innerWidth / 1920
-    // })
-    // erd.listenTo(document, (element) => {
-    //   this.beilv2 = element.offsetWidth / 1920
-
-    //   // var width = element.offsetWidth;
-    //   // var height = element.offsetHeight;
-    // });
   },
   // beforeDestroy() {
   //   //离开页面删除检测器和所有侦听器
@@ -469,13 +450,16 @@ export default {
   //   removeEventListener('resize', resizeFun)
   // },
   methods: {
+    // logoutTimeReset() {
+    //   this.logoutTime = this.time * 60 * 60 * 1000
+    // },
     CutWebsocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
     SJGWebsocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
-    funInitWebSocket(e) {
+    funWebSocketClose(e) {
       console.log('WebSocket 断开连接', e)
     },
     formatTime(time, option) {
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
index b553af67..364770fe 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxPermissions/index.vue
@@ -51,8 +51,16 @@ export default {
           label: '用户名称',
           selectOptions: [],
           labelField: 'name',
-          valueField: 'id',
+          valueField: 'name',
           param: 'userName',
+        },
+        {
+          type: 'select',
+          label: '用户昵称',
+          selectOptions: [],
+          labelField: 'name',
+          valueField: 'name',
+          param: 'nickName',
         },
 				{
 					type: 'button',
@@ -143,10 +151,16 @@ export default {
       }).then((res) => {
         this.searchBarFormConfig[0].selectOptions = res.data.map((item) => {
           return {
-            id: item.id,
+            id: item.username,
             name:item.username
           }
         })
+        this.searchBarFormConfig[1].selectOptions = res.data.map((item) => {
+          return {
+            id: item.nickname,
+            name: item.nickname
+          }
+        })
       })
     },
     getDataList() {
@@ -206,7 +220,9 @@ export default {
         case 'search':
           this.listQuery.pageNo = 1;
           this.listQuery.pageSize = 10;
-          this.listQuery.inspectionDetContent = val.inspectionDetContent ? val.inspectionDetContent : undefined;
+          this.listQuery.userName = val.userName ? val.userName : undefined;
+          this.listQuery.nickName = val.nickName ? val.nickName : undefined;
+
           // this.listQuery.teamId = val.teamId ? val.teamId : undefined;
           this.getDataList()
           break;
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index a7959590..1a974283 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-01-22 15:29:53
+ * @LastEditTime: 2024-03-01 15:22:06
  * @LastEditors: zhp
  * @Description:
 -->
@@ -80,8 +80,9 @@
           <el-col :span="8">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
-              <el-input :disabled="isdetail" style="width: 90%;margin-right: 10px;" :max="item.maxValue"
-                :min='item.minValue' v-model="dataForm.checkValueList[index].checkValue"
+              <el-input  oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+                style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
+                v-model.number="dataForm.checkValueList[index].checkValue"
                 @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
               <span v-if="dataForm.checkValueList[index].showIcon">
                 <!-- <i class="el-icon-success"></i> -->
@@ -91,14 +92,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值"
-             >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最小值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.minValue"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值"
-              >
+            <el-form-item :prop="'checkValueList.' + index + '.minValue'" label="最大值">
               <el-input disabled style="width: 90%;margin-right: 10px;" v-model="item.maxValue"></el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/quality/base/qualityScrapLog/add-or-updata.vue b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
index 48866b9e..dc063ca6 100644
--- a/src/views/quality/base/qualityScrapLog/add-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 09:58:34
+ * @LastEditTime: 2024-03-01 10:33:48
  * @LastEditors: zhp
  * @Description:
 -->
@@ -130,7 +130,7 @@ export default {
 	mounted() {
 		this.getDict()
     console.log('我看看', this.dataForm)
-    this.getCurrentTime()
+    // this.getCurrentTime()
     this.getWorksectionById()
 	},
   methods: {
diff --git a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
index 7a6acef7..165c2921 100644
--- a/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
+++ b/src/views/quality/base/qualityScrapLog/detail-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-02-28 10:13:10
+ * @LastEditTime: 2024-03-01 10:18:39
  * @LastEditors: zhp
  * @Description:
 -->
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import basicAdd from '../../../core/mixins/basic-add';
+import basicAdd from './basic-add';
 import {
   createQualityScrapLog, updateQualityScrapLog, getQualityScrapLog, getWorkOrderList,
   getTeamList, getDetList,getLineList } from "@/api/base/qualityScrapLog";
@@ -151,8 +151,8 @@ export default {
       // this.dataForm.logTime = year + "-" + month + "-" + day;
       console.log(this.dataForm.logTime);
     },
-		async getDict() {
-			// 物料列表
+    async getDict() {
+      // 物料列表
       const res = await getList()
       this.typeList = res.data
       getWorkOrderList().then((res) => {
@@ -182,16 +182,15 @@ export default {
       getDetList().then((res) => {
         console.log(res);
         // console.log(response);
-        this.workOrderList = res.data.map((item) => {
+        this.detList = res.data.map((item) => {
           return {
-            name: item.name,
+            name: item.content,
             id: item.id
           }
         })
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
-
       getTeamList().then((res) => {
         console.log(res);
         // console.log(response);
@@ -201,29 +200,12 @@ export default {
             id: item.id
           }
         })
-        this.$axios({
-          url: '/base/core-workshop-section/listAll',
-          method: 'get',
-          // params: {
-          //   id: lineId,
-          // },
-        }).then((res) => {
-          // console.log(data)
-          this.sectionList = res.data.map((item) => {
-            return {
-              name: item.name,
-              id: item.id,
-            };
-          });
-        })
-        // if (code == 0) {
-
-        // }
         // console.log(this.formConfig[0].selectOptions);
         // this.listQuery.total = response.data.total;
       })
     },
     async getWorksectionById(lineId) {
+      if (lineId) {
         const { code, data } = await this.$axios({
           url: '/base/core-workshop-section/listByParentId',
           method: 'get',
@@ -240,7 +222,24 @@ export default {
             };
           });
         }
-    }
+      } else {
+        this.$axios({
+          url: '/base/core-workshop-section/listAll',
+          method: 'get',
+          // params: {
+          //   id: lineId,
+          // },
+        }).then((res) => {
+          // console.log(data)
+          this.sectionList = res.data.map((item) => {
+            return {
+              name: item.name,
+              id: item.id,
+            };
+          });
+        })
+      }
+    },
 	},
 };
 </script>
diff --git a/src/views/quality/monitoring/originalGlassRetrace/index.vue b/src/views/quality/monitoring/originalGlassRetrace/index.vue
index 71231acf..75faf29f 100644
--- a/src/views/quality/monitoring/originalGlassRetrace/index.vue
+++ b/src/views/quality/monitoring/originalGlassRetrace/index.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2023-08-01 14:55:51
  * @LastEditors: zhp
- * @LastEditTime: 2024-02-23 09:16:24
+ * @LastEditTime: 2024-03-01 10:27:29
  * @Description:
 -->
 <template>
@@ -124,8 +124,8 @@ export default {
           label: '工单',
           selectOptions: [],
           labelField: 'name',
-          valueField: 'id',
-          param: 'workOrderId'
+          valueField: 'name',
+          param: 'workOrderName'
         },
         // {
         //   type: 'datePicker',
@@ -233,7 +233,7 @@ export default {
     buttonClick(val) {
       console.log(val)
       if (val.btnName === 'search') {
-        this.listQuery.workOrderId = val.workOrderId ? val.workOrderId :undefined
+        this.listQuery.workOrderName = val.workOrderName ? val.workOrderName :undefined
         // this.queryParams.status = val.status
         // if (val.timeVal && val.timeVal.length != 0 ) {
         // this.listQuery.startTime =  val.timeVal[0] + ' 00:00:00'
diff --git a/src/views/report/productionDayReport/index.vue b/src/views/report/productionDayReport/index.vue
index 71b69624..9b3a60ba 100644
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 16:53:41
+ * @LastEditTime: 2024-03-01 15:26:38
  * @LastEditors: zhp
  * @Description:
 -->
@@ -9,7 +9,7 @@
   <div class="app-container">
     <el-form :inline="true" :model="dataForm" class="demo-form-inline">
       <el-form-item label="日" prop="reportTime">
-        <el-date-picker v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
+        <el-date-picker v-model="dataForm.reportTime" @change="changeTime" type="date" placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
       <el-button type="primary" @click="getDataList()">查询</el-button>