From 400c116e0040aa5094db00c03de052ab4461745d Mon Sep 17 00:00:00 2001
From: hejunjie <hejunjie@datametatech.com>
Date: Wed, 24 Jul 2024 18:18:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E8=BD=AEbug=EF=BC=8C=E8=AE=A1=E5=88=92=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dike/index.js                         |  2 +-
 .../maintenancePlan/components/PlanDetail.vue |  4 ++
 .../maintenance/maintenancePlan/index.vue     | 67 +++++++++++++++++--
 .../maintenancePlanAccept/index.vue           | 15 +++--
 .../maintenancePlanAudit/index.vue            | 15 +++--
 .../CreateMaintenanceRecord.vue               | 51 +++++++-------
 .../components/RecordDetail.vue               | 21 +++---
 .../maintenance/maintenanceRecords/index.vue  | 15 +++--
 src/views/mobilePage/index.vue                | 29 +++++---
 .../maintenancePlan/components/PlanDetail.vue |  7 +-
 .../maintenance/maintenancePlan/index.vue     | 64 ++++++++++++++++--
 .../maintenancePlanAccept/index.vue           | 15 +++--
 .../maintenancePlanAudit/index.vue            | 16 +++--
 .../CreateMaintenanceRecord.vue               | 50 ++++++++------
 .../components/RecordDetail.vue               | 22 +++---
 .../maintenance/maintenanceRecords/index.vue  | 15 +++--
 16 files changed, 293 insertions(+), 115 deletions(-)

diff --git a/src/api/dike/index.js b/src/api/dike/index.js
index a93cb7b..5f160b5 100644
--- a/src/api/dike/index.js
+++ b/src/api/dike/index.js
@@ -290,7 +290,7 @@ export function postYhRecordaApproval(data) {
 export function delRunDzYhPlan(data) {
   return request({
     url: `/run/df/yh/plan/${data.id}`,
-    method: 'del'
+    method: 'delete'
   })
 }
 
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index e7e4791..e8b5a1a 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -257,6 +257,10 @@
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
+            <el-tag v-if="activity.status == 0" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">待提交</el-tag>
+            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
+            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
+            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
             <div>审批意见: {{activity.comment}}</div>
             <div>审批附件: {{
               activity.docs &&
diff --git a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
index a14a2c0..f9efe7c 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlan/index.vue
@@ -25,7 +25,9 @@ export default {
         adcd: "",
         dikeName: "",
         dikeType: "",
+        engScal: "",
         name: "",
+        status: "",
         planDateArr: [],
       },
       choiceDate: '',
@@ -37,11 +39,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -52,6 +53,7 @@ export default {
       dialogVisible: false,
       areasOptions: [], // 行政区划列表
       embankmentTypeOptions: [], // 堤防类型列表
+      scaleOptions: [], // 堤防类型列表
       supplementOptions: [], // 资金来源列表
       tableData: [], // 表格列表
       tableCheckData: [], // 选中的数据
@@ -148,6 +150,8 @@ export default {
             : null,
           dikeName: this.paramsData.dikeName,
           dikeType: this.paramsData.dikeType,
+          engScal: this.paramsData.engScal,
+          status: this.paramsData.status,
         },
         pageSize: this.pageData.pageSize,
         pageNum: this.pageData.pageNum,
@@ -208,6 +212,8 @@ export default {
       this.paramsData.planDateArr = [];
       this.paramsData.dikeName = "";
       this.paramsData.dikeType = "";
+      this.paramsData.engScal = "";
+      this.paramsData.status = "";
 
       this.reqCountCalc();
       this.pageData.pageNum = 1;
@@ -235,12 +241,21 @@ export default {
       })
       return name;
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
     this.getDicts("embankment_type").then((response) => {
       this.embankmentTypeOptions = response.data;
     });
+    this.getDicts("df-scale").then((response) => {
+      this.scaleOptions = response.data;
+    });
 
     this.getDicts("xs_yh_supplement").then((response) => {
       this.supplementOptions = response.data;
@@ -317,6 +332,26 @@ export default {
             placeholder="请输入名称"
           />
         </div>
+        <div class="search-item flex items-center">
+          <span class="search-label">工程规模</span>
+          <el-select
+            clearable
+            size="small"
+            class="w-202 ml-10"
+            v-model="paramsData.engScal"
+            :popper-append-to-body="false"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              v-for="(item, index) in scaleOptions"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </div>
         <div class="search-item flex items-center">
           <span class="search-label">维养计划日期</span>
           <el-date-picker
@@ -330,6 +365,24 @@ export default {
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </div>
+        <div class="search-item flex items-center">
+          <span class="search-label">计划状态</span>
+          <el-select
+            clearable
+            size="small"
+            class="w-202 ml-10"
+            v-model="paramsData.status"
+            :popper-append-to-body="false"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option label="待提交" value="0"> </el-option>
+            <el-option label="审批中" value="1"> </el-option>
+            <el-option label="已通过" value="2"> </el-option>
+            <el-option label="已驳回" value="3"> </el-option>
+          </el-select>
+        </div>
         <div class="flex-1 flex justify-end search-item">
           <el-button
             size="small"
@@ -381,8 +434,14 @@ export default {
         </el-table-column>
         <el-table-column prop="name" align="center" label="维养计划名称" />
         <el-table-column prop="startDate" align="center" label="计划开始时间">
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.startDate) }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="endDate" align="center" label="计划结束时间">
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.endDate) }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="supplements" align="center" label="资金来源/万元" >
           <template slot-scope="scope">
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
index c3841b1..e93b302 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -43,11 +43,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -253,6 +252,12 @@ export default {
       this.dialog.visible = true
       this.preViewFile = file
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
@@ -416,7 +421,7 @@ export default {
         </el-table-column>
         <el-table-column prop="name" align="center" label="完成维养时间" >
           <template slot-scope="scope">
-            <span>{{ scope.row.detail.finishedTime }}</span>
+            <span>{{ formatDate(scope.row.detail.finishedTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="unit" align="center" label="维养单位">
diff --git a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
index 60c0fe2..e120eef 100644
--- a/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -47,11 +47,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -247,6 +246,12 @@ export default {
       this.dialog.visible = true
       this.preViewFile = file
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
@@ -400,7 +405,7 @@ export default {
           label="计划开始/结束时间"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.detail.startDate }}/{{scope.row.detail.endDate}}</span>
+            <span>{{ formatDate(scope.row.detail.startDate) }}/{{formatDate(scope.row.detail.endDate)}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="unit" align="center" label="维养单位">
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
index ff0a003..493e3f1 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
@@ -52,29 +52,34 @@ export default {
     handleSave(reset) {
       const formRef = this.$refs.formRef
       formRef.submit(async (res) => {
-        console.log(res)
-        const data = {...res}
-        data.plan = undefined
-        data.doc = {}
-        data.ledgerDoc = {}
-        data.doc.docs = formRef.filesList.map((v) => v.url) || [];
-        data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
-        console.log(data);
-        try {
-          if (this.id) {
-            await putYhRecord({id: this.id, ...data});
-          } else {
-            await postYhRecord(data)
-          }
-          this.$message.success("提交成功");
-          if (!reset) {
-            this.$router.go(-1)
-          } else {
-            formRef.reset()
-          }
-        } catch (error) {
-          console.log(error)
-        }
+          this.$confirm("确认提交吗？", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(async () => {
+            const data = {...res}
+            data.plan = undefined
+            data.doc = {}
+            data.ledgerDoc = {}
+            data.doc.docs = formRef.filesList.map((v) => v.url) || [];
+            data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
+            console.log(data);
+            try {
+              if (this.id) {
+                await putYhRecord({id: this.id, ...data});
+              } else {
+                await postYhRecord(data)
+              }
+              this.$message.success("提交成功");
+              if (!reset) {
+                this.$router.go(-1)
+              } else {
+                formRef.reset()
+              }
+            } catch (error) {
+              console.log(error)
+            }
+          });
       })
     },
     handlePassed() {
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 53dc5eb..6dd7e6c 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -263,6 +263,10 @@
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
+            <el-tag v-if="activity.status == 0" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">待提交</el-tag>
+            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
+            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
+            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
             <div>审批意见: {{activity.comment}}</div>
             <div>审批附件: {{
                 activity.docs &&
@@ -587,15 +591,7 @@ export default {
     searchPlan(value) {
       postDFMaintenancePlanList({
         data: {
-          timeView: {
-            timeField: "create_time",
-          },
-          dikeCode: this.$route.query.dikeCode,
-        },
-        cv: {
-          name: "name",
-          type: "like",
-          value,
+          dikeName: value,
         },
         pageSize: 100,
         pageNum: 1,
@@ -709,5 +705,12 @@ export default {
 </script>
 <style scoped lang="scss">
 .record-detail {
+  .form-row-title {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 10px;
+    border-left: 4px solid #36b29e;
+    padding-left: 8px;
+  }
 }
 </style>
diff --git a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
index 5bbb51d..ee5c506 100644
--- a/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/maintenance/maintenanceRecords/index.vue
@@ -41,11 +41,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -262,6 +261,12 @@ export default {
       });
       return name || type;
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData()
@@ -426,7 +431,7 @@ export default {
         </el-table-column>
         <el-table-column align="center" label="完成维养时间">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
+            <span>{{ scope.row.plan ? formatDate(scope.row.plan.endDate) : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="维养单位">
diff --git a/src/views/mobilePage/index.vue b/src/views/mobilePage/index.vue
index b2b22a0..f6889dc 100644
--- a/src/views/mobilePage/index.vue
+++ b/src/views/mobilePage/index.vue
@@ -5,21 +5,30 @@
 </template>
 <script>
 import { getToken } from "@/utils/auth";
-const isProDuction = process.env.NODE_ENV === "production";
-// 本地h5地址
-const devSrc = "http://172.16.34.83:8002/";
-// prod地址
-// const proSrc = 'http://shuili-h5.product.dev.com:30115/'
-// 获取当前请求地址
-const currentUrl = window.location.origin + '/mobileH5';
-console.log("currentUrl:", currentUrl);
-const h5Src = `${isProDuction ? currentUrl : devSrc}?t=${getToken()}`;
 export default {
   data() {
     return {
-      h5Src,
+      h5Src: '',
     };
   },
+  created() {
+    const isProDuction = process.env.NODE_ENV === "production";
+    const topTab = sessionStorage.getItem("topTab");
+    console.log(topTab)
+    // 本地h5地址
+    const devSrc = topTab === 'sluice'
+      ? "http://172.16.35.166:8002/mobileH5/SZengineeringInspectionList"
+      : 'http://172.16.35.166:8002/mobileH5/engineeringInspectionList';
+    // prod地址
+    // const proSrc = 'http://shuili-h5.product.dev.com:30115/'
+    // 获取当前请求地址
+    const currentUrl = topTab === 'sluice'
+      ? window.location.origin + "/mobileH5/SZengineeringInspectionList"
+      : window.location.origin + '/mobileH5/engineeringInspectionList';
+    console.log("currentUrl:", currentUrl);
+    this.h5Src = `${isProDuction ? currentUrl : devSrc}?t=${getToken()}`;
+    console.log(123123)
+  },
 };
 </script>
 <style lang="scss">
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
index 5ab4c4b..8cd03a4 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/components/PlanDetail.vue
@@ -257,6 +257,10 @@
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
+            <el-tag v-if="activity.status == 0" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">待提交</el-tag>
+            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
+            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
+            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
             <div>审批意见: {{activity.comment}}</div>
             <div>审批附件: {{
               activity.docs &&
@@ -663,9 +667,6 @@ export default {
                     } else {
                       this.$message.success("驳回成功");
                     }
-                    if (reset) {
-                      this.reset();
-                    }
                     r();
                   })
                   .catch(() => {
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
index f8d87c3..82eace8 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlan/index.vue
@@ -29,6 +29,7 @@ export default {
         wagaName: "",
         wagaType: "",
         name: "",
+        status: "",
         planDateArr: [],
       },
       choiceDate: '',
@@ -40,11 +41,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -55,6 +55,7 @@ export default {
       dialogVisible: false,
       areasOptions: [], // 行政区划列表
       embankmentTypeOptions: [], // 水闸类型列表
+      scaleOptions: [], // 规模类型列表
       supplementOptions: [], // 资金来源列表
       tableData: [], // 表格列表
       tableCheckData: [], // 选中的数据
@@ -151,6 +152,7 @@ export default {
             : null,
           wagaName: this.paramsData.wagaName,
           wagaType: this.paramsData.wagaType,
+          status: this.paramsData.status,
         },
         pageSize: this.pageData.pageSize,
         pageNum: this.pageData.pageNum,
@@ -212,6 +214,7 @@ export default {
       this.paramsData.planDateArr = [];
       this.paramsData.wagaName = "";
       this.paramsData.wagaType = "";
+      this.paramsData.status = "";
 
       this.reqCountCalc();
       this.pageData.pageNum = 1;
@@ -239,6 +242,12 @@ export default {
       })
       return name;
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
@@ -246,6 +255,9 @@ export default {
       this.embankmentTypeOptions = response.data;
     });
 
+    this.getDicts("sz-scale").then((response) => {
+      this.scaleOptions = response.data;
+    });
     this.getDicts("xs_yh_supplement").then((response) => {
       this.supplementOptions = response.data;
     });
@@ -320,6 +332,26 @@ export default {
             placeholder="请输入名称"
           />
         </div>
+        <div class="search-item flex items-center">
+          <span class="search-label">工程规模</span>
+          <el-select
+            clearable
+            size="small"
+            class="w-202 ml-10"
+            v-model="paramsData.engScal"
+            :popper-append-to-body="false"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              v-for="(item, index) in scaleOptions"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </div>
         <div class="search-item flex items-center">
           <span class="search-label">维养计划日期</span>
           <el-date-picker
@@ -333,6 +365,24 @@ export default {
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </div>
+        <div class="search-item flex items-center">
+          <span class="search-label">计划状态</span>
+          <el-select
+            clearable
+            size="small"
+            class="w-202 ml-10"
+            v-model="paramsData.status"
+            :popper-append-to-body="false"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option label="全部" value=""> </el-option>
+            <el-option label="待提交" value="0"> </el-option>
+            <el-option label="审批中" value="1"> </el-option>
+            <el-option label="已通过" value="2"> </el-option>
+            <el-option label="已驳回" value="3"> </el-option>
+          </el-select>
+        </div>
         <div class="flex-1 flex justify-end search-item">
           <el-button
             size="small"
@@ -381,8 +431,14 @@ export default {
         </el-table-column>
         <el-table-column prop="name" align="center" label="维养计划名称" />
         <el-table-column prop="startDate" align="center" label="计划开始时间">
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.startDate) }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="endDate" align="center" label="计划结束时间">
+          <template slot-scope="scope">
+            <span>{{ formatDate(scope.row.endDate) }}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="supplements" align="center" label="资金来源/万元" >
           <template slot-scope="scope">
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
index 4e80699..02097a7 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAccept/index.vue
@@ -41,11 +41,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -249,6 +248,12 @@ export default {
       this.dialog.visible = true
       this.preViewFile = file
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
@@ -409,7 +414,7 @@ export default {
         </el-table-column>
         <el-table-column prop="name" align="center" label="完成维养时间" >
           <template slot-scope="scope">
-            <span>{{ scope.row.detail.finishedTime }}</span>
+            <span>{{ formatDate(scope.row.detail.finishedTime) }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="unit" align="center" label="维养单位">
diff --git a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
index 38c90e4..ff11a24 100644
--- a/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenancePlanAudit/index.vue
@@ -38,11 +38,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -238,6 +237,12 @@ export default {
       this.dialog.visible = true
       this.preViewFile = file
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData();
@@ -391,7 +396,8 @@ export default {
           label="计划开始/结束时间"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.detail.startDate }}/{{scope.row.detail.endDate}}</span>
+            <span>{{ formatDate(scope.row.detail.startDate) }}
+              /{{formatDate(scope.row.detail.endDate)}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="unit" align="center" label="维养单位">
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
index 174e250..5934983 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/CreateMaintenanceRecord.vue
@@ -51,30 +51,36 @@ export default {
   methods: {
     handleSave(reset) {
       const formRef = this.$refs.formRef
-      formRef.submit(async (res) => {
+      formRef.submit((res) => {
         console.log(res)
-        const data = {...res}
-        data.plan = undefined
-        data.doc = {}
-        data.ledgerDoc = {}
-        data.doc.docs = formRef.filesList.map((v) => v.url) || [];
-        data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
-        console.log(data);
-        try {
-          if (this.id) {
-            await putRunSzYhRecord({id: this.id, ...data});
-          } else {
-            await postRunSzYhRecord(data)
+        this.$confirm("确认提交吗？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(async () => {
+          const data = {...res}
+          data.plan = undefined
+          data.doc = {}
+          data.ledgerDoc = {}
+          data.doc.docs = formRef.filesList.map((v) => v.url) || [];
+          data.ledgerDoc.images = formRef.ledgerList.map((v) => v.url) || [];
+          console.log(data);
+          try {
+            if (this.id) {
+              await putRunSzYhRecord({id: this.id, ...data});
+            } else {
+              await postRunSzYhRecord(data)
+            }
+            this.$message.success("提交成功");
+            if (!reset) {
+              this.$router.go(-1)
+            } else {
+              formRef.reset()
+            }
+          } catch (error) {
+            console.log(error)
           }
-          this.$message.success("提交成功");
-          if (!reset) {
-            this.$router.go(-1)
-          } else {
-            formRef.reset()
-          }
-        } catch (error) {
-          console.log(error)
-        }
+        })
       })
     },
     handlePassed() {
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
index 44fafbb..6f308b4 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/components/RecordDetail.vue
@@ -265,6 +265,10 @@
             v-for="(activity, index) in activities"
             :key="index"
             :timestamp="activity.approvalTime">
+            <el-tag v-if="activity.status == 0" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">待提交</el-tag>
+            <el-tag v-if="activity.status == 1" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">审批中</el-tag>
+            <el-tag v-if="activity.status == 2" style="position: absolute; left: 200px;top: -5px;" size="small" type="success">已通过</el-tag>
+            <el-tag v-if="activity.status == 3" style="position: absolute; left: 200px;top: -5px;" size="small" type="danger">已驳回</el-tag>
             <div>审批意见: {{activity.comment}}</div>
             <div>审批附件: {{
                 activity.docs &&
@@ -583,17 +587,10 @@ export default {
     },
     // 搜索计划
     searchPlan(value) {
+      console.log(value)
       postRunSzYhPlanList({
         data: {
-          timeView: {
-            timeField: "create_time",
-          },
-          wagaCode: this.$route.query.wagaCode,
-        },
-        cv: {
-          name: "name",
-          type: "like",
-          value,
+          wagaName: value,
         },
         pageSize: 100,
         pageNum: 1,
@@ -708,5 +705,12 @@ export default {
 </script>
 <style scoped lang="scss">
 .record-detail {
+  .form-row-title {
+    font-size: 16px;
+    font-weight: bold;
+    margin-bottom: 10px;
+    border-left: 4px solid #36b29e;
+    padding-left: 8px;
+  }
 }
 </style>
diff --git a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
index 48d4953..44c915c 100644
--- a/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
+++ b/src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue
@@ -40,11 +40,10 @@ export default {
           }
         },
         disabledDate: (time) => {//只能选择5年数据
-          let curDate = (new Date()).getTime();
-          let three = 5 * 12 * 30 * 24 * 3600 * 1000;
-          let min = curDate + three;
-          let max = curDate - three;
           if (this.choiceDate) {
+            let three = 5 * 12 * 30 * 24 * 3600 * 1000;
+            let min = this.choiceDate + three;
+            let max = this.choiceDate - three;
             return time.getTime() < max || time.getTime() > min;
           } else {
             return false;
@@ -261,6 +260,12 @@ export default {
       });
       return name || type;
     },
+    // 过滤时间日期
+    formatDate(dateStr) {
+      const date = new Date(dateStr);
+      console.log(date)
+      return date.toISOString().split('T')[0];
+    }
   },
   created() {
     this.getTreeData()
@@ -421,7 +426,7 @@ export default {
         </el-table-column>
         <el-table-column align="center" label="完成维养时间">
           <template slot-scope="scope">
-            <span>{{ scope.row.plan ? scope.row.plan.endDate : '' }}</span>
+            <span>{{ scope.row.plan ? formatDate(scope.row.plan.endDate) : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="维养单位">