src/components/DialogForm/index.vue

@@ -101,9 +101,7 @@
 								}
 							"
 							v-bind="col.bind">
-							<el-button
+							<el-button size="mini" :disabled="disabled || col.bind?.disabled || false">
-								size="mini"
-								:disabled="disabled || col.bind?.disabled || false">
 								<svg-icon
 									icon-class="icon-upload"
 									style="color: inherit"></svg-icon>
@@ -412,26 +410,8 @@ export default {
 			}
 			if (!promiseList.length) this.formLoading = false;
 		},
-
 		// 上传成功的特殊处理
-		beforeUpload(file) {
+		beforeUpload() {},
-			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();
-		},
-
 		// 上传前的验证规则可通过 bind 属性传入
 		handleUploadSuccess(response, file, prop) {
 			console.log('[handleUploadSuccess]', response, file, prop);

src/views/specialEquipment/basic/FireFighthing.vue

@@ -170,19 +170,19 @@ export default {
 				{ width: 256, prop: 'code', label: '设备编码' },
 				{ prop: 'location', label: '位置' },
 				{ prop: 'responsiblePeopleName', label: '负责人' },
-				{ prop: 'dueTime', label: '有效期至' },
+				{ prop: 'dueDate', label: '有效期至' },
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '设备名称',
+					label: '名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '设备编码',
+					label: '编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},
@@ -251,7 +251,7 @@ export default {
 					{
 						datetime: true,
 						label: '有效期至',
-						prop: 'dueTime',
+						prop: 'dueDate',
 						bind: { clearable: true },
 					},
 					{},

src/views/specialEquipment/basic/Safety.vue

@@ -175,13 +175,13 @@ export default {
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '设备名称',
+					label: '名称',
 					placeholder: '请输入设备名称',
 					param: 'name',
 				},
 				{
 					type: 'input',
-					label: '设备编码',
+					label: '编码',
 					placeholder: '请输入设备编码',
 					param: 'code',
 				},

src/views/specialEquipment/check/Record-add.vue

@@ -54,7 +54,6 @@
 						<el-select
 							v-model="dataForm.equipmentId"
 							filterable
-							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择设备名称"
@@ -75,7 +74,6 @@
 						<el-select
 							v-model="dataForm.configId"
 							filterable
-							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择巡检配置"
@@ -123,7 +121,6 @@
 						<el-select
 							v-model="dataForm.origin"
 							filterable
-							clearable
 							:disabled="isdetail"
 							style="width: 100%"
 							placeholder="请选择数据来源">

src/views/specialEquipment/maintain/PlanConfig.vue

@@ -353,7 +353,7 @@ export default {
 				queryData.createTime = this.queryParams.createTime;
 			}
 			this.$router.push({
-				path: '/safety-environmental/special-equipment/equipment-maintain/maintain-record',
+				path: '/equipment/base/maintain/record',
 				query: queryData,
 			});
 			// this.$router.push({ path: '/equipment/base/maintain/record', query: { orderNo: row.orderNo }})

src/views/specialEquipment/maintain/Record.vue

@@ -556,19 +556,6 @@ export default {
 				this.form.relatePlan = tempRow.nextMaintainTime ? 1 : 2;
 				this.form.startTime = tempRow.nextMaintainTime;
 				this.form.maintainPlanId = tempRow.id;
-				// await (() => {
-				// 	return new Promise((acpt, rejt) => {
-				// 		this.form.relatePlan =
-				// 			this.$route.query.relatePlan ||
-				// 			(tempRow.nextMaintainTime ? 1 : 2);
-				// 		this.form.startTime = tempRow.nextMaintainTime;
-				// 		acpt();
-				// 	});
-				// })();
-				// this.$nextTick(() => {
-				// 	this.form.maintainPlanId = tempRow.id;
-				// 	this.form.equipmentId = tempRow.equipmentId;
-				// });
 			}
 			if (this.$route.query.isAdd) {
 				// 赋值