Merge pull request 'projects/mesxc-lb' (#212) from projects/mesxc-lb into projects/mesxc-test

Reviewed-on: #212

.env.dev

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

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

@@ -157,12 +157,12 @@ export default {
 			} catch (err) {}
 			if (!valid) return;
 
-			let confirmed = false;
-			try {
-				confirmed = await this.getConfirmed();
-			} catch (err) {
-				confirmed = false;
-			}
+			// let confirmed = false;
+			// try {
+			// 	confirmed = await this.getConfirmed();
+			// } catch (err) {
+			// 	confirmed = false;
+			// }
 			const res = await this.$axios({
 				url:
 					'/base/equipment-check-order' +
@@ -171,7 +171,8 @@ export default {
 				data: {
 					...this.dataForm,
 					special: true,
-					status: confirmed ? 2 : 1,
+					status: 1,
+					// status: confirmed ? 2 : 1,
 					groupClass: this.dataForm.groupClass.join(','),
 					checkPerson: this.$store.getters.userId,
 				},
@@ -179,7 +180,9 @@ 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

@@ -0,0 +1,515 @@
+<!-- 
+    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">编辑</SmallTitle>
+		<SmallTitle slot="title">{{ disableEdit ? '详情' : '编辑' }}</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"
+						v-if="!disableEdit && !disableModifyDetail"
 						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"
+							v-if="!disableEdit && !disableModifyDetail"
 							:method-list="tableBtn"
 							@clickBtn="handleTableBtnClick" />
 					</base-table>
@@ -234,20 +234,6 @@ export default {
 			formLoading: false,
 			departmentList: [],
 			inspectorOptions: [],
-			attrTableProps: [
-				{
-					prop: 'equipmentName',
-					label: '设备名称',
-				},
-				{
-					prop: 'program',
-					label: '巡检项目',
-				},
-				{
-					prop: 'checkResult',
-					label: '巡检结果',
-				},
-			],
 			attrList: [],
 			attrTotal: 0,
 			attrTitle: '',
@@ -339,6 +325,66 @@ 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;
@@ -399,6 +445,7 @@ export default {
 		},
 
 		async getInfo(row) {
+			console.log('row', row);
 			const res = await this.$axios(
 				'/base/equipment-check-order/get?id=' + row.id
 			);
@@ -511,7 +558,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,14 +62,16 @@ 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, CheckOrderListTable },
+	components: { addOrUpdata, add, edit, AddCheckDet, CheckOrderListTable },
 	mixins: [basicPageMixin],
 	data() {
 		return {
 			editOpen: false,
+			detOpen: false,
 			addOrUpdateVisible: false,
 			addOrEditTitle: '',
 			searchBarKeys: ['name'],
@@ -188,8 +190,19 @@ export default {
 		this.getList();
 	},
 	methods: {
-		handleSubmit() {
-			this.$refs.add.dataFormSubmit();
+		async handleSubmit() {
+			const id = await this.$refs.add.dataFormSubmit();
+
+			setTimeout(() => {
+				this.handleAddDetail(id);
+			}, 500);
+		},
+
+		handleAddDetail(id) {
+			this.detOpen = true;
+			this.$nextTick(() => {
+				this.$refs['content-detail'].init({ id });
+			});
 		},
 
 		successSubmit() {
@@ -268,7 +281,7 @@ export default {
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.open = true;
-			this.title = '添加待确认巡检设置';
+			this.title = '新建巡检单';
 			this.$nextTick(() => {
 				this.$refs.add.init();
 			});