From 5e2aafeede13d337380f736567caf74f49713be7 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:38:32 +0800
Subject: [PATCH] 代码优化

---
 src/views/publicSecurity/positionManage/TransactRegist.vue |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/views/publicSecurity/positionManage/TransactRegist.vue b/src/views/publicSecurity/positionManage/TransactRegist.vue
index 7fd9e40..7b7cef3 100644
--- a/src/views/publicSecurity/positionManage/TransactRegist.vue
+++ b/src/views/publicSecurity/positionManage/TransactRegist.vue
@@ -63,7 +63,7 @@
   import {
     getList,
     getDetail,
-    removeTask,
+    remove as removeTask,
     update,
     add,
   } from "@/api/task/labelReporting"
@@ -159,6 +159,60 @@
           selection: true,
           dialogClickModal: false,
           column: [{
+              label: "发生时间",
+              prop: "dateRange",
+              type: "daterange",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              searchRange: true,
+              startPlaceholder: '开始日期',
+              endPlaceholder: '结束日期',
+              align: 'center',
+              search: true,
+              hide: true,
+              searchSpan: 5,
+              searchLabelWidth: 76,
+            },
+            {
+              label: "所属街道",
+              parent: false,
+              search: true,
+              searchSpan: 4,
+              prop: "streetName",
+              type: "tree",
+              dicUrl: "/api/blade-system/region/getTownTree",
+              props: {
+                label: "name",
+                value: "name"
+              },
+              rules: [{
+                required: true,
+                message: "请选择所属街道",
+                trigger: "blur",
+              }, ],
+            },
+
+            {
+              parent: false,
+              label: "所属社区",
+              prop: "communityName",
+              search: true,
+              searchSpan: 4,
+              width: 150,
+              type: "tree",
+              dicUrl: "/api/blade-system/region/treeToCommunity",
+              props: {
+                label: "name",
+                value: "name",
+              },
+              cascader: ["gridCode"],
+              rules: [{
+                required: true,
+                message: "请选择所属社区",
+                trigger: "blur",
+              }, ],
+            },
+            {
               width: 110,
               span: 12,
               label: "场所名称",
@@ -199,7 +253,7 @@
               align: 'center',
               width: 120,
               labelWidth: 110,
-              dataType:"number"
+              dataType: "number"
             },
             {
               width: 110,
@@ -312,6 +366,7 @@
               prop: "communityName",
               align: 'center',
               labelWidth: 110,
+              row: true,
             },
             {
               width: 100,
@@ -628,8 +683,8 @@
             type: "warning",
           })
           .then(() => {
-            row.isDeleted = 1
-            return removeTask(row)
+            // row.isDeleted = 1
+            return removeTask(row.id)
           })
           .then(() => {
             this.onLoad(this.page)
@@ -648,6 +703,12 @@
       searchChange(params, done) {
         this.query = params
         this.page.currentPage = 1
+        let dateRange = params.dateRange
+        if (params.dateRange) {
+          params.startTime = dateRange[0] + " 00:00:00"
+          params.endTime = dateRange[1] + " 23:59:59"
+          delete params.dateRange
+        }
         this.onLoad(this.page, params)
         done()
       },

--
Gitblit v1.9.3