解决冲突

修改bug
Merge pull request 'projects/mesxc-zjl' (#231 ) from projects/mesxc-zjl into projects/mesxc-test
2024-03-05 09:49:01 +08:00 · 2024-03-05 09:48:16 +08:00 · 2024-03-04 14:10:21 +08:00 · 2024-03-04 14:09:07 +08:00 · 2024-03-04 14:07:08 +08:00 · 2024-03-04 14:04:37 +08:00
30 changed files with 1179 additions and 939 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,7 +1,7 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-01 15:27:52
+ # @LastEditTime: 2024-03-05 09:48:49
 # @LastEditors: zhp
 # @Description:
 ###
--- a/src/views/base/coreProductionLine/add-or-updata.vue
+++ b/src/views/base/coreProductionLine/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-18 13:53:09
+ * @LastEditTime: 2024-03-01 19:52:55
 * @Description:
 -->
 <template>
@ -33,14 +33,13 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
-						:disabled="isdetail || isedit"
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
 							v-for="(dict, index) in getDictDatas('workshop')"
 							:key="index"
 							:label="dict.label"
-							:value="dict.value" />
+							:value="Number(dict.value)" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@ -125,6 +124,26 @@ export default {
 		this.getDict()
 	},
 	methods: {
+		init(id) {
+      this.dataForm.id = id || "";
+      this.visible = true;
+      if (this.urlOptions.getOption) {
+        this.getArr()
+      }
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.urlOptions.infoURL(id).then(response => {
+            this.dataForm = response.data
+            // this.dataForm.roomNameDict = String(this.dataForm.roomNameDict)
+          });
+        } else {
+          if (this.urlOptions.isGetCode) {
+            this.getCode()
+          }
+				}
+      });
+    },
 		async getDict() {
 			// 工厂列表
 			const factoryRes = await getFactoryList();
--- a/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
+++ b/src/views/equipment/base/alarm/Record/AddOrUpdate.vue
@ -38,7 +38,7 @@
 import SmallTitle from './SmallTitle';
 import { getworkerAll } from '@/api/base/materialUseLog';
 import Editor from '@/components/Editor';
-import DialogForm from '@/components/DialogForm';
+import DialogForm from './DialogForm';

 export default {
 	name: 'AlarmHandle',
--- a/src/views/equipment/base/alarm/Record/DialogForm.vue
+++ b/src/views/equipment/base/alarm/Record/DialogForm.vue
@ -0,0 +1,520 @@
+<!-- 
+    filename: dialogForm.vue
+    author: liubin
+    date: 2023-08-15 10:32:36
+    description: 弹窗的表单组件
+-->
+
+<template>
+	<el-form
+		ref="form"
+		:model="form"
+		:label-width="`${labelWidth}px`"
+		:size="size"
+		:label-position="labelPosition"
+		v-loading="formLoading">
+		<el-row :gutter="20" v-for="(row, rindex) in rows" :key="rindex">
+			<el-col v-for="col in row" :key="col.label" :span="24 / row.length">
+				<el-form-item :label="col.label" :prop="col.prop" :rules="col.rules">
+					<el-input
+						v-if="col.input"
+						v-model="form[col.prop]"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						:disabled="disabled"
+						v-bind="col.bind" />
+					<el-input
+						v-if="col.textarea"
+						type="textarea"
+						v-model="form[col.prop]"
+						:disabled="disabled"
+						@change="$emit('update', form)"
+						:placeholder="`请输入${col.label}`"
+						v-bind="col.bind" />
+					<el-select
+						v-if="col.select"
+						v-model="form[col.prop]"
+						:placeholder="`请选择${col.label}`"
+						:disabled="disabled"
+						@change="$emit('update', form)"
+						v-bind="col.bind">
+						<el-option
+							v-for="opt in optionListOf[col.prop]"
+							:key="opt.value"
+							:label="opt.label"
+							:value="opt.value" />
+					</el-select>
+					<el-date-picker
+						v-if="col.datetime"
+						v-model="form[col.prop]"
+						type="datetime"
+						:disabled="disabled"
+						:placeholder="`请选择${col.label}`"
+						value-format="timestamp"
+						@change="$emit('update', form)"
+						v-bind="col.bind"></el-date-picker>
+					<el-switch
+						v-if="col.switch"
+						v-model="form[col.prop]"
+						:disabled="disabled"
+						active-color="#0b58ff"
+						inactive-color="#e1e1e1"
+						@change="$emit('update', form)"
+						v-bind="col.bind"></el-switch>
+					<component
+						v-if="col.subcomponent"
+						:key="col.key"
+						:disabled="disabled"
+						:read-only="disabled"
+						:is="col.subcomponent"
+						v-model="form[col.prop]"
+						:inlineStyle="col.style"
+						@on-change="$emit('update', form)"
+						v-bind="col.bind"></component>
+
+					<div
+						class="upload-area"
+						:class="uploadOpen ? '' : 'height-48'"
+						ref="uploadArea"
+						:key="col.prop"
+						v-if="col.upload">
+						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
+							<el-button
+								type="text"
+								icon="el-icon-arrow-right"
+								@click="handleFilesOpen" />
+						</span>
+						<!-- :file-list="uploadedFileList" -->
+						<el-upload
+							v-if="col.upload"
+							class="upload-in-dialog"
+							:key="col.prop + '__el-upload'"
+							:action="uploadUrl"
+							:headers="uploadHeaders"
+							:show-file-list="false"
+							icon="el-icon-upload2"
+							:disabled="disabled"
+							:before-upload="beforeUpload"
+							:on-success="
+								(response, file, fileList) => {
+									handleUploadSuccess(response, file, col.prop);
+								}
+							"
+							v-bind="col.bind">
+							<el-button
+								size="mini"
+								:disabled="disabled || col.bind?.disabled || false">
+								<svg-icon
+									icon-class="icon-upload"
+									style="color: inherit"></svg-icon>
+								上传文件
+							</el-button>
+							<div class="el-upload__tip" slot="tip" v-if="col.uploadTips">
+								{{ col.uploadTips || '只能上传jpg/png文件, 大小不超过2MB' }}
+							</div>
+						</el-upload>
+
+						<uploadedFile
+							class="file"
+							v-for="file in form[col.prop]"
+							:file="file"
+							:key="file.fileUrl"
+							:disabled="disabled"
+							@delete="!disabled && handleDeleteFile(file, col.prop)" />
+					</div>
+				</el-form-item>
+			</el-col>
+		</el-row>
+	</el-form>
+</template>
+
+<script>
+import { getAccessToken } from '@/utils/auth';
+import tupleImg from '@/assets/images/tuple.png';
+import cache from '@/utils/cache';
+
+/**
+ * 找到最长的label
+ * @param {*} options
+ */
+function findMaxLabelWidth(rows) {
+	let max = 0;
+	rows.forEach((row) => {
+		row.forEach((opt) => {
+			// debugger;
+			if (!opt.label) return 0;
+			if (opt.label.length > max) {
+				max = opt.label.length;
+				if (opt.label.includes('(')) {
+					max = max - 3;
+				}
+			}
+		});
+	});
+	return max;
+}
+
+const uploadedFile = {
+	name: 'UploadedFile',
+	props: ['file', 'disabled'],
+	data() {
+		return {};
+	},
+	methods: {
+		handleDelete() {
+			this.$emit('delete', this.file);
+		},
+		async handleDownload() {
+			const data = await this.$axios({
+				url: this.file.fileUrl,
+				method: 'get',
+				responseType: 'blob',
+			});
+
+			await this.$message.success('开始下载');
+			// create download link
+			const url = window.URL.createObjectURL(data);
+			const link = document.createElement('a');
+			link.href = url;
+			link.download = this.file.fileName;
+			document.body.appendChild(link);
+			link.click();
+			document.body.removeChild(link);
+		},
+	},
+	mounted() {},
+	render: function (h) {
+		return (
+			<div
+				title={this.file.fileName}
+				onClick={this.handleDownload}
+				style={{
+					background: `url(${tupleImg}) no-repeat`,
+					backgroundSize: '14px',
+					backgroundPosition: '0 55%',
+					paddingLeft: '20px',
+					paddingRight: '24px',
+					textOverflow: 'ellipsis',
+					whiteSpace: 'nowrap',
+					overflow: 'hidden',
+					cursor: 'pointer',
+					display: 'inline-block',
+				}}>
+				{this.file.fileName}
+				{!this.disabled && (
+					<el-button
+						type="text"
+						icon="el-icon-close"
+						style="float: right; position: relative; top: 2px; left: 8px; z-index: 100"
+						class="dialog__upload_component__close"
+						onClick={this.handleDelete}
+					/>
+				)}
+			</div>
+		);
+	},
+};
+
+export default {
+	name: 'DialogForm',
+	model: {
+		prop: 'dataForm',
+		event: 'update',
+	},
+	emits: ['update'],
+	components: { uploadedFile },
+	props: {
+		rows: {
+			type: Array,
+			default: () => [],
+		},
+		dataForm: {
+			type: Object,
+			default: () => ({}),
+		},
+		disabled: {
+			type: Boolean,
+			default: false,
+		},
+		hasFiles: {
+			type: Boolean | Array,
+			default: false,
+		},
+		labelPosition: {
+			type: String,
+			default: 'right',
+		},
+		size: {
+			type: String,
+			default: '',
+		},
+	},
+	data() {
+		return {
+			uploadOpen: false,
+			form: {},
+			formLoading: true,
+			optionListOf: {},
+			uploadedFileList: [],
+			dataLoaded: false,
+			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
+			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
+		};
+	},
+	computed: {
+		labelWidth() {
+			let max = findMaxLabelWidth(this.rows);
+			// 每个汉字占20px
+			return max * 20;
+			// return max * 20 + 'px';
+		},
+	},
+	watch: {
+		rows: {
+			handler() {
+				this.$nextTick(() => {
+					this.handleOptions('watch');
+				});
+			},
+			deep: true,
+			immediate: false,
+		},
+		dataForm: {
+			handler(val) {
+				this.form = JSON.parse(JSON.stringify(val));
+				if (this.hasFiles) {
+					if (typeof this.hasFiles == 'boolean' && this.hasFiles) {
+						this.form.files = this.form.files ?? [];
+					} else if (Array.isArray(this.hasFiles)) {
+						this.hasFiles.forEach((prop) => {
+							this.form[prop] = this.form[prop] ?? [];
+						});
+					}
+				}
+			},
+			deep: true,
+			immediate: true,
+		},
+	},
+	mounted() {
+		// 处理 options
+		this.handleOptions();
+	},
+	methods: {
+		/** 模拟透传 ref  */
+		validate(cb) {
+			return this.$refs.form.validate(cb);
+		},
+		resetFields(args) {
+			return this.$refs.form.resetFields(args);
+		},
+		// getCode
+		async getCode(url) {
+			const response = await this.$axios(url);
+			return response.data;
+		},
+		async handleOptions(trigger = 'monuted') {
+			console.log('[dialogForm:handleOptions]');
+			const promiseList = [];
+			this.rows.forEach((cols) => {
+				cols.forEach((opt) => {
+					if (opt.value && !this.form[opt.prop]) {
+						// 默认值
+						this.form[opt.prop] = opt.value;
+					}
+
+					if (opt.options) {
+						this.$set(this.optionListOf, opt.prop, opt.options);
+					} else if (opt.url) {
+						// 如果有 depends，则暂时先不获取，注册一个watcher
+						if (opt.depends) {
+							this.$watch(
+								() => this.form[opt.depends],
+								(id) => {
+									console.log('<', opt.depends, '>', 'changed', id);
+									if (id == null) return;
+									// 清空原有选项
+									this.form[opt.prop] = null;
+									// 获取新的选项
+									this.$axios({
+										url: `${opt.url}?id=${id}`,
+									}).then((res) => {
+										this.$set(
+											this.optionListOf,
+											opt.prop,
+											res.data.map((item) => ({
+												label: item[opt.labelKey ?? 'name'],
+												value: item[opt.valueKey ?? 'id'],
+											}))
+										);
+									});
+								},
+								{
+									immediate: false,
+								}
+							);
+							return;
+						}
+						// 如果是下拉框，或者新增模式下的输入框，才去请求
+						if (opt.select || (opt.input && !this.form?.id)) {
+							promiseList.push(async () => {
+								const response = await this.$axios(opt.url, {
+									method: opt.method ?? 'get',
+									// data: opt.method == 'post' ? opt.queryParams : null
+								});
+								// console.log('[dialogForm:handleOptions:response]', response);
+								if (opt.select) {
+									// 处理下拉框选项
+									const list =
+										'list' in response.data
+											? response.data.list
+											: response.data;
+
+									if (opt.cache) {
+										cache.store(opt.cache, list);
+									}
+
+									this.$set(
+										this.optionListOf,
+										opt.prop,
+										list.map((item) => ({
+											label: item[opt.labelKey ?? 'name'],
+											value: item[opt.valueKey ?? 'id'],
+										}))
+									);
+								} else if (opt.input) {
+									console.log('setting code: ', response.data);
+									// 处理输入框数据
+									this.form[opt.prop] = response.data;
+									// 更新下外部的 dataForm，防止code字段有数据也报空的bug
+									this.$emit('update', this.form);
+								}
+							});
+						}
+					}
+				});
+			});
+
+			console.log('[dialogForm:handleOptions] done!');
+
+			// 如果是 watch 触发的，不需要执行进一步的请求
+			if (trigger == 'watch') {
+				this.formLoading = false;
+				return;
+			}
+			try {
+				await Promise.all(promiseList.map((fn) => fn()));
+				this.formLoading = false;
+				this.dataLoaded = true;
+				// console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
+			} catch (error) {
+				console.log('[dialogForm:handleOptions:error]', error);
+				this.formLoading = false;
+			}
+			if (!promiseList.length) this.formLoading = false;
+		},
+
+		// 上传成功的特殊处理
+		beforeUpload(file) {
+			const checkFileSize = () => {
+				const isLt2M = file.size / 1024 / 1024 < 2;
+				if (!isLt2M) {
+					this.$modal.msgError('上传文件大小不能超过 2MB!');
+				}
+				return isLt2M;
+			};
+			const checkFileType = () => {
+				const isJPG =
+					file.type === 'image/jpeg' ||
+					file.type === 'image/png' ||
+					file.type === 'image/jpg';
+				return isJPG;
+			};
+			// return checkFileSize() && checkFileType();
+			return checkFileSize();
+		},
+
+		// 上传前的验证规则可通过 bind 属性传入
+		handleUploadSuccess(response, file, prop) {
+			console.log('[handleUploadSuccess]', response, file, prop);
+			this.form[prop].push({
+				fileName: file.name,
+				fileUrl: response.data,
+				fileType: prop == 'files' ? 2 : 1,
+			});
+			this.$modal.msgSuccess('上传成功');
+			this.$emit('update', this.form);
+		},
+
+		getFileName(fileUrl) {
+			return fileUrl.split('/').pop();
+		},
+
+		handleFilesOpen() {
+			this.uploadOpen = !this.uploadOpen;
+		},
+
+		handleDeleteFile(file, prop) {
+			this.form[prop] = this.form[prop].filter(
+				(item) => item.fileUrl != file.fileUrl
+			);
+			this.$emit('update', this.form);
+		},
+	},
+};
+</script>
+
+<style scoped lang="scss">
+.el-date-editor,
+.el-select {
+	width: 100%;
+}
+
+.upload-area {
+	// background: #ccc;
+	// display: grid;
+	// grid-auto-rows: 34px;
+	// grid-template-columns: repeat(6, minmax(32px, max-content));
+	// gap: 8px;
+	// align-items: center;
+	position: relative;
+	overflow: hidden;
+	transition: height 0.3s ease-out;
+}
+
+.upload-in-dialog {
+	// display: inline-block;
+	margin-right: 24px;
+	// background: #ccc;
+	position: relative;
+	// top: -13px;
+	float: left;
+}
+
+.close-icon {
+	// background: #ccc;
+	position: absolute;
+	top: 0;
+	right: 12px;
+	z-index: 100;
+	transition: transform 0.3s ease-out;
+}
+
+.close-icon.open {
+	transform: rotateZ(90deg);
+}
+</style>
+
+<style>
+.dialog__upload_component__close {
+	color: #ccc;
+}
+.dialog__upload_component__close:hover {
+	/* color: #777; */
+	color: red;
+}
+
+.height-48 {
+	height: 35px !important;
+}
+</style>
--- a/src/views/equipment/base/config/DataCollection/TableConfig.vue
+++ b/src/views/equipment/base/config/DataCollection/TableConfig.vue
@ -218,9 +218,9 @@ export default {
 						label: '是否采集', // 是否采集 0 代表不采集, 1 代表采集
 						prop: 'collection',
 						bind: {
-                            'active-value': 1,
+              'active-value': 1,
 							'inactive-value': 0,
-                            value: 1,
+              value: 1,
 						},
 					},
 				],
@ -294,7 +294,7 @@ export default {
 				name: undefined,
 				enName: undefined,
 				description: undefined,
-				collection: undefined,
+				collection: 1,
 			};
 			this.resetForm('form');
 		},
--- a/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
+++ b/src/views/equipment/base/inspection/Confirm/add-or-updata.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-29 14:59:28
+ * @LastEditTime: 2024-03-04 11:14:28
 * @Description:
 -->
 <template>
@ -78,7 +78,7 @@
 										v-for="opt in inspectorOptions"
 										:key="opt.value"
 										:label="opt.label"
-										:value="opt.value" />
+										:value="opt.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@ -418,7 +418,7 @@ export default {
 			});
 		},
 		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+			return this.$confirm('是否直接确认巡检单', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@ -431,10 +431,16 @@ export default {
 				}
 				this.$nextTick(() => {
 					this.getConfirmed().then(confirm => {
+						// let checkPersonParam = '';
+						// if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
+						// 	/** 如有必要，更新巡检人 */
+						// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+						// } else {
+						// 	checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
+						// }
 						this.$axios({
 							url:
-								'/base/equipment-check-order/confirm?confirmPerson=' +
-								this.$store.getters.userId,
+								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
 								data: [this.dataForm.id],
 						}).then(res =>{
--- a/src/views/equipment/base/inspection/Confirm/index.vue
+++ b/src/views/equipment/base/inspection/Confirm/index.vue
@ -179,8 +179,14 @@ export default {
 					this.$modal
 						.confirm('是否确认所有选中巡检单"?')
 						.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.userId,
+								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
 								data: this.$refs['waiting-list-table'].selectedPlan.map(
 									(item) => item.id
@ -394,11 +400,17 @@ export default {
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
+					// let checkPersonParam = '';
+					// const nickname = this.$store.getters.nickname;
+					// if (!row.checkPerson || row.checkPerson.trim() == '') {
+					// 	/** 如有必要，更新巡检人 */
+					// 	checkPersonParam = `&checkPerson=${nickname}`;
+					// } else {
+					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
+					// }
 					return this.$axios({
 						url:
-							'/base/equipment-check-order/confirm?confirmPerson=' +
-							this.$store.getters.userId,
-						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						method: 'put',
 						data: [row.id],
 					});
--- a/src/views/equipment/base/inspection/Settings/add.vue
+++ b/src/views/equipment/base/inspection/Settings/add.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2024-02-29 14:58:37
+ * @LastEditTime: 2024-03-01 19:44:59
 * @Description:
 -->
 <template>
@ -11,24 +11,18 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="120px">
+		label-width="150px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="巡检单名称" prop="name">
-					<el-input
-						v-model="dataForm.name"
-						placeholder="请输入巡检单名称" />
+					<el-input v-model="dataForm.name" placeholder="请输入巡检单名称" />
 				</el-form-item>
 			</el-col>
 			<el-col :span="12">
 				<el-form-item label="巡检单编码" prop="code">
-					<el-input
-						v-model="dataForm.code"
-						placeholder="请输入巡检单编码" />
+					<el-input v-model="dataForm.code" placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
 					label="部门"
@ -57,8 +51,13 @@
 						style="width: 100%" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="巡检频率（天/次）" prop="checkPeriod">
+					<el-input
+						v-model="dataForm.checkPeriod"
+						placeholder="请输入巡检频率(天/次)" />
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
 				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
 					<el-input
@ -83,8 +82,6 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@ -96,9 +93,14 @@

 <script>
 import basicAdd from '../../../../core/mixins/basic-add';
-import { getCheckOrder, getOrderCode, createCheckOrder, updateCheckOrder } from "@/api/equipment/base/inspection/settings";
-import { getCoreDepartmentList } from "@/api/base/coreDepartment";
-import { groupClassesListAll } from '@/api/monitoring/teamProduction'
+import {
+	getCheckOrder,
+	getOrderCode,
+	createCheckOrder,
+	updateCheckOrder,
+} from '@/api/equipment/base/inspection/settings';
+import { getCoreDepartmentList } from '@/api/base/coreDepartment';
+import { groupClassesListAll } from '@/api/monitoring/teamProduction';
 import { getDictDataLabel } from '@/utils/dict';
 // import { getEquipmentAll } from '@/api/base/equipment'

@ -107,118 +109,141 @@ export default {
 	data() {
 		return {
 			urlOptions: {
-			  isGetCode: true,
-        codeURL: getOrderCode,
+				isGetCode: true,
+				codeURL: getOrderCode,
 				createURL: createCheckOrder,
 				updateURL: updateCheckOrder,
 				infoURL: getCheckOrder,
 			},
 			dataForm: {
-        id: null,
+				id: null,
 				code: null,
 				name: null,
 				departmentId: null,
 				planCheckTime: null,
 				confirmTimeLimit: null,
 				groupClass: null,
-				remark: null
+				remark: null,
+				checkPeriod: null
 			},
 			groupOptions: [],
 			departmentOptions: [],
 			dataRule: {
 				confirmTimeLimit: [
-					{ required: true, message: '确认时限不能为空', trigger: 'blur' }
+					{ required: true, message: '确认时限不能为空', trigger: 'blur' },
 				],
 				code: [
-					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' }
+					{ required: true, message: '巡检单编码不能为空', trigger: 'blur' },
 				],
 				name: [
-					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' }
+					{ required: true, message: '巡检单名称不能为空', trigger: 'blur' },
 				],
 				planCheckTime: [
 					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' }
+				],
+				checkPeriod: [
+					{ required: true, message: '巡检频率不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					}
 				]
      }
 		};
 	},
 	created() {
-		const currenttime = new Date()
-		this.dataForm.planCheckTime = new Date(currenttime.getFullYear(), currenttime.getMonth(), currenttime.getDate(), 8, 0, 0).getTime()
-		console.log('11', this.dataForm.planCheckTime, currenttime)
+		const currenttime = new Date();
+		this.dataForm.planCheckTime = new Date(
+			currenttime.getFullYear(),
+			currenttime.getMonth(),
+			currenttime.getDate(),
+			8,
+			0,
+			0
+		).getTime();
 	},
 	mounted() {
-		this.getDict()
+		this.getDict();
 	},
 	methods: {
 		init(id) {
-      this.dataForm.id = id || "";
-      this.visible = true;
-      if (this.urlOptions.getOption) {
-        this.getArr()
-      }
-      this.$nextTick(() => {
-        this.$refs["dataForm"].resetFields();
-        if (this.dataForm.id) {
-          this.urlOptions.infoURL(id).then(response => {
-            this.dataForm = response.data
-						if (response.data.groupClass === '') {
-							this.dataForm.groupClass = []
+			this.dataForm.id = id || '';
+			this.visible = true;
+			if (this.urlOptions.getOption) {
+				this.getArr();
+			}
+			this.$nextTick(() => {
+				this.$refs['dataForm'].resetFields();
+				if (this.dataForm.id) {
+					this.urlOptions.infoURL(id).then((response) => {
+						this.dataForm = response.data;
+						if (response.data?.groupClass === '') {
+							this.dataForm.groupClass = [];
 						} else {
-							this.dataForm.groupClass = response.data?.groupClass.split(',') || undefined
+							this.dataForm.groupClass =
+								response.data?.groupClass?.split(',') || undefined;
 						}
-          });
-        } else {
-          if (this.urlOptions.isGetCode) {
-            this.getCode()
-          }
+					});
+				} else {
+					if (this.urlOptions.isGetCode) {
+						this.getCode();
+					}
 				}
-      });
-    },
+			});
+		},
 		async getDict() {
 			// 部门列表
 			const res = await getCoreDepartmentList();
 			this.departmentOptions = res.data || [];
 			const res1 = await groupClassesListAll();
-			this.groupOptions = res1.data.map((item) => {
-				item.label = item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict)
-				return item
-			}) || [];
+			this.groupOptions =
+				res1.data.map((item) => {
+					item.label =
+						item.name + ' - ' + getDictDataLabel('workshop', item.roomNameDict);
+					return item;
+				}) || [];
 			// const res = await getEquipmentAll()
 			// this.eqList = res.data
 		},
 		// 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (!valid) {
-          return false;
-        }
-        // 修改的提交
-        if (this.dataForm.id) {
-          this.urlOptions.updateURL({
+		dataFormSubmit() {
+			this.$refs['dataForm'].validate((valid) => {
+				if (!valid) {
+					return false;
+				}
+				// 修改的提交
+				if (this.dataForm.id) {
+					this.urlOptions
+						.updateURL({
+							...this.dataForm,
+							special: false,
+							status: 0,
+							groupClass: this.dataForm.groupClass?.join(','),
+						})
+						.then((response) => {
+							this.$modal.msgSuccess('修改成功');
+							this.visible = false;
+							this.$emit('refreshDataList');
+						});
+					return;
+				}
+				// 添加的提交
+				this.urlOptions
+					.createURL({
 						...this.dataForm,
 						special: false,
 						status: 0,
-						groupClass: this.dataForm.groupClass.join(',')
-					}).then(response => {
-            this.$modal.msgSuccess("修改成功");
-            this.visible = false;
-            this.$emit("refreshDataList");
-          });
-          return;
-        }
-        // 添加的提交
-        this.urlOptions.createURL({
-					...this.dataForm,
-					special: false,
-					status: 0,
-					groupClass: this.dataForm.groupClass.join(',')
-				}).then(response => {
-          this.$modal.msgSuccess("新增成功");
-          this.visible = false;
-          this.$emit("refreshDataList");
-        });
-      });
-    },
+						groupClass: this.dataForm.groupClass?.join(','),
+					})
+					.then((response) => {
+						this.$modal.msgSuccess('新增成功');
+						this.visible = false;
+						this.$emit('refreshDataList');
+					});
+			});
+		},
 	},
 };
 </script>
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@ -37,9 +37,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="handleConfirm">
-			<add
-				ref="add"
-				@refreshDataList="successSubmit" />
+			<add ref="add" @refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
@ -52,7 +50,7 @@
 <script>
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
-import add from './add.vue'
+import add from './add.vue';
 import { parseTime } from '../../../../core/mixins/code-filter';
 // import { publicFormatter } from '@/utils/dict';
 // const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
@ -71,14 +69,14 @@ export default {
 					? {
 							type: 'add',
 							btnName: '添加',
-							showTip: '添加巡检'
-					  }
+							showTip: '添加巡检',
+						}
 					: undefined,
 				this.$auth.hasPermi('equipment:check-setting:update')
 					? {
 							type: 'edit',
 							btnName: '修改',
-					  }
+						}
 					: undefined,
 				// this.$auth.hasPermi('equipment:check-setting:update')
 				// 	? {
@ -90,20 +88,44 @@ export default {
 					? {
 							type: 'delete',
 							btnName: '删除',
-					  }
+						}
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '巡检单名称', width: 110, showOverflowtooltip: true },
-				{ prop: 'code', label: '巡检单编码', minWidth: 150, showOverflowtooltip: true },
+				{
+					prop: 'name',
+					label: '巡检单名称',
+					width: 110,
+					showOverflowtooltip: true,
+				},
+				{
+					prop: 'code',
+					label: '巡检单编码',
+					minWidth: 150,
+					showOverflowtooltip: true,
+				},
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
-				{ prop: 'planCheckTime', label: '计划巡检时间', width: 150, filter: parseTime },
-				{ prop: 'confirmTimeLimit', label: '确认时限', showOverflowtooltip: true },
+				{
+					prop: 'planCheckTime',
+					label: '计划巡检时间',
+					width: 150,
+					filter: parseTime,
+				},
+				{
+					prop: 'confirmTimeLimit',
+					label: '确认时限',
+					showOverflowtooltip: true,
+				},
 				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
 				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
-				{ prop: 'createTime', label: '创建时间', width: 150, filter: parseTime },
+				{
+					prop: 'createTime',
+					label: '创建时间',
+					width: 150,
+					filter: parseTime,
+				},
 				// { prop: 'responsible', label: '负责人' },
-				{ prop: 'remark', label: '备注' } // TODO: 操作 选项，四个，群里询问
+				{ prop: 'remark', label: '备注' }, // TODO: 操作 选项，四个，群里询问
 			],
 			searchBarFormConfig: [
 				{
@ -136,7 +158,7 @@ export default {
 					name: 'add',
 					plain: true,
 					color: 'success',
-				}
+				},
 				// {
 				// 	type: this.$auth.hasPermi('equipment:check-setting:export')
 				// 		? 'button'
@ -177,7 +199,11 @@ export default {
 							clearable: true,
 						},
 						rules: [
-							{ required: true, message: '设备名称不能为空', trigger: 'change' },
+							{
+								required: true,
+								message: '设备名称不能为空',
+								trigger: 'change',
+							},
 						],
 					},
 					{
@ -196,13 +222,13 @@ export default {
 				equipmentId: null,
 				name: null,
 				special: false,
-				status: 0
+				status: 0,
 			},
 			// 表单参数
 			form: {},
 			basePath: '/base/equipment-check-order',
 			mode: null,
-			groupList: []
+			groupList: [],
 		};
 	},
 	created() {
@ -212,12 +238,12 @@ export default {
 	},
 	methods: {
 		handleConfirm() {
-      this.$refs.add.dataFormSubmit()
-    },
+			this.$refs.add.dataFormSubmit();
+		},
 		successSubmit() {
-      this.cancel()
-      this.getList()
-    },
+			this.cancel();
+			this.getList();
+		},
 		initSearchBar() {
 			this.http('/base/core-equipment/listAll', 'get').then(({ data }) => {
 				this.$set(
@ -231,9 +257,9 @@ export default {
 			});
 		},
 		getGroup() {
-			groupClassesListAll().then(res => {
-				this.groupList = res.data || []
-			})
+			groupClassesListAll().then((res) => {
+				this.groupList = res.data || [];
+			});
 		},
 		/** 查询列表 */
 		getList() {
@ -247,9 +273,9 @@ export default {
 		},
 		/** 取消按钮 */
 		cancel() {
-			this.$refs.add.formClear()
+			this.$refs.add.formClear();
 			this.open = false;
-			this.title = ''
+			this.title = '';
 			// this.reset();
 		},
 		/** 表单重置 */
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@ -160,6 +160,7 @@ import Editor from "@/components/Editor";
 import { getDictDatas } from "@/utils/dict";
 import { parseTime } from '@/utils/ruoyi'
 import { getDictDataLabel } from '@/utils/dict';
+import tupleImg from '@/assets/images/tuple.png';

 const uploadedFile = {
 	name: 'UploadedFile',
--- a/src/views/equipment/base/repair/Repair--add.vue
+++ b/src/views/equipment/base/repair/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">
@ -234,7 +234,7 @@
 							v-for="opt in workerOptions"
 							:key="opt.value"
 							:label="opt.label"
-							:value="opt.value" />
+							:value="opt.label" />
 					</el-select>
 				</el-form-item>
 			</el-col>
@ -597,9 +597,9 @@ 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];
 			});
 		},

@ -630,8 +630,8 @@ export default {
 		/** 获取设备 */
 		async initEquipment() {
 			const response = await this.$axios('/base/core-equipment/listAll');
-			this.equipmentList = response.data || [];
-			this.equipmentOptions = response.data || [];
+			this.equipmentList = response.data.filter(item => item.special === false) || [];
+			this.equipmentOptions = response.data.filter(item => item.special === false) || [];
 			// this.allSpeicalEquipments = equipmentOptions;
 		},
 		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
@ -737,6 +737,7 @@ export default {
 				fileType: prop == 'files' ? 2 : 1,
 			});
 			this.$modal.msgSuccess('上传成功');
+			console.log('为我', this.form.files)
 			this.$emit('update', this.form);
 		},

--- a/src/views/order/base/orderGroup/components/orderGroupAdd.vue
+++ b/src/views/order/base/orderGroup/components/orderGroupAdd.vue
@ -60,14 +60,7 @@
      </el-col>
      <el-col :span='6'>
        <el-form-item label="包装要求" prop="packReq">
-          <el-select v-model="form.packReq" placeholder="请选择" style="width: 100%;" clearable>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          <el-input v-model="form.packReq"></el-input>
        </el-form-item>
      </el-col>
    </el-row>
@ -127,7 +120,7 @@ export default {
            this.form.customerId = res.data.customerId
            this.form.planQuantity = res.data.planQuantity
            this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null
-            this.form.packReq = res.data.packReq ? res.data.packReq+'' : ''
+            this.form.packReq = res.data.packReq
            this.form.remark = res.data.remark
            setTimeout(() => {
              this.getSpecifications(this.form.planProductId)
--- a/src/views/order/base/orderGroup/index.vue
+++ b/src/views/order/base/orderGroup/index.vue
@ -125,7 +125,7 @@ const tableProps = [
  {
    prop: 'packReq',
    label: '包装要求',
-    filter: publicFormatter('pack_spec'),
+    // filter: publicFormatter('pack_spec'),
    minWidth: 120,
    showOverflowtooltip: true
  },
--- a/src/views/quality/base/qualityHotMaterial/index.vue
+++ b/src/views/quality/base/qualityHotMaterial/index.vue
@ -188,8 +188,8 @@ export default {
 				case 'search':
 					this.listQuery.pageNo = 1;
 					this.listQuery.pageSize = 10;
-          this.listQuery.content = val.content ? val.content : undefined;
-          this.listQuery.typeId = val.typeId ? val.typeId : undefined;
+          this.listQuery.materialId = val.materialId ? val.materialId : undefined;
+          // this.listQuery.typeId = val.typeId ? val.typeId : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
--- a/src/views/report/glass/day.vue
+++ b/src/views/report/glass/day.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-01-24 15:38:53
+ * @LastEditTime: 2024-03-05 09:36:28
 * @LastEditors: zhp
 * @Description:
 -->
@ -62,9 +62,14 @@ export default {
 		};
 	},
 	created() {
-		this.getDict()
+    this.getDict()
+    this.getTodayStartTimeAndEndTime()
 	},
-	methods: {
+  methods: {
+    getTodayStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      this.changeTime(this.reportTime)
+    },
 		async getDict() {
 			// 产线列表
 			const res = await getCorePLList();
--- a/src/views/report/glass/month.vue
+++ b/src/views/report/glass/month.vue
@ -59,7 +59,8 @@ export default {
 			all: {}
 		};
 	},
-	created() {
+  created() {
+    this.getCurrentMonthFirst()
 		this.getDict()
 	},
 	methods: {
@ -67,7 +68,15 @@ export default {
 			// 产线列表
 			const res = await getCorePLList();
 			this.proLineList = res.data;
-		},
+    },
+    getCurrentMonthFirst() {
+      const date = new Date();
+      date.setDate(1);
+      this.reportTime = date
+      // console.log(date)
+      this.changeTime(date)
+      // console.log(date.valueOf());
+    },
 		// 获取数据列表
    async getDataList() {
      this.dataListLoading = true;
@ -90,24 +99,35 @@ export default {
        this.dataListLoading = false;
      });
    },
-		changeTime(val) {
+    changeTime(val) {
+      console.log(val)
 			if(val) {
 					const timeStamp = val.getMonth(); //标准时间转为时间戳，毫秒级别
 					const fullyear = val.getFullYear()
 					let days = 0
 					switch (timeStamp) {
-						case 0, 2, 4, 6, 7, 9, 11:
+            case 0:
+            case 2:
+            case 4:
+            case 6:
+            case 7:
+            case 9:
+            case 11:
 							days = 31
 							break
-						case 3, 4, 8, 10:
+            case 3:
+            case 4:
+            case 8:
+            case 10:
 							days = 30
 							break
 						case 1:
-							if ((fullyear % 400 === 0) || (fullyear() % 4 === 0 && fullyear() % 100 !== 0)) {
+							if ((fullyear % 400 === 0) || (fullyear % 4 === 0 && fullyear % 100 !== 0)) {
 								days = 29
 							} else {
 								days = 28
-							}
+              }
+              break
 					}
 					this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1).getTime()); //开始时间
 					this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 23, 59, 59).getTime()); //结束时间
--- a/src/views/report/glass/weekly.vue
+++ b/src/views/report/glass/weekly.vue
@ -93,7 +93,8 @@ export default {
 	},
 	mounted() {
 		// const day = new Date().getDay()
-		// console.log('周四', day)
+    // console.log('周四', day)
+    this.getCurrentWeekStartTimeAndEndTime()
 		// this.changeTime(new Date(new Date().getTime() - day * 24 * 60 * 60 * 1000))
 		this.getDict()
 	},
@ -104,7 +105,11 @@ export default {
 				this.proLineList = res.data;
 				// this.getDataList()
 			});
-		},
+    },
+    getCurrentWeekStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      this.changeTime(this.reportTime)
+    },
 		// 获取数据列表
    async getDataList() {
      this.dataListLoading = true;
@ -127,7 +132,8 @@ export default {
        this.dataListLoading = false;
      });
    },
-		changeTime(val) {
+    changeTime(val) {
+      console.log(val);
 			if(val) {
 					let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
 					this.startTimeStamp = this.timeFun(timeStamp - 24 * 60 * 60 * 1000); //开始时间
--- a/src/views/report/glass/year.vue
+++ b/src/views/report/glass/year.vue
@ -57,10 +57,24 @@ export default {
 			all: {},
 		};
 	},
-	created() {
+  created() {
 		this.getDict()
-	},
-	methods: {
+  },
+  mounted () {
+    this.getCurrentYearFirst()
+      ;
+  },
+  methods: {
+    getCurrentYearFirst() {
+      let date = new Date();
+      date.setDate(1);
+      date.setMonth(0);
+      this.reportTime = date;
+      this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1).getTime()); //开始时间
+      this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间
+      this.listQuery.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+      this.listQuery.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100
+    },
 		async getDict() {
 			// 产线列表
 			const res = await getCorePLList();
--- a/src/views/report/productionDayReport/index.vue
+++ b/src/views/report/productionDayReport/index.vue
@ -1,15 +1,15 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-01 15:26:38
+ * @LastEditTime: 2024-03-05 09:36:18
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <div class="app-container">
-    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
+    <el-form :inline="true" :model="listQuery" class="demo-form-inline">
      <el-form-item label="日" prop="reportTime">
-        <el-date-picker v-model="dataForm.reportTime" @change="changeTime" type="date" placeholder="选择日期">
+        <el-date-picker clearable v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
        </el-date-picker>
      </el-form-item>
      <el-button type="primary" @click="getDataList()">查询</el-button>
@ -27,26 +27,26 @@
      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
        <el-table-column prop="lineId" label="生产线">
          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.lineId" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.lineId }} </span>
          </template>
        </el-table-column>
        <el-table-column label="投入数㎡">
          <el-table-column prop="inputNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputTrend }} </span>
            </template>
          </el-table-column>
@ -54,21 +54,21 @@
        <el-table-column label="完成良品产量">
          <el-table-column prop="goodProductNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductTrend }} </span>
            </template>
@ -77,19 +77,19 @@
        <el-table-column label="原片漏检率">
          <el-table-column prop="missCheckNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.missCheckTrend }} </span>
            </template>
@ -98,21 +98,21 @@
        <el-table-column label="综合良品率">
          <el-table-column prop="goodProductPassNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassTrend }} </span>
            </template>
@ -121,7 +121,9 @@
      </el-table-column>
      <div style="height: 50px;" class="remark" slot="append">
        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
+        <el-input v-if="!disabled" v-model="remark" :disabled="disabled">
+        </el-input>
+        <span v-else>{{ remark }} </span>
      </div>
    </el-table>
    <!-- 搜索工作栏 -->
@ -388,8 +390,9 @@ export default {
 			// 	explainText: undefined,
 			// 	remark: undefined,
 			// },
-			// 查询参数
-      dataForm: {
+      // 查询参数
+      reportTime:'',
+      listQuery: {
        // workOrderIdList:undefined,
        // productionId: undefined,
        // startTime: undefined,
@ -419,6 +422,7 @@ export default {
    // } else {
    //   this.searchBarFormConfig[0].defaultSelect = [];
    // }
+    this.getTodayStartTimeAndEndTime()
    this.getDataList()
  },
  methods: {
@ -434,22 +438,27 @@ export default {
      // var s = time.getSeconds();
      return time
    },
+    getTodayStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      this.changeTime(this.reportTime)
+    },
    changeTime(val) {
+      console.log(val)
      if (val) {
        // console.log(val)
        // console.log(val.setHours(7, 0, 0))
        // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
        // let time = this.format(val.setHours(7, 0, 0))
-        this.dataForm.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.dataForm.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
-        console.log(this.dataForm.reportTime);
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        console.log(this.listQuery.reportTime);
      } else {
-        this.dataForm.reportTime = []
+        this.listQuery.reportTime = []
      }
    },
    handleExport() {
      // 处理查询参数
-      let params = { ...this.dataForm };
+      let params = { ...this.listQuery };
      params.pageNo = undefined;
      params.pageSize = undefined;
      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
@ -460,36 +469,36 @@ export default {
        this.exportLoading = false;
      }).catch(() => { });
    },
-    timeSelect() {
-      // switch (this.queryParams.timeDim) {
-        // case '1':
-        //   if (this.timeValue[1] - this.timeValue[0] > 7 * 24 * 3600000) {
-        //     this.$modal.msgError('最大时间范围为7天，请重新选择')
-        //     this.timeValue = []
-        //   }
-        //   break
-        // case '2':
-      if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
-        this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
-        this.monthValue = []
-      }
-        //   break
-        // case '4':
-        //   if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
-        //     this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
-        //     this.monthValue = []
-        //   }
-        //   break
-        // default:
-    },
-    transformTime(timeStamp) {// 本月最后一天
-      let year = moment(timeStamp).format('YYYY')
-      let month = moment(timeStamp).format('MM')
-      let newData = moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59'
-      let value = newData
-      console.log(value);
-      return value
-    },
+    // timeSelect() {
+    //   // switch (this.queryParams.timeDim) {
+    //     // case '1':
+    //     //   if (this.timeValue[1] - this.timeValue[0] > 7 * 24 * 3600000) {
+    //     //     this.$modal.msgError('最大时间范围为7天，请重新选择')
+    //     //     this.timeValue = []
+    //     //   }
+    //     //   break
+    //     // case '2':
+    //   if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
+    //     this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
+    //     this.monthValue = []
+    //   }
+    //     //   break
+    //     // case '4':
+    //     //   if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
+    //     //     this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
+    //     //     this.monthValue = []
+    //     //   }
+    //     //   break
+    //     // default:
+    // },
+    // transformTime(timeStamp) {// 本月最后一天
+    //   let year = moment(timeStamp).format('YYYY')
+    //   let month = moment(timeStamp).format('MM')
+    //   let newData = moment(new Date(year, month, 0)).format('YYYY-MM-DD') + ' 23:59:59'
+    //   let value = newData
+    //   console.log(value);
+    //   return value
+    // },
    // selectTime() {
    //   switch (this.queryParams.type) {
    //     case 1:
@ -532,23 +541,23 @@ export default {
      }
    },
    async getDataList() {
-      if (this.monthValue.length > 0) {
-        console.log(this.monthValue)
-        this.dataForm.reportTime[0] = this.transformTime(this.monthValue[0])
-        // this.queryParams.startTime = this.monthValue[0]
-        this.dataForm.reportTime[1] = this.transformTime(this.monthValue[1])
-        this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
-        console.log(this.timeTips);
-      } else {
-        // this.$modal.msgError('月范围不能为空')
-        // return false
-      }
+      // if (this.monthValue.length > 0) {
+      //   console.log(this.monthValue)
+      //   this.listQuery.reportTime[0] = this.transformTime(this.monthValue[0])
+      //   // this.queryParams.startTime = this.monthValue[0]
+      //   this.listQuery.reportTime[1] = this.transformTime(this.monthValue[1])
+      //   this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
+      //   console.log(this.timeTips);
+      // } else {
+      //   // this.$modal.msgError('月范围不能为空')
+      //   // return false
+      // }

-      console.log(this.dataForm);
+      console.log(this.listQuery);
      const res = await this.$axios({
        url: '/base/report-auto-production/page',
        method: 'get',
-        params: this.dataForm
+        params: this.listQuery
      })
      console.log(res)
      // let sum = undefined
--- a/src/views/report/productionMonthReport/index.vue
+++ b/src/views/report/productionMonthReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 15:57:10
+ * @LastEditTime: 2024-03-05 09:06:22
 * @LastEditors: zhp
 * @Description:
 -->
@ -10,8 +10,8 @@
    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
      <el-form-item>
        <el-date-picker v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="timestamp" :clearable="false" :picker-options="pickerOptions"
-          size="small" style='width:350px;' @change="timeSelect">
+          end-placeholder="结束日期" clearable :picker-options="pickerOptions" size="small" style='width:350px;'
+          @change="timeSelect">
        </el-date-picker>
      </el-form-item>
      <el-button type="primary" @click="getDataList()">查询</el-button>
@ -29,26 +29,26 @@
      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
        <el-table-column prop="lineId" label="生产线">
          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.lineId" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.lineId }} </span>
          </template>
        </el-table-column>
        <el-table-column label="投入数㎡">
          <el-table-column prop="inputNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputTrend }} </span>
            </template>
          </el-table-column>
@ -56,21 +56,21 @@
        <el-table-column label="完成良品产量">
          <el-table-column prop="goodProductNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductTrend }} </span>
            </template>
@ -79,19 +79,19 @@
        <el-table-column label="原片漏检率">
          <el-table-column prop="missCheckNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.missCheckTrend }} </span>
            </template>
@ -100,21 +100,21 @@
        <el-table-column label="综合良品率">
          <el-table-column prop="goodProductPassNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassTrend }} </span>
            </template>
@ -123,7 +123,9 @@
      </el-table-column>
      <div style="height: 50px;" class="remark" slot="append">
        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
+        <el-input v-if="!disabled" v-model="remark" :disabled="disabled">
+        </el-input>
+        <span v-else>{{ remark }} </span>
      </div>
    </el-table>
    <!-- 搜索工作栏 -->
@ -320,9 +322,9 @@ export default {
 				// },
      ],
      pickerOptions: {
-        disabledDate(date) {
-          return date.getTime() > Date.now()
-        }
+        // disabledDate(date) {
+        //   return date.getTime() > Date.now()
+        // }
      },
 			// tableBtn: [
 			// 	this.$auth.hasPermi('base:quality-inspection-record:update')
@ -402,7 +404,9 @@ export default {
 			},
 		};
  },
-	created() {
+  created() {
+    this.getCurrentMonthFirst()
+    this.getCurrentMonthLast()
 		// this.getProductLineList();
  },
  mounted() {
@ -421,6 +425,7 @@ export default {
    // } else {
    //   this.searchBarFormConfig[0].defaultSelect = [];
    // }
+
    this.getDataList()
  },
  methods: {
@ -437,6 +442,21 @@ export default {
        this.exportLoading = false;
      }).catch(() => { });
    },
+    getCurrentMonthFirst() {
+      const date = new Date();
+      date.setDate(1);
+      this.monthValue[0] = moment(date).format('YYYY-MM-DD')
+      console.log(date)
+      // console.log(date.valueOf());
+    },
+    getCurrentMonthLast() {
+      const date = new Date();
+      const currentMonth = date.getMonth();
+      const nextMonth = currentMonth + 1;
+      const nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1);
+      const oneDay = 24 * 60 * 60 * 1000;
+      this.monthValue[1] = new Date(nextMonthFirstDay - oneDay)
+    },
    timeSelect() {
      // switch (this.queryParams.timeDim) {
        // case '1':
@ -445,7 +465,8 @@ export default {
        //     this.timeValue = []
        //   }
        //   break
-        // case '2':
+      // case '2':
+      console.log(this.monthValue[1],this.monthValue[0]);
      if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) {
        this.$modal.msgError('最大时间范围为24个月，请重新选择')// 同理上面
        this.monthValue = []
@ -467,6 +488,14 @@ export default {
      console.log(value);
      return value
    },
+    transformStartTime(timeStamp) {// 本月最后一天
+      let year = moment(timeStamp).format('YYYY')
+      let month = moment(timeStamp).format('MM')
+      let newData = moment(new Date(year, month, 1)).format('YYYY-MM-DD') + ' 23:59:59'
+      let value = newData
+      console.log(value);
+      return value
+    },
    // selectTime() {
    //   switch (this.queryParams.type) {
    //     case 1:
@ -511,9 +540,9 @@ export default {
    async getDataList() {
      if (this.monthValue.length > 0) {
        console.log(this.monthValue)
-        this.dataForm.reportTime[0] = this.transformTime(this.monthValue[0])
+        this.dataForm.reportTime[0] = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' 00:00:00'
        // this.queryParams.startTime = this.monthValue[0]
-        this.dataForm.reportTime[1] = this.transformTime(this.monthValue[1])
+        this.dataForm.reportTime[1] = moment(this.monthValue[1]).format('YYYY-MM-DD') + ' 23:59:59'
        this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
        console.log(this.timeTips);
      } else {
--- a/src/views/report/productionShipmentsReport/index.vue
+++ b/src/views/report/productionShipmentsReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 15:50:10
+ * @LastEditTime: 2024-03-04 16:51:18
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,7 +9,7 @@
  <div class="app-container">
    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
      <el-form-item>
-        <el-date-picker v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
+        <el-date-picker clearable v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
          end-placeholder="结束日期" value-format="timestamp" :clearable="false" :picker-options="pickerOptions"
          size="small" style='width:350px;' @change="timeSelect">
        </el-date-picker>
@ -29,7 +29,7 @@
      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
        <el-table-column prop="glassType" label="品种" align="center">
          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.glassType" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" v-model="scope.row.glassType" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.glassType }} </span>
          </template>
        </el-table-column>
@ -37,19 +37,19 @@
          <el-table-column label="成品" align="center">
            <el-table-column :show-header="false">
              <template slot-scope="scope">
-                <el-input v-if="scope.row.det === true" v-model="scope.row.productionL" :disabled="disabled"></el-input>
+                <el-input v-if="!disabled" v-model="scope.row.productionL" :disabled="disabled"></el-input>
                <span v-else>{{ scope.row.productionL }} </span>
              </template>
            </el-table-column>
            <el-table-column :show-header="false">
              <template slot-scope="scope">
-                <el-input v-if="scope.row.det === true" v-model="scope.row.productionW" :disabled="disabled"></el-input>
+                <el-input v-if="!disabled" v-model="scope.row.productionW" :disabled="disabled"></el-input>
                <span v-else>{{ scope.row.productionW }} </span>
              </template>
            </el-table-column>
            <el-table-column :show-header="false">
              <template slot-scope="scope">
-                <el-input v-if="scope.row.det === true" v-model="scope.row.productionH" :disabled="disabled"></el-input>
+                <el-input v-if="!disabled" v-model="scope.row.productionH" :disabled="disabled"></el-input>
                <span v-else>{{ scope.row.productionH }} </span>
              </template>
            </el-table-column>
@ -57,105 +57,108 @@
          <el-table-column label="原片">
            <el-table-column prop="originalGlassSize">
              <template slot-scope="scope">
-                <el-input v-if="scope.row.det === true" v-model="scope.row.originalGlassSize" :disabled="disabled">
+                <el-input v-if="!disabled" v-model="scope.row.originalGlassSize" :disabled="disabled">
                </el-input>
                <span v-else>{{ scope.row.originalGlassSize }} </span>
              </template>
            </el-table-column>
          </el-table-column>
        </el-table-column>
+
+        <!-- <el-table-column label="完成良品产量"> -->
+        <el-table-column prop="customerId" label="用户">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.customerId" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.customerId }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="packageType" label="包装形式">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.packageType" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.packageType }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderNum" label="订单数量">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.orderNum" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.orderNum }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderFinish" label="订单完成">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.orderFinish" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.orderFinish }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="orderRemaining" label="未完成订单">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.orderRemaining" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.orderRemaining }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="stockLastMonth" label="上月库存">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.stockLastMonth" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.stockLastMonth }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="productNumThisMonth" label="本月生产成品">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.productNumThisMonth" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.productNumThisMonth }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deliveNum" label="发货量">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.deliveNum" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.deliveNum }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="undeliveNum" label="未发货量">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.undeliveNum" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.undeliveNum }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="undeliveArea" label="未发货面积">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.undeliveArea" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.undeliveArea }} </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="deliveArea" label="发货面积">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.deliveArea" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.deliveArea }} </span>
+          </template>
+        </el-table-column>
+
+        <el-table-column prop="productAreaThisMonth" label="本月生产面积">
+          <template slot-scope="scope">
+            <el-input v-if="!disabled" v-model="scope.row.productAreaThisMonth" :disabled="disabled">
+            </el-input>
+            <span v-else>{{ scope.row.productAreaThisMonth }} </span>
+          </template>
+        </el-table-column>
      </el-table-column>

-      <!-- <el-table-column label="完成良品产量"> -->
-      <el-table-column prop="customerId" label="用户">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.customerId" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.customerId }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="packageType" label="包装形式">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.packageType" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.packageType }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderNum" label="订单数量">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.orderNum" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.orderNum }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderFinish" label="订单完成">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.orderFinish" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.orderFinish }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="orderRemaining" label="未完成订单">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.orderRemaining" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.orderRemaining }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="stockLastMonth" label="上月库存">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.stockLastMonth" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.stockLastMonth }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="productNumThisMonth" label="本月生产成品">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.productNumThisMonth" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.productNumThisMonth }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="deliveNum" label="发货量">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.deliveNum" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.deliveNum }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="undeliveNum" label="未发货量">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.undeliveNum" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.undeliveNum }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="undeliveArea" label="未发货面积">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.undeliveArea" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.undeliveArea }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="deliveArea" label="发货面积">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.deliveArea" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.deliveArea }} </span>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="productAreaThisMonth" label="本月生产面积">
-        <template slot-scope="scope">
-          <el-input v-if="scope.row.det === true" v-model="scope.row.productAreaThisMonth" :disabled="disabled">
-          </el-input>
-          <span v-else>{{ scope.row.productAreaThisMonth }} </span>
-        </template>
-      </el-table-column>
      <!-- </el-table-column> -->
      <div style="height: 50px;" class="remark" slot="append">
        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
+        <el-input v-if="!disabled" v-model="remark" :disabled="disabled">
+        </el-input>
+        <span v-else>{{ remark }} </span>
      </div>
    </el-table>
    <!-- 搜索工作栏 -->
--- a/src/views/report/productionWeekReport
+++ b/src/views/report/productionWeekReport
@ -1,37 +0,0 @@
-<template>
-  <div class="tableInner">
-    <el-input v-model="list[itemProp]" @blur="changeInput" />
-  </div>
-</template>
-<script>
-export default {
-  name: 'InputArea',
-  props: {
-    injectData: {
-      type: Object,
-      default: () => ({})
-    },
-    itemProp: {
-      type: String
-    }
-  },
-  data() {
-    return {
-      list: this.injectData
-    }
-  },
-  methods: {
-    changeInput() {
-      console.log(this.list)
-      this.$emit('emitData', this.list)
-    }
-  }
-}
-</script>
-<style>
-.tableInner .el-input__inner {
-  border: none;
-  padding: 0;
-  height: 33px;
-}
-</style>
--- a/src/views/report/productionWeekReport
+++ b/src/views/report/productionWeekReport
@ -1,468 +0,0 @@
-<!--
- * @Author: zhp
- * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 15:55:48
- * @LastEditors: zhp
- * @Description:
-->
-<template>
-  <div class="app-container">
-    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
-      <el-form-item>
-        <el-form-item label="日" prop="reportTime">
-          <el-date-picker v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
-          </el-date-picker>
-        </el-form-item>
-      </el-form-item>
-      <el-button type="primary" @click="getDataList()">查询</el-button>
-      <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
-        @click="handleExport">导出</el-button>
-    </el-form>
-    <el-row style="float: right; margin-bottom: 5px">
-      <el-button size="small" @click="editDataList()">编辑</el-button>
-      <el-button size="small" v-if="isSave" @click="saveDataList()">保存</el-button>
-    </el-row>
-    <el-table :data="list" style="width: 100%" :header-cell-style="{
-      background: '#F2F4F9',
-      color: '#606266'
-    }">
-      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
-        <el-table-column prop="lineId" label="生产线">
-          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.lineId" :disabled="disabled"></el-input>
-            <span v-else>{{ scope.row.lineId }} </span>
-          </template>
-        </el-table-column>
-        <el-table-column label="投入数㎡">
-          <el-table-column prop="inputNow" label="本周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputNow }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inputHis" label="上周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputHis }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="inputTrend" label="增减">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.inputTrend }} </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="完成良品产量">
-          <el-table-column prop="goodProductNow" label="本周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductNow }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodProductHis" label="上周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductHis }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodProductTrend" label="增减">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductTrend }} </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="原片漏检率">
-          <el-table-column prop="missCheckNow" label="本周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.missCheckNow }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="missCheckHis" label="上周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
-              <span v-else>{{ scope.row.missCheckHis }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="missCheckTrend" label="增减">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.missCheckTrend }} </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="综合良品率">
-          <el-table-column prop="goodProductPassNow" label="本周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductPassNow }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodProductPassHis" label="上周">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductPassHis }} </span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="goodProductPassTrend" label="增减">
-            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
-              </el-input>
-              <span v-else>{{ scope.row.goodProductPassTrend }} </span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-      </el-table-column>
-      <div style="height: 50px;" class="remark" slot="append">
-        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
-      </div>
-    </el-table>
-    <!-- 搜索工作栏 -->
-    <!-- <SearchBar :formConfigs="searchBarFormConfig" ref="search-bar" @headBtnClick="handleSearchBarBtnClick" /> -->
-
-    <!-- 列表 -->
-    <!-- <base-table :table-props="tableProps" :page="1" :limit="10" :summary-method="getSummaries" show-summary
-      :table-data="list">
-    </base-table> -->
-    <!-- 分页组件 -->
-    <!-- <pagination
-			v-show="total > 0"
-			:total="total"
-			:page.sync="queryParams.pageNo"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList" /> -->
-  </div>
-</template>
-
-<script>
-import {
-  getProductionDataList,
-  updateProductionDataList,
-  updateSumProductionDataList,
-  exportProductExcel
-} from '@/api/report/production';
-// import Editor from '@/components/Editor';
-import moment from 'moment';
-// import DialogForm from './dialogForm.vue';
-
-// import basicPageMixin from '@/mixins/lb/basicPageMixin';
-const tableProps = [
-    {
-      // width: 128,
-    prop: 'lineId',
-    label: '生产线',
-    },
-    {
-      // width: 128,
-      prop: '',
-      label: '投入数㎡',
-      align: 'center',
-      children: [
-        {
-          prop: 'inputNow',
-          label: '本周'
-        },
-        {
-          prop: 'inputHis',
-          label: '上周'
-        },
-        {
-          prop: 'inputTrend',
-          label: '增减'
-        }
-      ]
-    },
-  {
-    // width: 128,
-    prop: '',
-    label: '完成良品产量',
-    align: 'center',
-    children: [
-      {
-        prop: 'goodProductNow',
-        label: '本周'
-      },
-      {
-        prop: 'goodProductHis',
-        label: '上周'
-      },
-      {
-        prop: 'goodProductTrend',
-        label: '增减'
-      }
-    ]
-  },
-  {
-    // width: 128,
-    prop: '',
-    label: '原片漏检率',
-    align: 'center',
-    children: [
-      {
-        prop: 'missCheckNow',
-        label: '本周'
-      },
-      {
-        prop: 'missCheckHis',
-        label: '上周'
-      },
-      {
-        prop: 'missCheckTrend',
-        label: '增减'
-      }
-    ]
-  },
-  {
-    // width: 128,
-    prop: '',
-    label: '综合良品率',
-    align: 'center',
-    children: [
-      {
-        prop: 'goodProductPassNow',
-        label: '本周'
-      },
-      {
-        prop: 'goodProductPassHis',
-        label: '上周'
-      },
-      {
-        prop: 'goodProductPassTrend',
-        label: '增减'
-      }
-    ]
-  },
-  ];
-export default {
-  name: 'statisticalData',
-	// components: {
-	// 	DialogForm,
-	// },
-	// mixins: [basicPageMixin],
-	data() {
-    return {
-      list: [],
-      remark: '',
-      urlOptions: {
-        // getDataListURL: getGlassPage,
-        exportURL: exportProductExcel
-      },
-      // dynamicProps: [],
-      tableProps,
-      timeTips:'',
-      // dataForm: {
-      //   reportTime:undefined
-      // },
-      isSave:false,
-      disabled: true,
-      sumArr: [],
-      weekValue1: null,//最多24周
-      weekValue2: null,
-      searchBarFormConfig: [
-        // {
-        //   type: 'select',
-        //   label: '工单名称',
-        //   placeholder: '请选择工单名称',
-        //   param: 'workOrderIdList',
-        //   selectOptions: [],
-        //   multiple: true,
-        //   labelField: 'name',
-        //   valueField: 'id',
-        //   defaultSelect: []
-        // },
-				// {
-				// 	type: 'select',
-				// 	label: '产品',
-        //   placeholder: '请选择产品',
-        //   param: 'productionId',
-				// 	selectOptions: [],
-				// },
-				// {
-				// 	type: 'input',
-				// 	label: '检测内容',
-				// 	placeholder: '请输入检测内容',
-				// 	param: 'inspectionDetContent',
-				// },
-				{
-					type: 'datePicker',
-					label: '时间段',
-					dateType: 'daterange', // datetimerange
-					// format: 'yyyy-MM-dd HH:mm:ss',
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-					rangeSeparator: '-',
-					startPlaceholder: '开始日期',
-					endPlaceholder: '结束日期',
-					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'checkTime',
-					// width: 350,
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-				// {
-				// 	type: this.$auth.hasPermi(
-				// 		'base:quality-inspection-record:create'
-				// 	)
-				// 		? 'button'
-				// 		: '',
-				// 	btnName: '新增',
-				// 	name: 'add',
-				// 	plain: true,
-				// 	color: 'success',
-				// },
-			],
-      pickerOptionsWeek: {
-        disabledDate(time) {
-          let day = Date.now()
-          let limitTime = moment(day).day(-1)
-          return time.getTime() > new Date(limitTime).getTime()
-        }
-      },
-      reportTime:undefined,
-      dataForm: {
-        // workOrderIdList:undefined,
-        // productionId: undefined,
-        // startTime: undefined,
-        // endTime: undefined,
-        reportTime: [],
-        reportType:2
-				// productionLineId: null,
-			},
-		};
-  },
-	created() {
-		// this.getProductLineList();
-  },
-  mounted() {
-    // if (this.$route.params.startTime && this.$route.params.endTime) {
-    //   this.searchBarFormConfig[0].defaultSelect = [
-    //     this.$route.params.startTime,
-    //     this.$route.params.endTime,
-    //   ];
-    //   this.queryParams.param = {};
-    //   this.$set(
-    //     this.queryParams.param,
-    //     'startTime',
-    //     this.$route.params.startTime
-    //   );
-    //   this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime);
-    // } else {
-    //   this.searchBarFormConfig[0].defaultSelect = [];
-    // }
-    this.getDataList()
-  },
-  methods: {
-    format(shijianchuo) {
-      //shijianchuo是整数，否则要parseInt转换
-      var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
-      // console.log(time)
-      // var y = time.getFullYear();
-      // var m = time.getMonth() + 1;
-      // var d = time.getDate();
-      // var h = time.getHours();
-      // var mm = time.getMinutes();
-      // var s = time.getSeconds();
-      return time
-    },
-    changeTime(val) {
-      if (val) {
-        // console.log(val)
-        // console.log(val.setHours(7, 0, 0))
-        // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
-        // let time = this.format(val.setHours(7, 0, 0))
-        this.dataForm.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.dataForm.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
-        console.log(this.dataForm.reportTime);
-      } else {
-        this.dataForm.reportTime = []
-      }
-    },
-    editDataList() {
-      this.disabled = false
-      this.isSave = true
-    },
-    async saveDataList() {
-      let obj = {}
-      this.list.forEach((ele, index) => {
-        if (ele.det === false) {
-          this.list[index].lineId = ''
-          this.list[index].remark = this.remark
-          obj = ele
-          this.list.splice(index,1)
-        }
-      })
-      let updateArr = this.list
-      // console.log(JSON.stringify(updateArr[1]))
-      const result = await Promise.all([
-        await updateSumProductionDataList(obj),
-        await updateProductionDataList(updateArr),
-      ]);
-      if (result[0].data == true && result[1].data == true) {
-        // console.log(res)
-        this.disabled = true
-        this.isSave = false
-        this.getDataList()
-      } else {
-        this.$modal.msgError('更新失败');
-      }
-    },
-    handleExport() {
-      // 处理查询参数
-      let params = { ...this.dataForm };
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return this.urlOptions.exportURL(params);
-      }).then(response => {
-        this.$download.excel(response, '成品生产日报.xls');
-        this.exportLoading = false;
-      }).catch(() => { });
-    },
-    async getDataList() {
-      // if (this.weekValue1 && this.weekValue2) {
-      //   this.dataForm.reportTime[0] = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00'
-      //   // this.queryParams.startTime = this.monthValue[0]
-      //   this.dataForm.reportTime[1] = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59'
-      //   this.timeTips = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' - ' + moment(this.weekValue2).day(0).format('YYYY-MM-DD')
-      // } else {
-      // }
-			this.loading = true;
-			// 执行查询
-      const res = await this.$axios({
-        url: '/base/report-auto-production/page',
-        method: 'get',
-        params: this.dataForm
-      })
-      // console.log(this.queryParams);
-      console.log(res)
-      // let sum = undefined
-      // res.data.list.forEach((ele, index) => {
-      //   if (ele.det === false) {
-      //    sum = res.data.list.splice(index, 1)
-      //   }
-      // })
-      res.data.list.forEach((ele,index) => {
-        if (ele.det === false) {
-          res.data.list[index].lineId = '合计'
-          this.remark = res.data.list[index].remark
-        }
-      });
-      this.list = res.data.list
-    },
-	},
-};
-</script>
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 15:59:13
+ * @LastEditTime: 2024-03-04 16:51:38
 * @LastEditors: zhp
 * @Description:
 -->
@ -32,26 +32,26 @@
      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
        <el-table-column prop="lineId" label="生产线">
          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.lineId" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.lineId }} </span>
          </template>
        </el-table-column>
        <el-table-column label="投入数㎡">
          <el-table-column prop="inputNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputTrend }} </span>
            </template>
          </el-table-column>
@ -59,21 +59,21 @@
        <el-table-column label="完成良品产量">
          <el-table-column prop="goodProductNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductTrend }} </span>
            </template>
@ -82,19 +82,19 @@
        <el-table-column label="原片漏检率">
          <el-table-column prop="missCheckNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.missCheckTrend }} </span>
            </template>
@ -103,21 +103,21 @@
        <el-table-column label="综合良品率">
          <el-table-column prop="goodProductPassNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassTrend }} </span>
            </template>
@ -126,7 +126,9 @@
      </el-table-column>
      <div style="height: 50px;" class="remark" slot="append">
        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
+        <el-input v-if="!disabled" v-model="remark" :disabled="disabled">
+        </el-input>
+        <span v-else>{{ remark }} </span>
      </div>
    </el-table>
    <!-- 搜索工作栏 -->
@ -363,9 +365,25 @@ export default {
    // } else {
    //   this.searchBarFormConfig[0].defaultSelect = [];
    // }
+    this.getCurrentWeekStartTimeAndEndTime()
    this.getDataList()
  },
  methods: {
+    getCurrentWeekStartTimeAndEndTime() {
+      const current = new Date();
+      // current是本周的第几天
+      let nowDayOfWeek = current.getDay();
+      if (nowDayOfWeek === 0) nowDayOfWeek = 7;
+      const dayNum = 1 * 24 * 60 * 60 * 1000;
+      // 获取本周星期一的时间，星期一作为一周的第一天
+      const firstDate = new Date(current.valueOf() - (nowDayOfWeek - 1) * dayNum);
+      // 获取本周星期天的时间，星期天作为一周的最后一天
+      const lastDate = new Date(new Date(firstDate).valueOf() + 6 * dayNum);
+      // return {
+      this.weekValue1 = new Date(firstDate)
+      this.weekValue2 = new Date(lastDate)
+      // };
+    },
    handleExport() {
      // 处理查询参数
      let params = { ...this.dataForm };
@ -380,6 +398,7 @@ export default {
      }).catch(() => { });
    },
    startWeek() {
+      // console.log(this.weekValue1);
      if (this.weekValue1 && this.weekValue2) {
        let a = new Date(this.weekValue1).getTime()
        let b = new Date(this.weekValue2).getTime()
--- a/src/views/report/productionYearReport/index.vue
+++ b/src/views/report/productionYearReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-01-24 15:59:21
+ * @LastEditTime: 2024-03-05 09:47:42
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,11 +9,9 @@
  <div class="app-container">
    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
      <el-form-item>
-        <el-date-picker style='width:170px;' v-model="yearValue1" type="year" :picker-options="pickerOptions"
-          value-format="timestamp" placeholder="选择年" @change="startYear" size="small" :clearable="false">
-        </el-date-picker>-
-        <el-date-picker style='width:170px;' v-model="yearValue2" type="year" :picker-options="pickerOptions"
-          value-format="timestamp" placeholder="选择年" @change="endYear" size="small" :clearable="false">
+        <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
+          :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          style="width: 350px" placeholder="选择年">
        </el-date-picker>
      </el-form-item>
      <el-button type="primary" @click="getDataList()">查询</el-button>
@ -34,26 +32,26 @@
      <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
        <el-table-column prop="lineId" label="生产线">
          <template slot-scope="scope">
-            <el-input v-if="scope.row.det === true" v-model="scope.row.lineId" :disabled="disabled"></el-input>
+            <el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input>
            <span v-else>{{ scope.row.lineId }} </span>
          </template>
        </el-table-column>
        <el-table-column label="投入数㎡">
          <el-table-column prop="inputNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="inputTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.inputTrend }} </span>
            </template>
          </el-table-column>
@ -61,21 +59,21 @@
        <el-table-column label="完成良品产量">
          <el-table-column prop="goodProductNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductTrend }} </span>
            </template>
@ -84,19 +82,19 @@
        <el-table-column label="原片漏检率">
          <el-table-column prop="missCheckNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
+              <el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
              <span v-else>{{ scope.row.missCheckHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="missCheckTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.missCheckTrend }} </span>
            </template>
@ -105,21 +103,21 @@
        <el-table-column label="综合良品率">
          <el-table-column prop="goodProductPassNow" label="本周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassNow }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassHis" label="上周">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassHis }} </span>
            </template>
          </el-table-column>
          <el-table-column prop="goodProductPassTrend" label="增减">
            <template slot-scope="scope">
-              <el-input v-if="scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
+              <el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled">
              </el-input>
              <span v-else>{{ scope.row.goodProductPassTrend }} </span>
            </template>
@ -128,7 +126,9 @@
      </el-table-column>
      <div style="height: 50px;" class="remark" slot="append">
        <h3 style="float: left;text-align: center;margin-left: 20px;">备注：</h3>
-        <el-input :disabled="disabled" style="float:right;width: 96%;margin-top: 8px;" v-model="remark"></el-input>
+        <el-input v-if="!disabled" v-model="remark" :disabled="disabled">
+        </el-input>
+        <span v-else>{{ remark }} </span>
      </div>
    </el-table>
    <!-- 搜索工作栏 -->
@ -158,7 +158,7 @@ import {
 // import Editor from '@/components/Editor';
 import moment from 'moment';
 // import DialogForm from './dialogForm.vue';
-
+import { parseTime } from '../../core/mixins/code-filter';
 // import basicPageMixin from '@/mixins/lb/basicPageMixin';
 const tableProps = [
    {
@ -265,6 +265,9 @@ export default {
      yearValue2: null,
      // dynamicProps: [],
      tableProps,
+      reportTime: [],
+      startTimeStamp: '',
+      endTimeStamp: '',
      dataForm: {
        // workOrderIdList:undefined,
        // productionId: undefined,
@ -344,7 +347,9 @@ export default {
 			],
 		};
  },
-	created() {
+  created() {
+    this.getCurrentYearFirst()
+
 		// this.getProductLineList();
  },
  mounted() {
@ -366,6 +371,16 @@ export default {
    this.getDataList()
  },
  methods: {
+    getCurrentYearFirst() {
+      let date = new Date();
+      date.setDate(1);
+      date.setMonth(0);
+      this.reportTime = date;
+      this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1).getTime()); //开始时间
+      this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间
+      this.dataForm.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+      this.dataForm.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100
+    },
    handleExport() {
      // 处理查询参数
      let params = { ...this.dataForm };
@ -379,34 +394,34 @@ export default {
        this.exportLoading = false;
      }).catch(() => { });
    },
-    startYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
-        this.yearValue1 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue1 = null
-          return false
-        }
-      }
-    },
-    endYear() {
-      if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
-        this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
-        this.yearValue2 = null
-        return false
-      }
-      if (this.yearValue1 && this.yearValue2) {
-        if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
-          this.$modal.msgError('最大时间范围为10年，请重新选择')
-          this.yearValue2 = null
-          return false
-        }
-      }
-    },
+    // startYear() {
+    //   if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
+    //     this.$modal.msgError('开始时间不能晚于结束时间，请重新选择')
+    //     this.yearValue1 = null
+    //     return false
+    //   }
+    //   if (this.yearValue1 && this.yearValue2) {
+    //     if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
+    //       this.$modal.msgError('最大时间范围为10年，请重新选择')
+    //       this.yearValue1 = null
+    //       return false
+    //     }
+    //   }
+    // },
+    // endYear() {
+    //   if (this.yearValue2 && this.yearValue2 < this.yearValue1) {
+    //     this.$modal.msgError('结束时间不能早于开始时间，请重新选择')
+    //     this.yearValue2 = null
+    //     return false
+    //   }
+    //   if (this.yearValue1 && this.yearValue2) {
+    //     if (this.yearValue2 - this.yearValue1 > 10 * 365 * 24 * 3600000) {
+    //       this.$modal.msgError('最大时间范围为10年，请重新选择')
+    //       this.yearValue2 = null
+    //       return false
+    //     }
+    //   }
+    // },
    editDataList() {
      this.disabled = false
      this.isSave = true
@ -442,15 +457,37 @@ export default {
      let value = newData
      return value
    },
+    changeTime(val) {
+      console.log(val);
+      if (val) {
+        // let timeStamp = val.getTime(); //标准时间转为时间戳，毫秒级别
+        this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1).getTime()); //开始时间
+        this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间
+        this.dataForm.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.dataForm.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+      } else {
+        this.dataForm.reportTime = []
+      }
+    },
+
+    //时间戳转为yy-mm-dd hh:mm:ss
+    timeFun(unixtimestamp) {
+      var unixtimestamp = new Date(unixtimestamp);
+      var year = 1900 + unixtimestamp.getYear();
+      var month = "0" + (unixtimestamp.getMonth() + 1);
+      var date = "0" + unixtimestamp.getDate();
+      return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length)
+    },
    async getDataList() {
+      console.log(this.yearValue1);
      if (this.yearValue1 && this.yearValue2) {
        if (this.yearValue2 < this.yearValue1) {
          this.$modal.msgError('结束时间不能早于开始时间')
          return false
        } else {
-          this.dataForm.reportTime[0] = this.transformYear(this.yearValue1)
-          this.dataForm.reportTime[1] = this.transformYear(this.yearValue2)
-          this.timeTips = this.transformYear(this.yearValue1) + " - "  + this.transformYear(this.yearValue1)
+          // this.dataForm.reportTime[0] = this.transformYear(this.yearValue1)
+          // this.dataForm.reportTime[1] = this.transformYear(this.yearValue2)
+          // this.timeTips = this.transformYear(this.yearValue1) + " - "  + this.transformYear(this.yearValue1)
        }
      }
 			this.loading = true;
--- a/src/views/specialEquipment/check/Config.vue
+++ b/src/views/specialEquipment/check/Config.vue
@ -45,7 +45,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="handleConfirm">
-			<add ref="add" @refreshDataList="successSubmit" />
+			<add ref="add" v-if="open" @refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata
--- a/src/views/specialEquipment/check/Content.vue
+++ b/src/views/specialEquipment/check/Content.vue
@ -86,7 +86,7 @@ export default {
 					? {
 							type: 'edit',
 							btnName: '修改',
-					  }
+						}
 					: undefined,
 				{
 					type: 'detail',
@ -96,7 +96,7 @@ export default {
 					? {
 							type: 'delete',
 							btnName: '删除',
-					  }
+						}
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
@ -257,16 +257,14 @@ export default {
 						this.$message.warning('请选择待确认的巡检单');
 						return;
 					}
-					let checkPersonParam = '';
-					if (!row.checkPerson || row.checkPerson.trim() == '') {
-						/** 如有必要，更新巡检人 */
-						checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-					}
+					//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.nickname}` +
-							checkPersonParam,
+					const res = await this.$axios({
+						url: `/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(
@ -337,8 +335,8 @@ export default {

 					return this.$axios({
 						url:
-							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` +
-							checkPersonParam,
+							`/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],
--- a/src/views/specialEquipment/check/add.vue
+++ b/src/views/specialEquipment/check/add.vue
@ -235,7 +235,7 @@ export default {
 					...this.dataForm,
 					special: true,
 					status: 0,
-					groupClass: this.dataForm.groupClass.join(','),
+					groupClass: this.dataForm.groupClass?.join(','),
 				},
 			});
 			if (res.code == 0) {
--- a/src/views/specialEquipment/maintain/PlanConfig--add.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue
@ -123,7 +123,7 @@
 							type: 'number',
 							message: '请输入正确的数字',
 							trigger: 'blur',
-							transform: (val) => Number(val),
+							transform: (val) => Number(val) && parseInt(val) === Number(val),
 						},
 						{ required: true, message: '保养频率不能为空', trigger: 'blur' },
 					]">
--- a/src/views/specialEquipment/maintain/Repair--add.vue
+++ b/src/views/specialEquipment/maintain/Repair--add.vue
@ -409,7 +409,8 @@ const uploadedFile = {
 		return {};
 	},
 	methods: {
-		handleDelete() {
+		handleDelete(e) {
+			e.stopPropagation();
 			this.$emit('delete', this.file);
 		},
 		async handleDownload() {
@ -610,7 +611,8 @@ export default {
 			const response = await this.$axios('/base/core-equipment/listAll');
 			this.equipmentList = response.data || [];
 			const equipmentOptions = (response.data || [])
-				.filter((item) => (type == 'special-equipment' ? item.special : true))
+				// .filter((item) => (type == 'special-equipment' ? item.special : true))
+				.filter((item) => item.special == true)
 				.map((item) => ({
 					label: item.name,
 					value: item.id,
Author	SHA1	Message	Date
‘937886381’	a80ce13de1	解决冲突	2024-03-05 09:49:01 +08:00
‘937886381’	a027c4ca63	修改bug	2024-03-05 09:48:16 +08:00
juzi	267ee0015c	Merge pull request 'projects/mesxc-zjl' (#231 ) from projects/mesxc-zjl into projects/mesxc-test Reviewed-on: #231	2024-03-04 14:10:21 +08:00
juzi	9a6aa75171	merge test	2024-03-04 14:09:07 +08:00
juzi	41b79ba82c	Merge pull request 'projects/mesxc-lb' (#230 ) from projects/mesxc-lb into projects/mesxc-test Reviewed-on: #230	2024-03-04 14:07:08 +08:00
Melete	0a1175075d	Merge branch 'projects/mesxc-test' into projects/mesxc-lb	2024-03-04 14:04:37 +08:00
Melete	50cfcc3af2	update	2024-03-04 14:01:53 +08:00
juzi	d44f76b641	集团-包装要求	2024-03-04 13:56:42 +08:00
juzi	ac36dea881	Merge pull request 'projects/mesxc-dy' (#229 ) from projects/mesxc-dy into projects/mesxc-test Reviewed-on: #229	2024-03-04 12:24:25 +08:00
helloDy	063532567b	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-03-04 12:04:50 +08:00
juzi	873653b56d	Merge pull request 'projects/mesxc-lb' (#227 ) from projects/mesxc-lb into projects/mesxc-test Reviewed-on: #227	2024-03-04 11:19:32 +08:00
helloDy	b2c6a5fae9	Merge branch 'projects/mesxc-test' into projects/mesxc-dy	2024-03-04 11:15:49 +08:00
helloDy	17b675cd13	checkperson delete	2024-03-04 11:15:09 +08:00
Melete	3aa3361559	merge	2024-03-04 11:01:48 +08:00
Melete	6df8c3bcc1	1	2024-03-04 10:53:04 +08:00
Melete	da0aa4aa75	bugfix	2024-03-04 10:47:57 +08:00
juzi	3b6483f013	Merge pull request 'projects/mesxc-dy' (#226 ) from projects/mesxc-dy into projects/mesxc-test Reviewed-on: #226	2024-03-04 07:52:03 +08:00
helloDy	e509722ac4	env	2024-03-01 20:41:09 +08:00
helloDy	48e7612a78	bug second	2024-03-01 20:39:52 +08:00
juzi	679f31af97	Merge pull request 'projects/mesxc-zhp' (#225 ) from projects/mesxc-zhp into projects/mesxc-test Reviewed-on: #225	2024-03-01 15:30:10 +08:00