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

Reviewed-on: #293

src/components/DialogForm/index.vue

@@ -12,7 +12,7 @@
 		:label-width="`${labelWidth}px`"
 		:size="size"
 		:label-position="labelPosition"
-		v-loading="formLoading">
+		v-loading="0 && 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">

src/views/specialEquipment/check/Record.vue

@@ -91,8 +91,18 @@ export default {
 				// 	: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '巡检单名称', showOverflowtooltip: true },
-				{ prop: 'department', label: '部门', showOverflowtooltip: true },
+				{
+					prop: 'name',
+					label: '巡检单名称',
+					showOverflowtooltip: true,
+					filter: (v) => v ?? '---',
+				},
+				{
+					prop: 'department',
+					label: '部门',
+					showOverflowtooltip: true,
+					filter: (v) => v ?? '---',
+				},
 				{
 					prop: 'actualCheckTime',
 					label: '巡检时间',
@@ -100,33 +110,12 @@ export default {
 					filter: parseTime,
 					showOverflowtooltip: true,
 				},
-				{ prop: 'groupClass', label: '班次', showOverflowtooltip: true },
-				// {
-				// 	prop: '_detail',
-				// 	label: '巡检内容',
-				// 	subcomponent: {
-				// 		name: 'ViewDetail',
-				// 		props: ['injectData'],
-				// 		data() {
-				// 			return {};
-				// 		},
-				// 		methods: {
-				// 			handleClick() {
-				// 				this.$emit('emitData', {
-				// 					action: this.injectData.label,
-				// 					value: this.injectData,
-				// 				});
-				// 			},
-				// 		},
-				// 		render: function (h) {
-				// 			return (
-				// 				<el-button type="text" onClick={this.handleClick}>
-				// 					详情
-				// 				</el-button>
-				// 			);
-				// 		},
-				// 	},
-				// },
+				{
+					prop: 'groupClass',
+					label: '班次',
+					showOverflowtooltip: true,
+					filter: (v) => v ?? '---',
+				},
 				{ prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -161,9 +150,7 @@ export default {
 					type: 'separate',
 				},
 				{
-					type: this.$auth.hasPermi('se:check-record:export')
-						? 'button'
-						: '',
+					type: this.$auth.hasPermi('se:check-record:export') ? 'button' : '',
 					btnName: '导出',
 					name: 'export',
 					plain: true,

src/views/specialEquipment/maintain/Record.vue

@@ -80,8 +80,9 @@ import {
 import RecordDetail from './Record--detail.vue';
 import { TableBtn } from '@/components/tableInnerComponents';
 
-const timeFilter = (val) =>
-	val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
+const timeFilter = (val) => {
+	return val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
+};
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',