Merge branch 'release-sy-v1.0.0' into 'dev'

fix: 修改bug

See merge request project/water/shuili-vue!133

src/views/dike/runManage/enginerring/inspectionPlan/components/PlanDetail.vue

@@ -565,28 +565,37 @@ export default {
           ...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"
-                : "";
-              item.endDate = item.planDateTimeArr[1]
-                ? item.planDateTimeArr[1] + " 23:59:59"
-                : "";
-            });
-            (this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
-              id: this.id || null,
-              ...this.formData,
+            // 二次确认
+            this.$confirm("确认提交吗？", "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             })
-              .then((res) => {
-                this.$message.success("提交成功");
-                if (reset) {
-                  this.reset();
-                }
-                r();
+              .then(() => {
+                this.formData.contents.forEach((item) => {
+                  item.startDate = item.planDateTimeArr[0]
+                    ? item.planDateTimeArr[0] + " 00:00:00"
+                    : "";
+                  item.endDate = item.planDateTimeArr[1]
+                    ? item.planDateTimeArr[1] + " 23:59:59"
+                    : "";
+                });
+                (this.id ? putProjectCheckingPlan : postProjectCheckingPlan)({
+                  id: this.id || null,
+                  ...this.formData,
+                })
+                  .then((res) => {
+                    this.$message.success("提交成功");
+                    if (reset) {
+                      this.reset();
+                    }
+                    r();
+                  })
+                  .catch(() => {
+                    j();
+                  });
               })
-              .catch(() => {
-                j();
-              });
+              .catch(() => {});
           })
           .catch(() => {
             j();

src/views/dike/runManage/enginerring/inspectionRecords/CreateInspectionRecords.vue

@@ -15,6 +15,13 @@
           @click="handleSave(true)"
           >保存并继续新增</el-button
         >
+        <el-button
+          type="primary"
+          size="small"
+          v-if="$route.query.mode === 'edit'"
+          @click="handleSave(false, true)"
+          >保存并完成巡查</el-button
+        >
         <el-button size="small" @click="handleCancel">取消</el-button>
       </div>
     </div>
@@ -35,8 +42,8 @@ export default {
   },
   created() {},
   methods: {
-    handleSave(reset) {
-      this.$refs.formRef.submit(reset).then((res) => {
+    handleSave(reset, endXc = false) {
+      this.$refs.formRef.submit(reset, endXc).then((res) => {
         if (!reset) {
           this.$router.go(-1);
         }

src/views/dike/runManage/enginerring/inspectionRecords/components/NewRecord.vue

@@ -701,36 +701,48 @@ export default {
         }, 30);
       }
     },
-    submit(reset) {
+    submit(reset, endXc = false) {
       console.log("提交表单 >>>> ", this.formData);
       return new Promise((r, j) => {
         this.$refs.formRef.validate((valid) => {
           if (valid) {
-            this.items?.forEach((v) => {
-              if (v.hasProblem != "1") {
-                v.problem = "";
-                v.problemImages = [];
-              }
-            });
-
-            (this.id ? updateRecordData : addRecordData)({
-              id: this.id || null,
-              ...this.formData,
-              items: this.items,
-              startDate: this.xcDateArr[0] || "",
-              endDate: this.xcDateArr[1] || "",
-              subPlanStartDate: this.subPlanDateArr[0] || "",
-              subPlanEndDate: this.subPlanDateArr[1] || "",
+            // 二次确认
+            this.$confirm(`确认提交吗？`, "提示", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
             })
-              .then((res) => {
-                this.$message.success("提交成功");
-                if (reset) {
-                  this.reset();
-                }
-                r();
+              .then(() => {
+                this.items?.forEach((v) => {
+                  if (v.hasProblem != "1") {
+                    v.problem = "";
+                    v.problemImages = [];
+                  }
+                });
+
+                (this.id ? updateRecordData : addRecordData)({
+                  id: this.id || null,
+                  ...this.formData,
+                  items: this.items,
+                  startDate: this.xcDateArr[0] || "",
+                  endDate: this.xcDateArr[1] || "",
+                  subPlanStartDate: this.subPlanDateArr[0] || "",
+                  subPlanEndDate: this.subPlanDateArr[1] || "",
+                  status: endXc ? "1" : "0",
+                })
+                  .then((res) => {
+                    this.$message.success("提交成功");
+                    if (reset) {
+                      this.reset();
+                    }
+                    r();
+                  })
+                  .catch((e) => {
+                    console.log("err >>>>>  ", e);
+                    j();
+                  });
               })
-              .catch((e) => {
-                console.log("err >>>>>  ", e);
+              .catch(() => {
                 j();
               });
           } else {

src/views/dike/runManage/enginerring/inspectionRecords/index.vue

@@ -86,7 +86,7 @@ export default {
     handleEdit(row) {
       this.$router.push({
         path: "createInspectionRecords",
-        query: { id: row.id },
+        query: { id: row.id, mode: "edit" },
       });
     },
     handleDel(row) {
@@ -565,7 +565,9 @@ export default {
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.status == '0' ||scope.row.handleStatus != '1'"
+              :disabled="
+                scope.row.status == '0' || scope.row.handleStatus != '1'
+              "
               @click="handleCheckDetails(scope.row, true)"
               >处置</el-button
             >