bugfix 240110qun

src/views/base/coreEquipmentLineBind/index.vue

@@ -50,12 +50,13 @@
 <script>
 import moment from 'moment';
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
+import DialogForm from './dialogForm.vue';
 
 // import { getAccessToken } from '@/utils/auth';
 
 export default {
 	name: 'EquipmentLineBind',
-	components: {},
+	components: { DialogForm },
 	mixins: [basicPageMixin],
 	data() {
 		return {
@@ -149,7 +150,9 @@ export default {
 						select: true,
 						label: '产线',
 						prop: 'productionLineId',
-						rules: [{ required: true, message: '产线名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '产线名不能为空', trigger: 'blur' },
+						],
 						url: '/base/core-production-line/listAll',
 						bind: { clearable: true, filterable: true },
 						// watch: 'workshopSectionId'
@@ -159,7 +162,9 @@ export default {
 						label: '工段',
 						prop: 'workshopSectionId',
 						depends: 'productionLineId',
-						rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '工段不能为空', trigger: 'blur' },
+						],
 						bind: { clearable: true, filterable: true },
 						url: '/base/core-workshop-section/listByParentId',
 					},
@@ -169,7 +174,9 @@ export default {
 						select: true,
 						label: '设备',
 						prop: 'equipmentId',
-						rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
+						rules: [
+							{ required: true, message: '设备名不能为空', trigger: 'blur' },
+						],
 						bind: { clearable: true, filterable: true },
 						url: '/base/core-equipment/listAll',
 					},
@@ -190,9 +197,16 @@ export default {
 						label: '产线统计类型',
 						prop: 'lineDataType',
 						bind: {
-							clearable: true, filterable: true
+							clearable: true,
+							filterable: true,
 						},
-						rules: [{ required: true, message: '产线统计类型不能为空', trigger: 'change' }],
+						rules: [
+							{
+								required: true,
+								message: '产线统计类型不能为空',
+								trigger: 'change',
+							},
+						],
 					},
 					{
 						select: true,
@@ -204,9 +218,16 @@ export default {
 						label: '工段统计类型',
 						prop: 'sectionDataType',
 						bind: {
-							clearable: true, filterable: true
+							clearable: true,
+							filterable: true,
 						},
-						rules: [{ required: true, message: '工段统计类型不能为空', trigger: 'change' }],
+						rules: [
+							{
+								required: true,
+								message: '工段统计类型不能为空',
+								trigger: 'change',
+							},
+						],
 					},
 				],
 			],
@@ -335,15 +356,21 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否确认删除绑定"' + row.name + '"?')
-				.then(function () {
-					return deleteEquipmentType(id);
+				.confirm(
+					'是否确认删除绑定"' +
+						(row.equipmentName == null ? '这条记录' : row.equipmentName) +
+						'"?'
+				)
+				.then(() => {
+					return this.del({ id });
 				})
 				.then(() => {
 					this.getList();
 					this.$modal.msgSuccess('删除成功');
 				})
-				.catch(() => {});
+				.catch((err) => {
+					console.error(err);
+				});
 		},
 		/** 导出按钮操作 */
 		handleExport() {