From 1ee975795c80d32d4c98877b4863798c5d0d2c3d Mon Sep 17 00:00:00 2001 From: panyuyi Date: Tue, 26 Mar 2024 17:48:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8A=A8=E7=89=A9?= =?UTF-8?q?=E9=98=B2=E6=B2=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../governanceRecords/index.vue | 251 +++++++++++------- 1 file changed, 153 insertions(+), 98 deletions(-) diff --git a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue index b13ccf8..faf0fd1 100644 --- a/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue +++ b/src/views/dike/runManage/pestAnimalControl/governanceRecords/index.vue @@ -17,6 +17,8 @@ import { updateDikeAnimalRecordStatus, } from "@/api/dike"; +import { uploadFileData } from "@/api/system/upload"; + export default { name: "InspectionItems", data() { @@ -80,9 +82,9 @@ export default { drugs: [{ drugName: "", concentration: "", dose: "" }], // 用药 }, planRules: { - planId: [{ required: true, message: "请选择计划", trigger: "blur" }], + planId: [{ required: true, message: "请选择计划", trigger: "change" }], dikeCode: [ - { required: true, message: "请选择堤防名称", trigger: "blur" }, + { required: true, message: "请选择堤防名称", trigger: "change" }, ], type: [{ required: true, message: "请选择计划", trigger: "change" }], month: [{ required: true, message: "请选择月份", trigger: "change" }], @@ -176,14 +178,12 @@ export default { }, // 确认 handleConfirm(row) { - console.log("row >>>>> ", row); this.$confirm("是否确认？", "提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }) .then(() => { - console.log("?????????"); updateDikeAnimalRecordStatus({ id: row.id, status: "1", @@ -199,71 +199,70 @@ export default { }, // 查看或编辑计划详情 viewOrEditPlanDetails(row, edit = false) { + this.handleGetRemotePlanData(""); if (!edit) { this.prohibitEditing = true; } - getDFMaintenancePlan(row.id).then((res) => { + getDFPreventionControlPlan(row.planId).then((res) => { if (res.data) { this.planForm = res.data; + this.planForm.planName = res.data.name; + this.planForm.planId = res.data.id; + this.planForm.selectUser = res.data.otherConfig.selectUser; // this.planForm.reminderCycle = res.data.instruction + res.data.month; // ?????? this.dialogVisible = true; - this.recordForm.id = row.id; } }); getDikeAnimalRecordDetails(row.id).then((res) => { + this.recordForm.id = row.id; this.recordForm = res.data || this.recordForm; }); - }, - handleRemove(file) { - console.log(file); - }, - handlePictureCardPreview(file) { - this.dialogImageUrl = file.url; - this.imageDialog = true; - }, - handleDownload(file) { - console.log(file); + + console.log("查看 >>>> ", this.planList); }, // 保存维修计划 - submitForm(formName) { - console.log("this.planForm >>>>> ", this.planForm); - this.$refs[formName].validate((valid) => { - if (valid) { - if (this.planForm.id) { - updateDikeAnimalRecordData({ - planId: this.planForm.planId, - planName: this.planForm.name, - id: this.$route.query.id, - dikeCode: this.$route.query.dikeCode, - ...this.recordForm, - }).then(() => { - this.getTableData(); - this.dialogVisible = false; - this.$message({ - message: "保存成功", - type: "success", - }); - }); - } else { - addDikeAnimalRecordData({ - planId: this.planForm.planId, - planName: this.planForm.name, - id: null, - status: "0", - dikeCode: this.$route.query.dikeCode, - ...this.recordForm, - }).then(() => { - this.getTableData(); - this.dialogVisible = false; - this.$message({ - message: "保存成功", - type: "success", - }); - }); - } - } else { - console.log("校验不通过"); - return false; + submitForm() { + this.$refs.planForm.validate((v) => { + if (v) { + this.$refs.recordForm.validate((valid) => { + if (valid) { + if (this.planForm.id) { + updateDikeAnimalRecordData({ + planId: this.planForm.planId, + planName: this.planForm.name, + id: this.$route.query.id, + dikeCode: this.$route.query.dikeCode, + ...this.recordForm, + }).then(() => { + this.getTableData(); + this.dialogVisible = false; + this.$message({ + message: "保存成功", + type: "success", + }); + }); + } else { + addDikeAnimalRecordData({ + planId: this.planForm.planId, + planName: this.planForm.name, + id: null, + status: "0", + dikeCode: this.$route.query.dikeCode, + ...this.recordForm, + }).then(() => { + this.getTableData(); + this.dialogVisible = false; + this.$message({ + message: "保存成功", + type: "success", + }); + }); + } + } else { + console.log("校验不通过"); + return false; + } + }); } }); }, @@ -273,9 +272,9 @@ export default { this.dialogVisible = false; }, // 关闭dialog - closeDialog(planForm = "planForm") { - console.log("触发关闭dialog", planForm); - this.$refs[planForm].resetFields(); + closeDialog() { + this.$refs.recordForm.resetFields(); + this.$refs.planForm.resetFields(); this.planForm = { dikeCode: "", name: "", @@ -285,6 +284,15 @@ export default { location: "", content: "", }; + this.recordForm = { + id: null, + location: "", + constructionStatus: "", + pest: null, + images: [], + remark: "", + drugs: [{ drugName: "", concentration: "", dose: "" }], // 用药 + }; }, // 添加工作项 addWorkItem() { @@ -346,7 +354,6 @@ export default { changeDikePlan(planId) { if (planId) { getDFPreventionControlPlan(planId).then((res) => { - console.log("res >>>>> ", res); if (res?.data) { const { data } = res; this.planForm.dikeCode = data.dikeCode; @@ -364,6 +371,30 @@ export default { }); } }, + // 上传前 + beforeUpload(e) { + if (this.recordForm.images?.length >= 10) { + this.$message.warning("最多上传10张图片"); + return false; + } + return true; + }, + handleUpload(e) { + const { file } = e; + let fData = new FormData(); + fData.append("file", file); + uploadFileData(fData) + .then((res) => { + this.recordForm.images?.push(res.url); + }) + .catch((err) => { + console.log("err >>>>> ", err); + }); + }, + // 删除图片 + handleDelImages(index) { + this.recordForm.images.splice(index, 1); + }, }, mounted() { this.getDicts("dh_jh_type").then((res) => { @@ -471,9 +502,9 @@ export default { >编辑 确认 - - -
- - - - - - - - - - - - +
+
+ + + +
+
+ + - - -