Merge branch 'projects/mesxc-test' into projects/mesxc-lb

Reviewed-on: #229

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-03-01 18:57:31
+ * @LastEditTime: 2024-03-04 11:14:28
  * @Description:
 -->
 <template>
@@ -431,16 +431,16 @@ export default {
 				}
 				this.$nextTick(() => {
 					this.getConfirmed().then(confirm => {
-						let checkPersonParam = '';
+						// let checkPersonParam = '';
-						if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
+						// if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
-							/** 如有必要，更新巡检人 */
+						// 	/** 如有必要，更新巡检人 */
-							checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+						// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-						} else {
+						// } else {
-							checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
+						// 	checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
-						}
+						// }
 						this.$axios({
 							url:
-								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
 								data: [this.dataForm.id],
 						}).then(res =>{

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

@@ -179,13 +179,14 @@ export default {
 					this.$modal
 						.confirm('是否确认所有选中巡检单"?')
 						.then(() => {
-							let checkPersonParam = '';
+							// let checkPersonParam = '';
-							if (!row.checkPerson || row.checkPerson.trim() == '') {
+							// if (!row.checkPerson || row.checkPerson.trim() == '') {
-								/** 如有必要，更新巡检人 */
+							// 	/** 如有必要，更新巡检人 */
-								checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+							// 	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
-							}
+							// }
 							return this.$axios({
-								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								// url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
+								url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 								method: 'put',
 								data: this.$refs['waiting-list-table'].selectedPlan.map(
 									(item) => item.id
@@ -399,17 +400,17 @@ export default {
 			this.$modal
 				.confirm('是否确认巡检单"' + row.name + '"?')
 				.then(() => {
-					let checkPersonParam = '';
+					// let checkPersonParam = '';
-					const nickname = this.$store.getters.nickname;
+					// const nickname = this.$store.getters.nickname;
-					if (!row.checkPerson || row.checkPerson.trim() == '') {
+					// if (!row.checkPerson || row.checkPerson.trim() == '') {
-						/** 如有必要，更新巡检人 */
+					// 	/** 如有必要，更新巡检人 */
-						checkPersonParam = `&checkPerson=${nickname}`;
+					// 	checkPersonParam = `&checkPerson=${nickname}`;
-					} else {
+					// } else {
-						checkPersonParam = `&checkPerson=${row.checkPerson}`
+					// 	checkPersonParam = `&checkPerson=${row.checkPerson}`
-					}
+					// }
 					return this.$axios({
 						url:
-							`/base/equipment-check-order/confirm?confirmPerson=${nickname}` + checkPersonParam,
+							`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						method: 'put',
 						data: [row.id],
 					});

src/views/specialEquipment/check/Config.vue

@@ -45,7 +45,7 @@
 			@close="cancel"
 			@cancel="cancel"
 			@confirm="handleConfirm">
-			<add ref="add" @refreshDataList="successSubmit" />
+			<add ref="add" v-if="open" @refreshDataList="successSubmit" />
 		</base-dialog>
 		<!-- 添加巡检，查看详情 -->
 		<addOrUpdata

src/views/specialEquipment/check/Content.vue

@@ -262,7 +262,7 @@ export default {
 					//	checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
 					//}
 
-					const res = this.$axios({
+					const res = await this.$axios({
 						url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
 						// +checkPersonParam,
 						// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),

src/views/specialEquipment/check/add.vue

@@ -235,7 +235,7 @@ export default {
 					...this.dataForm,
 					special: true,
 					status: 0,
-					groupClass: this.dataForm.groupClass.join(','),
+					groupClass: this.dataForm.groupClass?.join(','),
 				},
 			});
 			if (res.code == 0) {