src/utils/dict.js

@@ -107,9 +107,6 @@ export const DICT_TYPE = {
   // ============== EQUIPMENT - 设备模块 =============
   MAINTAIN_TYPE: 'maintain_type',
   FAULT_LEVEL: 'fault-level',
-  FAULT_TYPE: 'fault-type',
-  REPAIR_MODE: 'repair-mode',
-  REPAIR_RESULT: 'repair-result',
 
   // ============== ENVIRONMENTAL - 环保模块 =============
   ENVIRONMENT_CHECK_UNIT: 'environment_check_unit'

src/views/specialEquipment/check/Config.vue

@@ -2,7 +2,7 @@
     filename: Content.vue
     author: liubin
     date: 2023-12-12 13:53:22
-    description: 巡检单设置
+    description: 
 -->
 
 <template>
@@ -59,7 +59,6 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import addOrUpdata from './add-or-updata.vue';
 import add from './add.vue';
-import { parseTime } from '../../core/mixins/code-filter';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
@@ -69,7 +68,7 @@ export default {
 		return {
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
-			searchBarKeys: ['name'],
+			searchBarKeys: ['equipmentId', 'name', 'specialType'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-setting:addInsp')
 					? {
@@ -100,49 +99,55 @@ export default {
 			tableProps: [
 				{
 					prop: 'name',
-					label: '巡检单名称',
+					label: '配置名',
-					width: 100,
+					width: 110,
 					showOverflowtooltip: true,
 				},
+				{ prop: 'lineName', label: '产线', showOverflowtooltip: true },
 				{
-					prop: 'code',
+					prop: 'equipmentCategory',
-					label: '巡检单编码',
+					label: '设备大类',
-					showOverflowtooltip: true,
+					filter: (val) =>
+						val != null ? ['-', '安全', '消防', '特种'][val] : '-',
 				},
+				{ prop: 'equipmentName', label: '设备', showOverflowtooltip: true },
 				{
-					prop: 'department',
+					prop: 'equipmentCode',
-					label: '部门',
+					label: '设备编码',
-					width: 100,
+					minWidth: 150,
 					showOverflowtooltip: true,
 				},
-				{
+				{ prop: 'responsible', label: '负责人' },
-					prop: 'planCheckTime',
+				{ prop: 'remark', label: '描述' },
-					label: '计划巡检时间',
+				{ prop: 'checkNumber', label: '巡检条数' }, // TODO: 操作 选项，四个，群里询问
-					showOverflowtooltip: true,
-					filter: parseTime,
-				},
-				{
-					prop: 'confirmTimeLimit',
-					label: '确认时限',
-					showOverflowtooltip: true,
-				},
-				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
-				{ prop: 'creator', label: '创建人', showOverflowtooltip: true },
-				{
-					prop: 'createTime',
-					label: '创建时间',
-					showOverflowtooltip: true,
-					filter: parseTime,
-				},
-				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
 				{
 					type: 'input',
-					label: '巡检单名称',
+					label: '配置名称',
-					placeholder: '请输入巡检单名称',
+					placeholder: '请输入配置名称',
 					param: 'name',
 				},
+				{
+					type: 'select',
+					label: '设备大类',
+					placeholder: '请选择设备大类',
+					param: 'specialType',
+					onchange: true,
+					selectOptions: [
+						{ id: 1, name: '安全设备' },
+						{ id: 2, name: '消防设备' },
+						{ id: 3, name: '特种设备' },
+					],
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '设备名称',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					filterable: true,
+				},
 				{
 					type: 'button',
 					btnName: '查询',
@@ -221,11 +226,14 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
+				equipmentId: null,
 				name: null,
+				special: true,
+				specialType: null,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-order',
+			basePath: '/base/equipment-check-config',
 			mode: null,
 			allSpecialEquipments: [],
 		};

src/views/specialEquipment/check/Record.vue

@@ -80,7 +80,7 @@ export default {
 	data() {
 		return {
 			addOrUpdateVisible: false,
-			searchBarKeys: ['name', 'actualCheckTime'],
+			searchBarKeys: ['equipmentId', 'actualTime', 'specialType'],
 			tableBtn: [
 				this.$auth.hasPermi('equipment:check-record:detail')
 					? {
@@ -102,69 +102,43 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '巡检单名称' },
+				{ prop: 'configName', label: '配置名称' },
-				{ prop: 'department', label: '部门' },
+				{ prop: 'equipmentName', label: '设备名称' },
-				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
-				{ prop: 'groupClass', label: '班次' },
 				{
-					prop: '_detail',
+					prop: 'origin',
-					label: '巡检内容',
+					label: '数据来源',
-					subcomponent: {
+					filter: (val) => ['', '手动', 'PDA'][val],
-						name: 'ViewDetail',
-						props: ['injectData'],
-						data() {
-							return {};
 				},
-						methods: {
+				// { prop: 'sectionName', label: '计划巡检时间' },
-							handleClick() {
+				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
-								this.$emit('emitData', {
+				// { prop: 'maintenanceDetail', label: '完成状态' },
-									action: this.injectData.label,
+				{ prop: 'responsible', label: '巡检人' },
-									value: this.injectData,
-								});
-							},
-						},
-						render: function (h) {
-							return (
-								<el-button type="text" onClick={this.handleClick}>
-									详情
-								</el-button>
-							);
-						},
-					},
-				},
-				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
-				// {
-				// 	type: 'select',
-				// 	label: '设备大类',
-				// 	placeholder: '请选择设备大类',
-				// 	param: 'specialType',
-				// 	onchange: true,
-				// 	selectOptions: [
-				// 		{ id: 1, name: '安全设备' },
-				// 		{ id: 2, name: '消防设备' },
-				// 		{ id: 3, name: '特种设备' },
-				// 	],
-				// 	filterable: true,
-				// },
-				// {
-				// 	type: 'select',
-				// 	label: '设备',
-				// 	placeholder: '请选择设备',
-				// 	param: 'equipmentId',
-				// 	filterable: true,
-				// },
 				{
-					type: 'input',
+					type: 'select',
-					label: '巡检单名称',
+					label: '设备大类',
-					placeholder: '请输入巡检单名称',
+					placeholder: '请选择设备大类',
-					param: 'name',
+					param: 'specialType',
+					onchange: true,
+					selectOptions: [
+						{ id: 1, name: '安全设备' },
+						{ id: 2, name: '消防设备' },
+						{ id: 3, name: '特种设备' },
+					],
+					filterable: true,
+				},
+				{
+					type: 'select',
+					label: '设备',
+					placeholder: '请选择设备',
+					param: 'equipmentId',
+					filterable: true,
 				},
 				// 开始结束时间
 				{
 					type: 'datePicker',
-					label: '巡检时间',
+					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
@@ -172,7 +146,7 @@ export default {
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
-					param: 'actualCheckTime',
+					param: 'actualTime',
 					// width: 350,
 				},
 				{
@@ -278,20 +252,21 @@ export default {
 			queryParams: {
 				pageNo: 1,
 				pageSize: 10,
-				actualTime: null,
+				maintenanceStatus: null,
-				configId: null,
+				createTime: null,
+				equipmentId: null,
 				special: true,
 				specialType: null,
 			},
 			// 表单参数
 			form: {},
-			basePath: '/base/equipment-check-order',
+			basePath: '/base/equipment-check-log',
 			mode: null,
 			allSpecialEquipments: [],
 		};
 	},
 	created() {
-		// this.initSearchBar();
+		this.initSearchBar();
 		this.getList();
 	},
 	methods: {
@@ -328,8 +303,7 @@ export default {
 			this.loading = true;
 			// 执行查询
 			this.recv(this.queryParams).then((response) => {
-				// this.list = response.data.list;
+				this.list = response.data.list;
-				this.list = [{}];
 				this.total = response.data.total;
 				this.loading = false;
 			});

src/views/specialEquipment/maintain/CustomDialogForm.vue

@@ -21,26 +21,37 @@
 					label-position="top"
 					v-loading="formLoading">
 					<el-row :gutter="20">
+						<el-col :span="8">
+							<el-form-item label="维修单号" prop="repairOrderNumber">
+								<span>{{ dataForm.repairOrderNumber }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="设备大类" prop="equipmentCategory">
+								<span>
+									{{
+										['-', '安全设备', '消防设备', '特种设备'][
+											dataForm.equipmentCategory || 0
+										]
+									}}
+								</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="设备名称" prop="equipmentName">
+								<span>{{ dataForm.equipmentName }}</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="维修工" prop="repairman">
+								<span>{{ dataForm.repairman }}</span>
+							</el-form-item>
+						</el-col>
 						<el-col :span="8">
 							<el-form-item label="故障发生时间" prop="faultTime">
 								<span>{{ parseTime(dataForm.faultTime) }}</span>
 							</el-form-item>
 						</el-col>
-
-						<!-- <el-col :span="8">
-							<el-form-item label="故障级别" prop="faultLevel">
-								<span>
-									{{
-										dataForm.faultLevel
-											? getDictDatas(DICT_TYPE.FAULT_LEVEL).find(
-													(item) => item.value == dataForm.faultLevel
-											  )?.label
-											: '---'
-									}}
-								</span>
-							</el-form-item>
-						</el-col> -->
-
 						<el-col :span="8">
 							<el-form-item label="故障级别" prop="faultLevel">
 								<span>
@@ -48,68 +59,163 @@
 								</span>
 							</el-form-item>
 						</el-col>
-
-						<el-col :span="8">
-							<el-form-item label="故障类型" prop="faultType">
-								<span>
-									{{ getDictDataLabel('fault-type', dataForm.faultType) }}
-								</span>
-							</el-form-item>
-						</el-col>
-
-						<el-col :span="8">
-							<el-form-item label="维修工" prop="repairman">
-								<span>{{ dataForm.repairman }}</span>
-							</el-form-item>
-						</el-col>
-
 						<el-col :span="8">
 							<el-form-item label="联系方式" prop="repairmanPhone">
 								<span>{{ dataForm.repairmanPhone }}</span>
 							</el-form-item>
 						</el-col>
+					</el-row>
 
-						<el-col :span="8">
+					<el-divider />
-							<el-form-item label="维修方式" prop="repairMode">
-								<span>
-									{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}
-								</span>
-							</el-form-item>
-						</el-col>
 
-						<el-col :span="24">
+					<div
-							<el-form-item label="维修附件" prop="files">
+						v-if="
-								<div v-if="dataForm.files && dataForm.files.length > 0">
+							disabled && dataForm.maintenanceStatus === 1
-									<uploadedFile
+								? true
-										class="file"
+								: !disabled
-										v-for="file in dataForm.files"
+								? true
-										:file="file"
+								: false
-										:key="file.fileUrl"
+						">
+						<small-title
+							style="margin: 16px 0; padding-left: 8px"
+							:no-padding="true">
+							{{ '设备维修信息' }}
+						</small-title>
+						<el-row :gutter="20">
+							<el-col :span="6">
+								<el-form-item
+									label="维修开始时间"
+									prop="maintenanceStartTime"
+									:rules="[
+										{
+											required: true,
+											message: '维修开始时间不能为空',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="dataForm.maintenanceStartTime"
+										type="datetime"
 										:disabled="disabled"
-										@delete="!disabled && handleDeleteFile(file, col.prop)" />
+										placeholder="请选择维修开始时间"
-								</div>
+										value-format="timestamp" />
-								<p v-else>暂无附件</p>
 								</el-form-item>
 							</el-col>
-
+							<el-col :span="6">
-						<el-col :span="8">
+								<el-form-item
-							<el-form-item label="创建时间" prop="createTime">
+									label="维修结束时间"
-								<span>{{ parseTime(dataForm.createTime) }}</span>
+									prop="maintenanceFinishTime"
+									:rules="[
+										{
+											required: true,
+											message: '维修结束时间不能为空',
+											trigger: 'blur',
+										},
+									]">
+									<el-date-picker
+										v-model="dataForm.maintenanceFinishTime"
+										type="datetime"
+										:disabled="disabled"
+										placeholder="请选择维修开始时间"
+										value-format="timestamp" />
 								</el-form-item>
 							</el-col>
-
+							<el-col :span="6">
-						<el-col :span="8">
+								<el-form-item
-							<el-form-item label="创建人" prop="creator">
+									label="维修方式"
-								<span>{{ dataForm.creator }}</span>
+									prop="repairMode"
+									:rules="[
+										{
+											required: true,
+											message: '维修方式不能为空',
+											trigger: 'blur',
+										},
+									]">
+									<el-select
+										:disabled="disabled"
+										v-model="dataForm.repairMode"
+										placeholder="请选择维修方式">
+										<el-option
+											v-for="opt in getDictDatas('repair-mode')"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
 								</el-form-item>
 							</el-col>
-
+							<el-col :span="6">
-						<el-col :span="24">
+								<el-form-item label="故障类型" prop="faultType">
-							<el-form-item label="备注" prop="remark">
+									<el-select
-								<span>{{ dataForm.remark }}</span>
+										:disabled="disabled"
+										v-model="dataForm.faultType"
+										placeholder="请选择故障类型">
+										<el-option
+											v-for="opt in getDictDatas('fault-type')"
+											:key="opt.value"
+											:label="opt.label"
+											:value="opt.value" />
+									</el-select>
 								</el-form-item>
 							</el-col>
 						</el-row>
+
+						<el-row :gutter="20">
+							<el-col>
+								<el-form-item
+									label="故障明细"
+									prop="faultDetail"
+									:rules="[
+										{
+											required: true,
+											message: '故障明细不能为空',
+											trigger: 'blur',
+										},
+									]">
+									<!-- // 富文本 -->
+									<editor
+										v-model="dataForm.faultDetail"
+										:read-only="disabled"
+										:min-height="150" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="20">
+							<el-col>
+								<el-form-item label="维修记录" prop="maintenanceDetail">
+									<!-- // 富文本 -->
+									<editor
+										v-model="dataForm.maintenanceDetail"
+										:read-only="disabled"
+										:min-height="150" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="20">
+							<el-col>
+								<el-form-item label="维修附件" prop="file">
+									<FileUpload
+										v-model="file"
+										:limit="1"
+										:f-name="fileName"
+										:disabled="disabled"
+										@name="setFileName" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+
+						<el-row :gutter="20">
+							<el-col>
+								<el-form-item label="备注" prop="remark">
+									<el-input
+										v-model="dataForm.remark"
+										:placeholder="`请输入备注`"
+										:disabled="disabled" />
+								</el-form-item>
+							</el-col>
+						</el-row>
+					</div>
 				</el-form>
 
 				<div v-if="!disabled" class="drawer-body__footer">
@@ -124,74 +230,11 @@
 <script>
 import SmallTitle from './SmallTitle.vue';
 import { getEqRepair, updateEqRepair } from '@/api/equipment/base/repair';
-// import Editor from '@/components/Editor';
+import Editor from '@/components/Editor';
-// import FileUpload from '@/components/FileUpload';
+import FileUpload from '@/components/FileUpload';
 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',
-	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',
@@ -200,7 +243,7 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: { SmallTitle, uploadedFile }, //, Editor, FileUpload },
+	components: { SmallTitle, Editor, FileUpload },
 	props: {
 		// dataForm: {
 		// 	type: Object,
@@ -240,8 +283,12 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-
+		initData() {
+			this.file = '';
+			this.fileName = '';
+		},
 		init(row, isdetail) {
+			this.initData();
 			this.disabled = isdetail || false;
 			this.dataForm.id = row.id || undefined;
 			this.visible = true;
@@ -254,14 +301,20 @@ export default {
 					getEqRepair(this.dataForm.id).then((response) => {
 						this.formLoading = false;
 						this.dataForm = response.data;
-					});
+						debugger;
+						this.dataForm.maintenanceStatus =
+							this.dataForm.maintenanceStatus || 0;
+						if (this.dataForm.files.length > 0) {
+							this.file = this.dataForm.files[0].fileUrl;
+							this.fileName = this.dataForm.files[0].fileName;
+						}
+					});
+				} else {
+					// if (this.urlOptions.isGetCode) {
+					//   this.getCode()
+					// }
 				}
 			});
-		},
-		handleDeleteFile(file, prop) {
-			this.dataForm.files = this.dataForm.files.filter(
-				(item) => item.fileUrl != file.fileUrl
-			);
 		},
 		// 表单提交
 		dataFormSubmit() {

src/views/specialEquipment/maintain/Repair--add.vue

@@ -37,7 +37,7 @@
 						:disabled="disabled"
 						clearable
 						filterable
-						@change="initSections">
+						@change="handleEqTypeChange">
 						<el-option
 							v-for="opt in lineOptions"
 							:key="opt.value"
@@ -158,7 +158,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.FAULT_TYPE)"
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -222,20 +222,11 @@
 					:rules="[
 						{ required: true, message: '维修工不能为空', trigger: 'blur' },
 					]">
-					<el-select
+					<el-input
 						v-model="form.repairman"
 						@change="$emit('update', form)"
-						placeholder="请选择维修工"
+						placeholder="请输入维修工"
-						filterable
+						:disabled="disabled" />
-						clearable
-						multiple
-						:disabled="disabled">
-						<el-option
-							v-for="opt in workerOptions"
-							:key="opt.value"
-							:label="opt.label"
-							:value="opt.value" />
-					</el-select>
 				</el-form-item>
 			</el-col>
 
@@ -273,7 +264,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_MODE)"
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -299,7 +290,7 @@
 						:disabled="disabled"
 						@change="$emit('update', form)">
 						<el-option
-							v-for="opt in getDictDatas(DICT_TYPE.REPAIR_RESULT)"
+							v-for="opt in getDictDatas(DICT_TYPE.FAULT_LEVEL)"
 							:key="opt.value"
 							:label="opt.label"
 							:value="opt.value" />
@@ -329,73 +320,17 @@
 							message: '故障明细不能为空',
 							trigger: 'blur',
 						},
-					]">
+					]"></el-form-item>
-					<Editor
-						key="fault-detail"
-						:height="200"
-						v-model="form.faultDetail"
-						@on-change="$emit('update', form)" />
-				</el-form-item>
 			</el-col>
 
 			<!-- 维修描述  -->
 			<el-col :span="24">
-				<el-form-item label="维修描述" prop="maintenanceDetail">
+				<el-form-item label="维修描述" prop="maintenanceDetail"></el-form-item>
-					<Editor
-						key="maintenance-detail"
-						:height="200"
-						v-model="form.maintenanceDetail"
-						@on-change="$emit('update', form)" />
-				</el-form-item>
 			</el-col>
 
 			<!-- 维修附件  -->
 			<el-col :span="24">
-				<el-form-item label="维修附件" prop="files">
+				<el-form-item label="维修附件" prop="files"></el-form-item>
-					<div
-						class="upload-area"
-						:class="uploadOpen ? '' : 'height-48'"
-						ref="uploadArea">
-						<span class="close-icon" :class="uploadOpen ? 'open' : ''">
-							<el-button
-								type="text"
-								icon="el-icon-arrow-right"
-								@click="uploadOpen = !uploadOpen" />
-						</span>
-						<!-- :file-list="uploadedFileList" -->
-						<el-upload
-							class="upload-in-dialog"
-							: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, 'files');
-								}
-							">
-							<el-button size="mini" :disabled="disabled || false">
-								<svg-icon
-									icon-class="icon-upload"
-									style="color: inherit"></svg-icon>
-								上传文件
-							</el-button>
-							<div class="el-upload__tip" slot="tip">
-								只能上传jpg/png文件, 大小不超过2MB
-							</div>
-						</el-upload>
-
-						<uploadedFile
-							class="file"
-							v-for="file in form.files"
-							:file="file"
-							:key="file.fileUrl"
-							:disabled="disabled"
-							@delete="!disabled && handleDeleteFile(file, col.prop)" />
-					</div>
-				</el-form-item>
 			</el-col>
 
 			<!-- 设备大类  -->
@@ -426,71 +361,6 @@
 </template>
 
 <script>
-import Editor from '@/components/Editor';
-import { getAccessToken } from '@/utils/auth';
-import tupleImg from '@/assets/images/tuple.png';
-
-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: {
@@ -498,7 +368,7 @@ export default {
 		event: 'update',
 	},
 	emits: ['update'],
-	components: { Editor, uploadedFile },
+	components: {},
 	props: {
 		dataForm: {
 			type: Object,
@@ -515,8 +385,8 @@ export default {
 	},
 	data() {
 		return {
-			isInit: true,
 			allSpeicalEquipments: [],
+			uploadOpen: false,
 			form: {},
 			formFilters: {
 				lineId: null,
@@ -535,9 +405,6 @@ export default {
 			planOptions: [],
 			sectionOptions: [],
 			lineOptions: [],
-			uploadOpen: false,
-			uploadUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/upload', // 上传有关的headers，url都是固定的
-			uploadHeaders: { Authorization: 'Bearer ' + getAccessToken() },
 		};
 	},
 	watch: {
@@ -570,6 +437,7 @@ export default {
 	},
 	mounted() {
 		this.initOptions();
+		// this.getCode('/base/equipment-maintain-plan/getCode');
 	},
 	methods: {
 		/** 模拟透传 ref  */
@@ -579,61 +447,23 @@ export default {
 		resetFields(args) {
 			return this.$refs.form.resetFields(args);
 		},
-
 		// getCode
-		async getCode() {
+		// async getCode(url) {
-			const response = await this.$axios('/base/equipment-repair-log/getCode');
+		// 	this.formLoading = true;
-			this.form.repairOrderNumber = response.data || '';
+		// 	const response = await this.$axios(url);
-		},
+		// 	this.formLoading = false;
+		// 	this.form.code = response.data || '';
+		// },
 
 		// initialize
 		async initOptions() {
-			this.formLoading = true;
+			this.initEquipment();
-			await this.getCode();
+			// this.initWorker();
-			await this.initEquipment();
+			// this.initPlan();
-			await this.initLines();
-			await this.initWorker();
-			await this.initSections();
-			this.formLoading = false;
-			this.isInit = false;
-			this.setInitWorker();
 		},
 
-		/** 设置默认维修工为用户自己 */
-		setInitWorker() {
-			/** 获取用户自身id */
-			const userId = this.$store.getters.userId;
-			this.$nextTick(() => {
-				this.form.repairman = [userId];
-			});
-		},
-
-		/** 获取产线 */
-		async initLines() {
-			const res = await this.$axios('/base/core-production-line/listAll');
-			this.lineOptions = (res.data || []).map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-		},
-
-		/** 获取工段 */
-		async initSections(byLineId) {
-			this.formLoading = !this.isInit && true;
-			const res = await this.$axios({
-				url:
-					byLineId && !this.isInit
-						? '/base/core-workshop-section/listByParentId?id=' + byLineId
-						: '/base/core-workshop-section/listAll',
-			});
-			this.sectionOptions = (res.data || []).map((item) => ({
-				label: item.name,
-				value: item.id,
-			}));
-			this.formLoading = !this.isInit && false;
-		},
-		/** 获取设备 */
 		async initEquipment(type = 'special-equipment') {
+			this.formLoading = true;
 			const response = await this.$axios('/base/core-equipment/listAll');
 			this.equipmentList = response.data || [];
 			const equipmentOptions = (response.data || [])
@@ -644,55 +474,32 @@ export default {
 				}));
 			this.equipmentOptions = equipmentOptions;
 			this.allSpeicalEquipments = equipmentOptions;
-		},
+			this.formLoading = false;
-		/** 获取维修工 - 同时从用户表和员工表拉取数据 */
-		async initWorker() {
-			let list = [];
-			/** user */
-			const userList = await this.$axios({
-				url: '/system/user/page',
-				params: {
-					pageNo: 1,
-					pageSize: 100,
-				},
-			});
-			list = list.concat(
-				(userList.data?.list || []).map((item) => ({
-					label: item.username,
-					value: item.id,
-				}))
-			);
-			/** worker */
-			const workerList = await this.$axios({
-				url: '/base/core-worker/listAll',
-			});
-			list = list.concat(
-				(workerList.data || []).map((item) => ({
-					label: item.name,
-					value: item.id,
-				}))
-			);
-			/** setting */
-			this.workerOptions = list;
 		},
 
-		beforeUpload(file) {
+		// async initWorker() {
-			const checkFileSize = () => {
+		// 	this.formLoading = true;
-				const isLt2M = file.size / 1024 / 1024 < 2;
+		// 	const response = await this.$axios({
-				if (!isLt2M) {
+		// 		url: '/base/core-worker/listAll',
-					this.$modal.msgError('上传文件大小不能超过 2MB!');
+		// 	});
-				}
+		// 	this.workerOptions = (response.data || []).map((item) => ({
-				return isLt2M;
+		// 		label: item.name,
-			};
+		// 		value: item.id,
-			const checkFileType = () => {
+		// 	}));
-				const isJPG =
+		// 	this.formLoading = false;
-					file.type === 'image/jpeg' ||
+		// },
-					file.type === 'image/png' ||
+		// async initPlan() {
-					file.type === 'image/jpg';
+		// 	this.formLoading = true;
-				return isJPG;
+		// 	const response = await this.$axios({
-			};
+		// 		url: '/base/equipment-maintain-plan/page',
-			return checkFileSize() && checkFileType();
+		// 		params: { pageNo: 1, pageSize: 100, speical: true },
-		},
+		// 	});
+		// 	this.planOptions = (response.data?.list || []).map((item) => ({
+		// 		label: item.name,
+		// 		value: item.id,
+		// 	}));
+		// 	this.formLoading = false;
+		// },
 
 		// handlers
 		handleEqTypeChange(type) {
@@ -733,27 +540,19 @@ export default {
 		// upload
 		handleFilesOpen() {},
 
-		handleUploadSuccess(response, file, prop) {
+		beforeUpload() {},
-			console.log('response', response);
+
-			if (response.code != 0) {
+		handleUploadSuccess(response, file) {
-				this.$modal.msgError('上传失败: ', response.msg || '-');
+			this.$modal.msgSuccess('上传成功');
-				return;
+			console.log('file', file);
-			}
 			this.form.files.push({
 				fileName: file.name,
 				fileUrl: response.data,
-				fileType: prop == 'files' ? 2 : 1,
 			});
-			this.$modal.msgSuccess('上传成功');
 			this.$emit('update', this.form);
 		},
 
-		handleDeleteFile(file, prop) {
+		handleDeleteFile(file) {},
-			this.form.files = this.form.files.filter(
-				(item) => item.fileUrl != file.fileUrl
-			);
-			this.$emit('update', this.form);
-		},
 	},
 };
 </script>

src/views/specialEquipment/maintain/Repair.vue

@@ -164,15 +164,9 @@ export default {
 				{
 					prop: 'maintenanceResult',
 					label: '维修结果',
-					showOverflowtooltip: true,
 					filter: (v) => (v != null ? ['成功', '失败'][v] : ''),
 				},
-				{
+				{ prop: 'maintenanceDetail', label: '维修描述', width: 110 },
-					prop: 'maintenanceDetail',
-					label: '维修描述',
-					showOverflowtooltip: true,
-					width: 110,
-				},
 				{
 					prop: 'remark',
 					label: '备注',
@@ -403,13 +397,12 @@ export default {
 				if (!valid) {
 					return;
 				}
-
+				// if (this.form.repairman) {
+				// this.form.repairman = this.form.repairman.join(',')
+				// }
 				// 修改的提交
 				if (this.form.id != null) {
-					this.put({
+					this.put(this.form).then((response) => {
-						...this.form,
-						repairman: this.form.repairman.join(','),
-					}).then((response) => {
 						this.$modal.msgSuccess('修改成功');
 						this.open = false;
 						this.getList();
@@ -417,10 +410,7 @@ export default {
 					return;
 				}
 				// 添加的提交
-				this.post({
+				this.post(this.form).then((response) => {
-					...this.form,
-					repairman: this.form.repairman.join(','),
-				}).then((response) => {
 					this.$modal.msgSuccess('新增成功');
 					this.open = false;
 					this.getList();