.env.dev

@@ -20,10 +20,9 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.8:48082'
 # VUE_APP_BASE_API = 'http://192.168.4.159:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.104:48082'
-# VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.62:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
-VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
 VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'

src/views/base/coreProduct/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-27 15:38:04
+ * @LastEditTime: 2024-02-21 09:04:48
  * @Description:
 -->
 <template>
@@ -322,14 +322,14 @@ export default {
 				this.listQuery.total = response.data.total;
 			});
 		},
-		init(row, isdetail) {
+		init(id, isdetail) {
 			this.initData();
 			this.isdetail = isdetail || false;
-			this.dataForm.id = row.id || undefined;
+			this.dataForm.id = id || undefined;
-			this.isedit = row?.id && row?.externalCode ? true : false;
+			this.isedit = id ? true : false;
 			console.log('你好', this.isedit)
 			this.visible = true;
-			if (row) {
+			if (id) {
 				this.idAttrShow = true
 			} else {
 				this.idAttrShow = false
@@ -340,7 +340,7 @@ export default {
 
 				if (this.dataForm.id) {
 					// 获取产品详情
-					this.urlOptions.infoURL(this.dataForm.id).then(response => {
+					this.urlOptions.infoURL(id).then(response => {
             this.dataForm = response.data
 						// this.dataForm.area = response.data.area || 0
 						// this.dataForm.weight = response.data.weight || 0

src/views/base/coreProduct/attr-add.vue

@@ -74,7 +74,9 @@ export default {
 			this.$nextTick(() => {
 				this.$refs['dataForm'].resetFields();
 				if (this.dataForm.id) {
-					getCoreProductAttr(this.dataForm.id).then((res) => {
+					getCoreProductAttr({
+						id: this.dataForm.id
+					}).then((res) => {
 						const { name, value } = res.data;
 						this.dataForm.name = name;
 						this.dataForm.value = value;

src/views/base/coreProduct/index.vue

@@ -141,22 +141,6 @@ export default {
 	},
 	created() {},
 	methods: {
-		//tableBtn点击
-    handleClick(val) {
-      if (val.type === "edit") {
-        this.addOrUpdateVisible = true;
-        this.addOrEditTitle = "编辑";
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data);
-        });
-      } else if (val.type === "delete") {
-        this.deleteHandle(val.data.id, val.data.name, val.data._pageIndex,val.data)
-      } else if (val.type === "change") {
-        this.changeStatus(val.data.id)
-      } else {
-        this.otherMethods(val)
-      }
-    },
 		// 删除
     deleteHandle(id, name, index) {
       this.$confirm(`是否确认删除产品名称为"${name}"的数据项`, "提示", {
@@ -184,7 +168,7 @@ export default {
 				this.addOrUpdateVisible = true;
         this.addOrEditTitle = "详情";
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(val.data, true);
+          this.$refs.addOrUpdate.init(val.data.id, true);
         });
 			}
 		},

src/views/base/coreWorkOrder/addWorkOrder.vue

@@ -121,6 +121,7 @@
 					<el-select
 						v-model="dataForm.roomNameDict"
 						filterable
+						:disabled="isdetail || isedit"
 						style="width: 100%"
 						placeholder="请选择车间名称">
 						<el-option
@@ -281,7 +282,6 @@ export default {
         this.urlOptions.createURL(this.dataForm).then(response => {
           this.$modal.msgSuccess("新增成功");
           this.visible = false;
-          this.$emit("refreshDataList");
           // this.$confirm('是否添加预使用主原料信息?', '提示', {
           //   confirmButtonText: '确定',
           //   cancelButtonText: '取消',

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-27 09:41:00
+ * @LastEditTime: 2024-02-27 08:58:08
  * @Description:
 -->
 <template>
@@ -428,9 +428,9 @@ export default {
 					status: 1
 				}).then(response => {
           this.$modal.msgSuccess("新增成功");
-					this.idAttrShow = true
+					// this.idAttrShow = true
 					this.dataForm.id = response.data
-          // this.visible = false;
+          this.visible = false;
           this.$emit("refreshDataList");
         });
       });

src/views/equipment/base/inspection/Confirm/index.vue

@@ -31,6 +31,44 @@
 			:limit.sync="queryParams.pageSize"
 			@pagination="getList" />
 
+		<!-- 对话框(添加) -->
+		<!-- <base-dialog
+			:dialogTitle="title"
+			:dialogVisible="open"
+			width="60%"
+			@close="cancel"
+			@cancel="cancel"
+			@confirm="submitForm">
+			<DialogFormUnplanned
+				v-if="open"
+				ref="form"
+				v-model="form"
+				:disabled="mode == 'detail'" />
+			<el-row v-if="mode === 'detail'" slot="footer" type="flex" justify="end">
+				<el-col :span="12">
+					<el-button size="small" class="btnTextStyle" @click="cancel">
+						关闭
+					</el-button>
+				</el-col>
+			</el-row>
+		</base-dialog> -->
+
+		<!-- 编辑 -->
+		<!-- <UnplannedEditDrawer
+			ref="unplanned"
+			v-if="openUnplannedDrawer"
+			@refreshDataList="getList"
+			@destroy="openUnplannedDrawer = false" />
+		<PlannedEditDrawer
+			ref="planned"
+			v-if="openPlannedDrawer"
+			@refreshDataList="getList"
+			@destroy="openPlannedDrawer = false" />
+
+		<RecordDetail
+			v-if="recordDetailVisible"
+			ref="recordDetailDrawer"
+			@destroy="recordDetailVisible = false" /> -->
 		<add-or-update
 			v-if="addOrUpdateVisible"
 			ref="addOrUpdate"
@@ -42,12 +80,16 @@
 import AddOrUpdate from './add-or-updata';
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+// import DialogFormUnplanned from './WaitingList--add--unplanned.vue';
+// import UnplannedEditDrawer from './WaitingListUnplanned--edit.vue';
+// import PlannedEditDrawer from './WaitingListPlanned--edit.vue';
 import {
 	exportCheckOrderExcel,
 } from '@/api/equipment/base/maintain/record';
 import WaitingListTable from './WaitingListTable.vue';
+// import RecordDetail from './Record--detail.vue';
 
-// const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
 
 const btn = {
 	name: 'tableBtn',
@@ -118,7 +160,9 @@ export default {
 					plain: true,
 				},
 				{
-					type: 'button',
+					type: this.$auth.hasPermi('equipment:check-setting:export')
+						? 'button'
+						: '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,

src/views/equipment/base/inspection/Record/index.vue

@@ -118,10 +118,10 @@ 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: 'actualTime1', label: '巡检时间', filter: parseTime },
-				{ prop: 'groupClass', label: '班次' },
+				{ prop: 'actualTime', label: '班次' },
 				{ prop: 'opt', label: '巡检内容', name: '详情', subcomponent: btn },
 				{ prop: 'remark', label: '备注' }
 				// { prop: 'origin', label: '数据来源', filter: (val) => ['', '手动', 'PDA'][val] },

src/views/equipment/base/maintain/Confirm/index.vue

@@ -542,13 +542,13 @@ export default {
 			params.pageNo = undefined;
 			params.pageSize = undefined;
 			this.$modal
-				.confirm('是否确认导出所有待确认的保养记录?')
+				.confirm('是否确认导出所有保养记录?')
 				.then(() => {
 					this.exportLoading = true;
 					return exportMaintainLogExcel(params);
 				})
 				.then((response) => {
-					this.$download.excel(response, '设备保养待确认记录.xls');
+					this.$download.excel(response, '设备保养记录.xls');
 					this.exportLoading = false;
 				})
 				.catch(() => {});

src/views/equipment/base/maintain/PlanConfig/add-or-updata.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-27 10:33:31
+ * @LastEditTime: 2024-02-23 15:28:46
  * @Description:
 -->
 <template>
@@ -92,14 +92,7 @@
 					</el-col>
 					<el-col :span="8">
 						<el-form-item label="计划保养人员" prop="maintainer">
-							<el-select v-model="dataForm.maintainer" placeholder="请选择计划保养人员" style="width: 100%;" :disabled="isdetail" multiple filterable>
+							<el-input v-model="dataForm.maintainer" style="width: 100%" :disabled="isdetail" clearable placeholder="请输入计划保养人员" />
-								<el-option
-									v-for="item in personList"
-									:key="item.id"
-									:label="item.name"
-									:value="item.name">
-								</el-option>
-							</el-select>
 						</el-form-item>
 					</el-col>
 				</el-row>
@@ -114,7 +107,6 @@
 <script>
 import basicAdd from '../../../../core/mixins/basic-add';
 // import { getCoreProductAttrPage, deleteCoreProductAttr } from "@/api/base/coreProduct";
-import { getWorkerList } from '@/api/base/worker'
 import { getCoreDepartmentList } from "@/api/base/coreDepartment";
 import { createPlan, updatePlan, getCode, getPlan } from '@/api/equipment/base/maintain/planconfig';
 import { getCorePLList } from '@/api/base/coreProductionLine';
@@ -152,7 +144,6 @@ export default {
 			},
 			menuOptions: [],
 			proLineList: [],
-			personList: [],
 			visible: false,
 			isdetail: false,
 			isedit: false,
@@ -187,9 +178,6 @@ export default {
 			// 产线列表
 			const resline = await getCorePLList();
 			this.proLineList = resline.data;
-			// 保养人员
-			const personres = await getWorkerList()
-      this.personList = personres.data || []
 		},
 		getList() {
 			// 获取产品属性列表
@@ -206,6 +194,7 @@ export default {
 			this.isdetail = isdetail || false;
 			this.dataForm.id = id || undefined;
 			this.isedit = id ? true : false;
+			console.log('你好22', id)
 			this.visible = true;
 			// if (id) {
 			// 	this.idAttrShow = true
@@ -220,6 +209,12 @@ export default {
 					// 获取计划详情
 					this.urlOptions.infoURL({ id: this.dataForm.id }).then(response => {
             this.dataForm = response.data
+						// if (this.dataForm.materialType !== undefined) {
+						// 	this.dataForm.materialType = String(this.dataForm.materialType)
+						// }
+						// if (this.dataForm.productType !== undefined) {
+						// 	this.dataForm.productType = String(this.dataForm.productType)
+						// }
           });
 					// 获取产品属性列表
 					// this.getList();
@@ -264,10 +259,7 @@ export default {
         }
         // 修改的提交
         if (this.dataForm.id) {
-          this.urlOptions.updateURL({
+          this.urlOptions.updateURL(this.dataForm).then(response => {
-						...this.dataForm,
-						maintainer: this.dataForm.maintainer.join(',')
-					}).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.visible = false; 
             this.$emit("refreshDataList");
@@ -275,14 +267,11 @@ export default {
           return;
         }
         // 添加的提交
-        this.urlOptions.createURL({
+        this.urlOptions.createURL(this.dataForm).then(response => {
-					...this.dataForm,
-					maintainer: this.dataForm.maintainer.join(',')
-				}).then(response => {
           this.$modal.msgSuccess("新增成功");
 					// this.idAttrShow = true
 					this.dataForm.id = response.data
-          this.visible = false;
+          // this.visible = false;
           this.$emit("refreshDataList");
         });
       });

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

@@ -157,12 +157,12 @@ export default {
 			} catch (err) {}
 			if (!valid) return;
 
-			// let confirmed = false;
+			let confirmed = false;
-			// try {
+			try {
-			// 	confirmed = await this.getConfirmed();
+				confirmed = await this.getConfirmed();
-			// } catch (err) {
+			} catch (err) {
-			// 	confirmed = false;
+				confirmed = false;
-			// }
+			}
 			const res = await this.$axios({
 				url:
 					'/base/equipment-check-order' +
@@ -171,8 +171,7 @@ export default {
 				data: {
 					...this.dataForm,
 					special: true,
-					status: 1,
+					status: confirmed ? 2 : 1,
-					// status: confirmed ? 2 : 1,
 					groupClass: this.dataForm.groupClass.join(','),
 					checkPerson: this.$store.getters.userId,
 				},
@@ -180,9 +179,7 @@ export default {
 			if (res.code == 0) {
 				this.$emit('refreshDataList');
 				this.$message.success(this.dataForm.id ? '更新成功' : '创建成功');
-				return res.data;
 			}
-			return null;
 		},
 	},
 };

src/views/specialEquipment/check/Content-add_detail.vue

@@ -1,515 +0,0 @@
-<!-- 
-    filename: Content-edit.vue
-    author: liubin
-    date: 2024-2-24 11:38:56
-    description: 
--->
-
-<template>
-	<el-drawer
-		:visible="visible"
-		:show-close="false"
-		:wrapper-closable="false"
-		class="drawer"
-		custom-class="mes-drawer"
-		size="60%"
-		@closed="$emit('destroy')">
-		<SmallTitle slot="title">添加巡检内容</SmallTitle>
-
-		<div class="drawer-body flex">
-			<div class="drawer-body__content">
-				<SmallTitle>巡检内容</SmallTitle>
-
-				<div style="margin-top: 12px; position: relative">
-					<SearchBar
-						:formConfigs="searchBarFormConfig"
-						ref="attr-search-bar"
-						@headBtnClick="handleSearchBarBtnClick" />
-				</div>
-
-				<div style="margin-top: 12px; position: relative">
-					<div
-						v-if="!disableEdit && !disableModifyDetail"
-						style="position: absolute; top: -40px; right: 0">
-						<el-button @click="handleAddAttr" type="text">
-							<i class="el-icon-plus"></i>
-							添加内容
-						</el-button>
-					</div>
-					<base-table
-						v-loading="attrListLoading"
-						:table-props="attrTableProps"
-						:page="attrQuery?.params.pageNo || 1"
-						:limit="attrQuery?.params.pageSize || 10"
-						:table-data="attrList"
-						@emitFun="handleEmitFun">
-						<method-btn
-							slot="handleBtn"
-							label="操作"
-							v-if="!disableEdit"
-							:method-list="tableBtn"
-							@clickBtn="handleTableBtnClick" />
-					</base-table>
-
-					<!-- 分页组件 -->
-					<pagination
-						v-show="attrTotal > 0"
-						:total="attrTotal"
-						:page.sync="attrQuery.params.pageNo"
-						:limit.sync="attrQuery.params.pageSize"
-						@pagination="getAttrList" />
-				</div>
-			</div>
-
-			<div class="drawer-body__footer">
-				<el-button style="" @click="handleCancel">
-					{{ disableEdit ? '返回' : '取消' }}
-				</el-button>
-				<el-button
-					v-if="!disableEdit"
-					type="primary"
-					:loading="btnLoading"
-					@click="handleConfirm">
-					保存
-				</el-button>
-			</div>
-		</div>
-
-		<!-- 属性对话框 -->
-		<base-dialog
-			:dialogTitle="attrTitle"
-			:dialogVisible="attrFormVisible"
-			width="35%"
-			:append-to-body="true"
-			custom-class="baseDialog"
-			@close="closeAttrForm"
-			@cancel="closeAttrForm"
-			@confirm="submitAttrForm">
-			<DialogForm
-				v-if="attrFormVisible"
-				ref="attrForm"
-				v-model="attrForm"
-				:rows="attrRows" />
-		</base-dialog>
-	</el-drawer>
-</template>
-
-<script>
-import DialogForm from '../../../components/DialogForm/index.vue';
-
-const SmallTitle = {
-	name: 'SmallTitle',
-	props: ['size'],
-	components: {},
-	data() {
-		return {};
-	},
-	methods: {},
-	render: function (h) {
-		return h(
-			'span',
-			{
-				class: 'small-title',
-				style: {
-					fontSize: '18px',
-					lineHeight:
-						this.size == 'lg' ? '24px' : this.size == 'sm' ? '18px' : '20px',
-					fontWeight: 500,
-					fontFamily: '微软雅黑, Microsoft YaHei, Arial, Helvetica, sans-serif',
-				},
-			},
-			this.$slots.default
-		);
-	},
-};
-
-export default {
-	components: { SmallTitle, DialogForm },
-	props: ['dataId'], // dataId 作为一个通用的存放id的字段
-	data() {
-		return {
-			visible: false,
-			btnLoading: false,
-			form: {},
-			formLoading: false,
-			departmentList: [],
-			inspectorOptions: [],
-			attrList: [],
-			attrTotal: 0,
-			attrTitle: '',
-			attrForm: {
-				id: null,
-				orderId: null,
-				program: null,
-				checkResult: null,
-				equipmentId: null,
-			},
-			attrFormVisible: false,
-			attrRows: [
-				[
-					{
-						select: true,
-						label: '设备名称',
-						prop: 'equipmentId',
-						url: '/base/core-equipment/page?pageNo=1&pageSize=100&special=true',
-						rules: [
-							{ required: true, message: '设备不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '巡检项目',
-						prop: 'program',
-						rules: [
-							{ required: true, message: '巡检项目不能为空', trigger: 'blur' },
-						],
-					},
-				],
-				[
-					{
-						input: true,
-						label: '巡检结果',
-						prop: 'checkResult',
-						rules: [
-							{ required: true, message: '巡检结果不能为空', trigger: 'blur' },
-						],
-					},
-				],
-			],
-			attrQuery: {
-				params: {
-					pageNo: 1,
-					pageSize: 10,
-					equipmentName: null,
-				},
-			}, // 属性列表的请求
-			searchBarFormConfig: [
-				{
-					type: 'input',
-					label: '设备',
-					placeholder: '请输入设备名称',
-					param: 'equipmentName',
-				},
-				{
-					type: 'button',
-					btnName: '查询',
-					name: 'search',
-					color: 'primary',
-				},
-			],
-			attrFormSubmitting: false,
-			attrListLoading: false,
-			// syncFileListFlag: null,
-			tableBtn: [
-				{
-					type: 'edit',
-					btnName: '编辑',
-				},
-				{
-					type: 'delete',
-					btnName: '删除',
-				},
-			],
-			row: null,
-			groupOptions: [],
-			disableEdit: false,
-		};
-	},
-	computed: {
-		departmentOptions() {
-			return (this.departmentList || []).map((item) => ({
-				id: item.id,
-				label: item.name,
-				value: item.id,
-			}));
-		},
-		disableModifyDetail() {
-			return this.form && this.form.confirmTimeLimit != undefined;
-		},
-		attrTableProps() {
-			return [
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					prop: 'program',
-					label: '巡检项目',
-				},
-				{
-					prop: 'checkResult',
-					label: '巡检结果',
-				},
-			];
-		},
-	},
-	mounted() {
-		this.formLoading = true;
-	},
-	methods: {
-		handleSearchBarBtnClick(btn) {
-			switch (btn.btnName) {
-				case 'search':
-					this.attrQuery.params.equipmentName = btn.equipmentName;
-					this.getAttrList();
-					break;
-			}
-		},
-		handleTableBtnClick({ type, data }) {
-			switch (type) {
-				case 'edit':
-					this.handleEditAttr(data.id);
-					break;
-				case 'delete':
-					this.handleDeleteAttr(data.id);
-					break;
-			}
-		},
-
-		getConfirmed() {
-			return this.$confirm('是否直接确认保养记录', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			});
-		},
-
-		async handleConfirm() {
-			if (this.attrList.length == 0) {
-				return this.$message.error('请添加巡检内容');
-			}
-
-			let confirmed = false;
-			try {
-				confirmed = await this.getConfirmed();
-			} catch (err) {
-				confirmed = false;
-			}
-
-			if (confirmed) {
-				const res = await this.$axios({
-					url:
-						'/base/equipment-check-order/confirm?confirmPerson=' +
-						this.$store.getters.nickname,
-					method: 'put',
-					data: [this.row.id],
-				});
-				if (res.code == 0) {
-					this.$message.success('已确认');
-				}
-			}
-
-			// this.btnLoading = true;
-			// this.$nextTick(async () => {
-			// 	const { code, data } = await this.$axios({
-			// 		url: '/base/equipment-check-order/update',
-			// 		method: 'put',
-			// 		data: {
-			// 			...this.form,
-			// 			groupClass: this.form.groupClass.join(','),
-			// 			checkPerson: this.form.checkPerson.join(','),
-			// 		},
-			// 	});
-			// 	if (code == 0) {
-			// 		this.$modal.msgSuccess('更新成功');
-			// 	}
-			// 	this.btnLoading = false;
-			// 	this.$emit('refreshDataList');
-			// 	this.handleCancel();
-			// });
-			this.$emit('refreshDataList');
-			this.handleCancel();
-		},
-
-		handleEmitFun(val) {
-			console.log('handleEmitFun', val);
-		},
-
-		init(row, detail) {
-			if (detail) this.disableEdit = true;
-			this.visible = true;
-			this.row = row;
-			this.getAttrList(row);
-		},
-
-		async getAttrList(row, condition = {}) {
-			if (!row) row = this.row;
-			this.attrListLoading = true;
-			const res = await this.$axios({
-				url: '/base/equipment-check-order-det/page',
-				method: 'get',
-				params: {
-					...this.attrQuery.params,
-					orderId: row.id,
-					...condition,
-				},
-			});
-			if (res.code == 0) {
-				this.attrList = res.data.list;
-				this.attrTotal = res.data.total;
-			}
-			this.attrListLoading = false;
-		},
-
-		handleCancel() {
-			if (!this.attrList.length) {
-				return this.$message.error('请添加巡检内容');
-			}
-			this.visible = false;
-		},
-
-		resetAttrform() {
-			this.attrForm = {
-				id: null,
-				orderId: null,
-				equipmentId: null,
-				program: null,
-				checkResult: null,
-			};
-		},
-
-		// 新增属性
-		handleAddAttr() {
-			if (!this.row.id) return this.$message.error('请先选中保养记录');
-			this.resetAttrform();
-			this.attrTitle = '添加巡检内容';
-			this.attrFormVisible = true;
-		},
-
-		// 编辑属性
-		async handleEditAttr(attrId) {
-			const res = await this.$axios({
-				url: '/base/equipment-check-order-det/get',
-				method: 'get',
-				params: { id: attrId },
-			});
-			if (res.code == 0) {
-				this.attrForm = res.data;
-				this.attrTitle = '编辑巡检单详情';
-				this.attrFormVisible = true;
-			}
-		},
-
-		// 删除属性
-		handleDeleteAttr(attrId) {
-			this.$confirm('确定删除该巡检内容?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning',
-			})
-				.then(async () => {
-					const res = await this.$axios({
-						url: '/base/equipment-check-order-det/delete?id=' + attrId,
-						method: 'delete',
-					});
-					if (res.code == 0) {
-						this.$message({
-							message: '删除成功',
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-				})
-				.catch(() => {});
-		},
-
-		// 提交属性表
-		submitAttrForm() {
-			this.$refs['attrForm'].validate(async (valid) => {
-				if (!valid) {
-					return;
-				}
-
-				try {
-					const isEdit = this.attrForm.id != null;
-					this.attrFormSubmitting = true;
-					const res = await this.$axios({
-						url: isEdit
-							? '/base/equipment-check-order-det/update'
-							: '/base/equipment-check-order-det/create',
-						method: isEdit ? 'put' : 'post',
-						data: { ...this.attrForm, orderId: this.row.id },
-					});
-
-					if (res.code == 0) {
-						this.closeAttrForm();
-						this.$message({
-							message: `${isEdit ? '更新' : '创建'}成功`,
-							type: 'success',
-							duration: 1500,
-							onClose: () => {
-								this.getAttrList();
-							},
-						});
-					}
-					this.attrFormSubmitting = false;
-				} catch (err) {
-					this.$message({
-						message: err,
-						type: 'error',
-						duration: 1500,
-					});
-					this.attrFormSubmitting = false;
-				}
-			});
-		},
-
-		closeAttrForm() {
-			this.attrFormVisible = false;
-		},
-	},
-};
-</script>
-
-<style scoped>
-.drawer >>> .el-drawer {
-	border-radius: 8px 0 0 8px;
-}
-
-.drawer >>> .el-date-editor,
-.drawer >>> .el-select {
-	width: 100%;
-}
-
-.drawer >>> .el-drawer__header {
-	margin: 0;
-	padding: 32px 32px 24px;
-	border-bottom: 1px solid #dcdfe6;
-	margin-bottom: 0px;
-}
-
-.small-title::before {
-	content: '';
-	display: inline-block;
-	vertical-align: top;
-	width: 4px;
-	height: 22px;
-	border-radius: 1px;
-	margin-right: 8px;
-	background-color: #0b58ff;
-}
-
-.drawer-body {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-}
-
-.drawer-body__content {
-	flex: 1;
-	/* background: #eee; */
-	padding: 20px 30px;
-	overflow-y: auto;
-}
-
-.drawer-body__footer {
-	display: flex;
-	justify-content: flex-end;
-	padding: 18px;
-}
-</style>

src/views/specialEquipment/check/Content-edit.vue

@@ -14,7 +14,7 @@
 		custom-class="mes-drawer"
 		size="60%"
 		@closed="$emit('destroy')">
-		<SmallTitle slot="title">{{ disableEdit ? '详情' : '编辑' }}</SmallTitle>
+		<SmallTitle slot="title">编辑</SmallTitle>
 
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
@@ -129,7 +129,7 @@
 
 				<div style="margin-top: 12px; position: relative">
 					<div
-						v-if="!disableEdit && !disableModifyDetail"
+						v-if="!disableEdit"
 						style="position: absolute; top: -40px; right: 0">
 						<el-button @click="handleAddAttr" type="text">
 							<i class="el-icon-plus"></i>
@@ -146,7 +146,7 @@
 						<method-btn
 							slot="handleBtn"
 							label="操作"
-							v-if="!disableEdit && !disableModifyDetail"
+							v-if="!disableEdit"
 							:method-list="tableBtn"
 							@clickBtn="handleTableBtnClick" />
 					</base-table>
@@ -234,6 +234,20 @@ export default {
 			formLoading: false,
 			departmentList: [],
 			inspectorOptions: [],
+			attrTableProps: [
+				{
+					prop: 'equipmentName',
+					label: '设备名称',
+				},
+				{
+					prop: 'program',
+					label: '巡检项目',
+				},
+				{
+					prop: 'checkResult',
+					label: '巡检结果',
+				},
+			],
 			attrList: [],
 			attrTotal: 0,
 			attrTitle: '',
@@ -325,66 +339,6 @@ export default {
 				value: item.id,
 			}));
 		},
-		disableModifyDetail() {
-			return this.form && this.form.confirmTimeLimit != undefined;
-		},
-		attrTableProps() {
-			return [
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					prop: 'program',
-					label: '巡检项目',
-				},
-				{
-					prop: 'checkResult',
-					label: '巡检结果',
-					subcomponent: this.disableModifyDetail
-						? {
-								name: 'TableCellInput',
-								props: ['injectData'],
-								data() {
-									return {
-										inputvalue: null,
-									};
-								},
-								mounted() {
-									this.inputvalue = this.injectData.checkResult;
-								},
-								methods: {
-									async handleValueChange(newCheckResult) {
-										document.body.style.cursor = 'wait';
-										await this.$axios({
-											url: '/base/equipment-check-order-det/update',
-											method: 'put',
-											data: {
-												orderId: this.injectData.orderId,
-												equipmentId: this.injectData.equipmentId,
-												program: this.injectData.program,
-												id: this.injectData.id,
-												checkResult: newCheckResult,
-											},
-										});
-										document.body.style.cursor = 'default';
-									},
-								},
-								render: function (h) {
-									return (
-										<el-input
-											size="small"
-											key={this.injectData.id}
-											v-model={this.inputvalue}
-											onChange={this.handleValueChange}
-										/>
-									);
-								},
-						  }
-						: null,
-				},
-			];
-		},
 	},
 	mounted() {
 		this.formLoading = true;
@@ -445,7 +399,6 @@ export default {
 		},
 
 		async getInfo(row) {
-			console.log('row', row);
 			const res = await this.$axios(
 				'/base/equipment-check-order/get?id=' + row.id
 			);
@@ -558,7 +511,7 @@ export default {
 		handleAddAttr() {
 			if (!this.row.id) return this.$message.error('请先选中保养记录');
 			this.resetAttrform();
-			this.attrTitle = '添加巡检内容';
+			this.attrTitle = '添加设备属性';
 			this.attrFormVisible = true;
 		},
 

src/views/specialEquipment/check/Content.vue

@@ -41,17 +41,17 @@
 			<add ref="add" @refreshDataList="successSubmit" />
 		</base-dialog>
 
+		<!-- 添加巡检，查看详情 -->
+		<addOrUpdata
+			v-if="addOrUpdateVisible"
+			ref="addOrUpdate"
+			@refreshDataList="getList" />
+
 		<edit
 			ref="content-edit"
 			v-if="editOpen"
 			@refreshDataList="getList"
 			@destroy="editOpen = false" />
-
-		<AddCheckDet
-			ref="content-detail"
-			v-if="detOpen"
-			@refreshDataList="getList"
-			@destroy="detOpen = false" />
 	</div>
 </template>
 
@@ -62,16 +62,14 @@ import add from './Content-add.vue';
 import { parseTime } from '../../core/mixins/code-filter';
 import CheckOrderListTable from './CheckOrderListTable.vue';
 import edit from './Content-edit.vue';
-import AddCheckDet from './Content-add_detail.vue';
 
 export default {
 	name: 'SpecialEquipmentCheckConfig',
-	components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
+	components: { addOrUpdata, add, edit, CheckOrderListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			editOpen: false,
-			detOpen: false,
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
@@ -190,19 +188,8 @@ export default {
 		this.getList();
 	},
 	methods: {
-		async handleSubmit() {
+		handleSubmit() {
-			const id = await this.$refs.add.dataFormSubmit();
+			this.$refs.add.dataFormSubmit();
-
-			setTimeout(() => {
-				this.handleAddDetail(id);
-			}, 500);
-		},
-
-		handleAddDetail(id) {
-			this.detOpen = true;
-			this.$nextTick(() => {
-				this.$refs['content-detail'].init({ id });
-			});
 		},
 
 		successSubmit() {
@@ -281,7 +268,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.open = true;
-			this.title = '新建巡检单';
+			this.title = '添加待确认巡检设置';
 			this.$nextTick(() => {
 				this.$refs.add.init();
 			});