merge test

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-28 14:45:58
+ * @LastEditTime: 2024-02-28 16:05:10
  * @Description:
 -->
 <template>
@@ -409,25 +409,32 @@ export default {
 			});
 		},
 		async confirmIns() {
-			await this.getConfirmed().then(confirm => {
+			this.$refs['dataForm'].validate((valid) => {
-				this.$axios({
+				if (!valid) {
-					url:
+					return;
-						'/base/equipment-check-order/confirm?confirmPerson=' +
+				}
-						this.$store.getters.userId,
+				this.$nextTick(() => {
-						method: 'put',
+					this.getConfirmed().then(confirm => {
-						data: [this.dataForm.id],
+						this.$axios({
-				}).then(res =>{
+							url:
-					if (res.code == 0) {
+								'/base/equipment-check-order/confirm?confirmPerson=' +
+								this.$store.getters.userId,
+								method: 'put',
+								data: [this.dataForm.id],
+						}).then(res =>{
+							if (res.code == 0) {
+								this.visible = false; 
+								this.$emit("refreshDataList");
+								this.$message.success('已确认');
+							}
+						})
+					}).catch(() => {
 						this.visible = false; 
 						this.$emit("refreshDataList");
-						this.$message.success('已确认');
+						this.$message.success('取消确认');
-					}
+					})
-				}).catch(() => {
-					this.visible = false; 
-					this.$emit("refreshDataList");
-					this.$message.success('取消确认');
 				})
-			})
+			});
 		},
 		// 表单提交
     dataFormSubmit() {

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

@@ -177,7 +177,7 @@ export default {
 						return;
 					}
 					this.$modal
-						.confirm('是否确认所有选中保养单"?')
+						.confirm('是否确认所有选中巡检单"?')
 						.then(() => {
 							return this.$axios({
 								url: '/base/equipment-check-order/confirm?confirmPerson=' + this.$store.getters.userId,