bug second

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-29 14:59:28
+ * @LastEditTime: 2024-03-01 18:57:31
  * @Description:
 -->
 <template>
@@ -78,7 +78,7 @@
 										v-for="opt in inspectorOptions"
 										:key="opt.value"
 										:label="opt.label"
-										:value="opt.value" />
+										:value="opt.label" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -418,7 +418,7 @@ export default {
 			});
 		},
 		getConfirmed() {
-			return this.$confirm('是否直接确认巡检记录', '提示', {
+			return this.$confirm('是否直接确认巡检单', '提示', {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
@@ -431,10 +431,16 @@ export default {
 				}
 				this.$nextTick(() => {
 					this.getConfirmed().then(confirm => {
+						let checkPersonParam = '';
+						if (!this.dataForm.checkPerson || this.dataForm.checkPerson.trim() == '') {
+							/** 如有必要，更新巡检人 */
+							checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
+						} else {
+							checkPersonParam = `&checkPerson=${this.dataForm.checkPerson}`
+						}
 						this.$axios({
 							url:
-								'/base/equipment-check-order/confirm?confirmPerson=' +
-								this.$store.getters.userId,
+								`/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}` + checkPersonParam,
 								method: 'put',
 								data: [this.dataForm.id],
 						}).then(res =>{

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

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

src/views/equipment/base/inspection/Settings/add.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2024-02-29 14:58:37
+ * @LastEditTime: 2024-03-01 19:44:59
  * @Description:
 -->
 <template>
@@ -11,7 +11,7 @@
 		:rules="dataRule"
 		ref="dataForm"
 		@keyup.enter.native="dataFormSubmit()"
-		label-width="120px">
+		label-width="150px">
 		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="巡检单名称" prop="name">
@@ -27,8 +27,6 @@
 						placeholder="请输入巡检单编码" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item
 					label="部门"
@@ -57,8 +55,13 @@
 						style="width: 100%" />
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
+			<el-col :span="12">
+				<el-form-item label="巡检频率（天/次）" prop="checkPeriod">
+					<el-input
+						v-model="dataForm.checkPeriod"
+						placeholder="请输入巡检频率(天/次)" />
+				</el-form-item>
+			</el-col>
 			<el-col :span="12">
 				<el-form-item label="确认时限 (时)" prop="confirmTimeLimit">
 					<el-input
@@ -83,8 +86,6 @@
 					</el-select>
 				</el-form-item>
 			</el-col>
-		</el-row>
-		<el-row :gutter="20">
 			<el-col :span="12">
 				<el-form-item label="备注" prop="remark">
 					<el-input v-model="dataForm.remark" placeholder="请输入备注" />
@@ -121,7 +122,8 @@ export default {
 				planCheckTime: null,
 				confirmTimeLimit: null,
 				groupClass: null,
-				remark: null
+				remark: null,
+				checkPeriod: null
 			},
 			groupOptions: [],
 			departmentOptions: [],
@@ -137,6 +139,15 @@ export default {
 				],
 				planCheckTime: [
 					{ required: true, message: '计划巡检时间不能为空', trigger: 'blur' }
+				],
+				checkPeriod: [
+					{ required: true, message: '巡检频率不能为空', trigger: 'blur' },
+					{
+						type: 'number',
+						message: '请输入正确的数字类型',
+						trigger: 'blur',
+						transform: (val) => Number(val),
+					}
 				]
       }
 		};