From 7c5fc039b51910698173c97179f2473e3a565a19 Mon Sep 17 00:00:00 2001 From: panyuyi Date: Wed, 12 Jun 2024 18:36:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/common/icon-checked.png | Bin 0 -> 326 bytes .../inspectionPlan/components/PlanDetail.vue | 200 ++++++++++-------- .../enginerring/inspectionPlan/index.vue | 1 + .../components/NewRecord.vue | 35 ++- .../enginerring/inspectionRecords/index.vue | 20 +- .../inspectionRouteManage/CreateRoutePage.vue | 4 +- .../components/RouteDetail.vue | 12 +- .../inspectionRouteManage/index.vue | 11 +- 8 files changed, 176 insertions(+), 107 deletions(-) create mode 100644 src/assets/common/icon-checked.png diff --git a/src/assets/common/icon-checked.png b/src/assets/common/icon-checked.png new file mode 100644 index 0000000000000000000000000000000000000000..69e01d0536501bd832cf2f39a7b7c80db04770fc GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|$p7H!;uvDlo17p~>5!EsC2lmoQ{?Qd?yfy7J9heK>gi5XzsYdc)iut?=YP1N zkwJ#>zu)2gR~dSLvU2?}F*YzL`2YWZ{bBX8wj3U2lV{=@1{;muT#t$h=npnN{NMEc zznYF3p=P1)`(N0@)5F#CUs5`uO(8oi;m7_tjlK%M93M5wpAa)pD&8_pB+S6b zU<=SxgFop%_BTvyG!$7hGx6iq_3@J>FQxx=`!1)vtKr(DLrHFIZE_O-?GOL2ynbWe zGQ*a&|GIT+43Zv3`P9GP|DT7I2MB-;n_v32&p}J?Y(?X@LpJU?dNOSc3>i(q#xE;< Regpl^;OXk;vd$@?2>>qhf}H>W literal 0 HcmV?d00001 diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue index ad6fe71..08762d0 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue @@ -184,105 +184,113 @@ v-for="(item, index) in formData.contents" :key="index" > -
-
- 子项{{ index + 1 }} -
- - 删除 - -
-
- - - - - +
+
+ 子项{{ index + 1 }} +
+ + 删除 + +
+
+ + + + - + + + + + + + + + +
+ + +
暂无数据
 - + -
- - -
暂无数据
- - - - - - - - - - + + + +
v.dutyHolderType === "0" + )?.name; }, handleGetRemoteDikeMethod(query) { console.log("query >>>>> ", query); @@ -520,9 +540,13 @@ export default { }, submit(reset) { console.log("提交表单 >>>> ", this.formData); + console.log("subFormRef >>>>>>>> ", this.$refs.subFormRef); return new Promise((r, j) => { - this.$refs.formRef.validate((valid) => { - if (valid) { + Promise.all([ + this.$refs.formRef.validate(), + ...this.$refs.subFormRef.map((item) => item.validate()), + ]) + .then((res) => { this.formData.contents.forEach((item) => { item.startDate = item.planDateTimeArr[0] ? item.planDateTimeArr[0] + " 00:00:00" @@ -545,10 +569,10 @@ export default { .catch(() => { j(); }); - } else { + }) + .catch(() => { j(); - } - }); + }); }); }, reset() { diff --git a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue index 82216fe..1810040 100644 --- a/src/views/dike/runManage/enginerring/inspectionPlan/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionPlan/index.vue @@ -318,6 +318,7 @@ export default { @@ -148,6 +148,18 @@ label: 'value', }" > +
@@ -247,6 +259,8 @@ export default { dikeName: "", dikeCode: "", dikeType: "", + subPlanId: "", + subPlanName: "", subPlanStartDate: "", subPlanEndDate: "", startDate: "", @@ -261,6 +275,12 @@ export default { items: [], rules: { planId: [{ required: true, message: "请选择计划", trigger: "change" }], + subPlanId: [ + { required: true, message: "请选择子计划", trigger: "change" }, + ], + startDate: [ + { required: true, message: "请选择巡查时间", trigger: "change" }, + ], }, filesList: [], // 图片列表 entries: {}, @@ -354,7 +374,7 @@ export default { this.formData.lineName = ""; this.formData.lineType = ""; this.formData.dutyHolderType = ""; - this.formData.scope = ""; + this.formData.scope = "" || "-1"; this.items = []; this.entries = {}; this.checkTreeData = []; @@ -365,6 +385,12 @@ export default { ); this.formData.planName = planItem.name; this.formData.planId = planItem.id; + + setTimeout(() => { + this.$refs.formRef.clearValidate(); + console.log("重置表单验证效果 >>>>>>> "); + }, 30); + getProjectCheckingPlanDetails(planItem.id).then((res) => { this.subPlanList = res.data?.contents || []; this.formData.dikeName = res.data?.dikeName; @@ -374,7 +400,7 @@ export default { }, handleChangeSubPlan() { let subPlanItem = this.subPlanList.find( - (v) => v.name === this.formData.subPlanName + (v) => v.id === this.formData.subPlanId ); this.formData.subPlanName = subPlanItem.name; this.formData.subPlanId = subPlanItem.id; @@ -709,7 +735,6 @@ export default { this.subPlanDateArr = []; this.formData.subPlanStartDate = ""; this.formData.subPlanEndDate = ""; - this.xcDateArr = []; this.formData.startDate = ""; this.formData.endDate = ""; this.formData.lineId = ""; diff --git a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue index 4ff3b11..47f3182 100644 --- a/src/views/dike/runManage/enginerring/inspectionRecords/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRecords/index.vue @@ -306,6 +306,7 @@ export default { - - - + +
@@ -392,8 +398,8 @@ export default { placeholder="请选择" > - - + +
@@ -438,9 +444,9 @@ export default { v-if="scope.row.status === '1'" type="success" class="normal" - >已处理已处置 - 未处理 + 未处置 diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/CreateRoutePage.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/CreateRoutePage.vue index 269f40d..a0a9fd0 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/CreateRoutePage.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/CreateRoutePage.vue @@ -38,7 +38,9 @@ export default { handleSave(reset) { this.$refs.formRef.submit(reset).then((res) => { console.log("res >>>>> ", res); - this.$router.go(-1); + if (!reset) { + this.$router.go(-1); + } }); }, handleCancel() { diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue index 0e80050..d2230df 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/components/RouteDetail.vue @@ -47,17 +47,17 @@ > - +
-
巡查计划设置
+
巡查路线设置
v.dutyHolderType === "0" + )?.name; }, handleGetRemoteDikeMethod(query) { console.log("query >>>>> ", query); diff --git a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue index d007124..4a75bb9 100644 --- a/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue +++ b/src/views/dike/runManage/enginerring/inspectionRouteManage/index.vue @@ -22,6 +22,7 @@ + > + +